From 7e9a7393bbcce1395c185a78c1d97abe45d4f11a Mon Sep 17 00:00:00 2001 From: jacqueline Date: Wed, 12 Oct 2022 16:46:06 +1100 Subject: [PATCH] use hpp instead of h --- main/battery.cpp | 2 +- main/{battery.h => battery.hpp} | 0 main/dac.cpp | 7 +++--- main/{dac.h => dac.hpp} | 4 +-- main/gay-ipod-fw.cpp | 27 ++++++--------------- main/gpio-expander.cpp | 6 ++--- main/{gpio-expander.h => gpio-expander.hpp} | 3 +-- main/i2c.cpp | 2 +- main/{i2c.h => i2c.hpp} | 0 main/playback.cpp | 5 ++-- main/{playback.h => playback.hpp} | 7 +++--- main/storage.cpp | 5 ++-- main/{storage.h => storage.hpp} | 3 ++- 13 files changed, 31 insertions(+), 40 deletions(-) rename main/{battery.h => battery.hpp} (100%) rename main/{dac.h => dac.hpp} (98%) rename main/{gpio-expander.h => gpio-expander.hpp} (99%) rename main/{i2c.h => i2c.hpp} (100%) rename main/{playback.h => playback.hpp} (97%) rename main/{storage.h => storage.hpp} (97%) diff --git a/main/battery.cpp b/main/battery.cpp index d175ab67..66c96daf 100644 --- a/main/battery.cpp +++ b/main/battery.cpp @@ -1,4 +1,4 @@ -#include "battery.h" +#include "battery.hpp" #include "driver/adc.h" #include "esp_adc_cal.h" diff --git a/main/battery.h b/main/battery.hpp similarity index 100% rename from main/battery.h rename to main/battery.hpp diff --git a/main/dac.cpp b/main/dac.cpp index 0e34c98f..d74e9523 100644 --- a/main/dac.cpp +++ b/main/dac.cpp @@ -1,4 +1,7 @@ -#include "dac.h" +#include "dac.hpp" + +#include "gpio-expander.hpp" +#include "i2c.hpp" #include @@ -6,9 +9,7 @@ #include "driver/i2c.h" #include "esp_err.h" #include "esp_log.h" -#include "gpio-expander.h" #include "hal/i2c_types.h" -#include "i2c.h" namespace gay_ipod { diff --git a/main/dac.h b/main/dac.hpp similarity index 98% rename from main/dac.h rename to main/dac.hpp index c4e6b9a4..68d4c21a 100644 --- a/main/dac.h +++ b/main/dac.hpp @@ -1,11 +1,11 @@ #pragma once -#include +#include "gpio-expander.hpp" #include +#include #include "esp_err.h" -#include "gpio-expander.h" #include "result.hpp" namespace gay_ipod { diff --git a/main/gay-ipod-fw.cpp b/main/gay-ipod-fw.cpp index b883d072..1c232f20 100644 --- a/main/gay-ipod-fw.cpp +++ b/main/gay-ipod-fw.cpp @@ -1,34 +1,26 @@ -#include -#include +#include "battery.hpp" +#include "dac.hpp" +#include "gpio-expander.hpp" +#include "playback.hpp" +#include "storage.hpp" #include +#include #include +#include #include "audio_common.h" #include "audio_element.h" #include "audio_pipeline.h" -#include "battery.h" -#include "dac.h" -#include "driver/adc.h" #include "driver/gpio.h" #include "driver/i2c.h" -#include "driver/i2s.h" #include "driver/sdspi_host.h" #include "driver/spi_common.h" #include "driver/spi_master.h" -#include "esp_adc_cal.h" #include "esp_intr_alloc.h" #include "esp_log.h" -#include "fatfs_stream.h" -#include "gpio-expander.h" -#include "hal/adc_types.h" #include "hal/gpio_types.h" -#include "hal/i2s_types.h" #include "hal/spi_types.h" -#include "i2s_stream.h" -#include "mp3_decoder.h" -#include "playback.h" -#include "storage.h" #define I2C_SDA_IO (GPIO_NUM_2) #define I2C_SCL_IO (GPIO_NUM_4) @@ -40,11 +32,6 @@ #define SPI_QUADWP_IO (GPIO_NUM_22) #define SPI_QUADHD_IO (GPIO_NUM_21) -#define I2S_SCK_IO (GPIO_NUM_25) -#define I2S_BCK_IO (GPIO_NUM_26) -#define I2S_LRCK_IO (GPIO_NUM_27) -#define I2S_DIN_IO (GPIO_NUM_5) - static const char* TAG = "MAIN"; esp_err_t init_i2c(void) { diff --git a/main/gpio-expander.cpp b/main/gpio-expander.cpp index 36cf37b0..9234beac 100644 --- a/main/gpio-expander.cpp +++ b/main/gpio-expander.cpp @@ -1,8 +1,8 @@ -#include "gpio-expander.h" +#include "gpio-expander.hpp" -#include +#include "i2c.hpp" -#include "i2c.h" +#include namespace gay_ipod { diff --git a/main/gpio-expander.h b/main/gpio-expander.hpp similarity index 99% rename from main/gpio-expander.h rename to main/gpio-expander.hpp index 4589f93f..089aac42 100644 --- a/main/gpio-expander.h +++ b/main/gpio-expander.hpp @@ -1,10 +1,9 @@ #pragma once -#include - #include #include #include +#include #include #include diff --git a/main/i2c.cpp b/main/i2c.cpp index ae313b33..4ae3b267 100644 --- a/main/i2c.cpp +++ b/main/i2c.cpp @@ -1,4 +1,4 @@ -#include "i2c.h" +#include "i2c.hpp" #include "assert.h" diff --git a/main/i2c.h b/main/i2c.hpp similarity index 100% rename from main/i2c.h rename to main/i2c.hpp diff --git a/main/playback.cpp b/main/playback.cpp index 7b58f099..29fa5829 100644 --- a/main/playback.cpp +++ b/main/playback.cpp @@ -1,11 +1,12 @@ -#include "playback.h" +#include "playback.hpp" + +#include "dac.hpp" #include #include "audio_element.h" #include "audio_event_iface.h" #include "audio_pipeline.h" -#include "dac.h" #include "driver/i2s.h" #include "esp_err.h" #include "mp3_decoder.h" diff --git a/main/playback.h b/main/playback.hpp similarity index 97% rename from main/playback.h rename to main/playback.hpp index e995223b..88eca5ae 100644 --- a/main/playback.h +++ b/main/playback.hpp @@ -1,5 +1,8 @@ #pragma once +#include "dac.hpp" +#include "storage.hpp" + #include #include #include @@ -8,13 +11,11 @@ #include "audio_element.h" #include "audio_event_iface.h" #include "audio_pipeline.h" -#include "dac.h" #include "esp_err.h" #include "fatfs_stream.h" +#include "result.hpp" #include "i2s_stream.h" #include "mp3_decoder.h" -#include "result.hpp" -#include "storage.h" namespace gay_ipod { diff --git a/main/storage.cpp b/main/storage.cpp index 7071fbb6..7fed6ed0 100644 --- a/main/storage.cpp +++ b/main/storage.cpp @@ -1,4 +1,6 @@ -#include "storage.h" +#include "storage.hpp" + +#include "gpio-expander.hpp" #include #include @@ -13,7 +15,6 @@ #include "esp_err.h" #include "esp_vfs_fat.h" #include "ff.h" -#include "gpio-expander.h" #include "hal/gpio_types.h" #include "hal/spi_types.h" #include "sdmmc_cmd.h" diff --git a/main/storage.h b/main/storage.hpp similarity index 97% rename from main/storage.h rename to main/storage.hpp index 06b4d94e..cee49cc5 100644 --- a/main/storage.h +++ b/main/storage.hpp @@ -1,12 +1,13 @@ #pragma once +#include "gpio-expander.hpp" + #include #include "driver/sdmmc_types.h" #include "driver/sdspi_host.h" #include "esp_err.h" #include "esp_vfs_fat.h" -#include "gpio-expander.h" #include "result.hpp" namespace gay_ipod {