use hpp instead of h

main/battery.cpp

@@ -1,4 +1,4 @@
-#include "battery.h"
+#include "battery.hpp"
 
 #include "driver/adc.h"
 #include "esp_adc_cal.h"

main/dac.cpp

@@ -1,4 +1,7 @@
-#include "dac.h"
+#include "dac.hpp"
+
+#include "gpio-expander.hpp"
+#include "i2c.hpp"
 
 #include <cstdint>
 
@@ -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 {
 

main/dac.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
-#include <stdint.h>
+#include "gpio-expander.hpp"
 
 #include <functional>
+#include <stdint.h>
 
 #include "esp_err.h"
-#include "gpio-expander.h"
 #include "result.hpp"
 
 namespace gay_ipod {

main/gay-ipod-fw.cpp

@@ -1,34 +1,26 @@
-#include <dirent.h>
-#include <stdio.h>
+#include "battery.hpp"
+#include "dac.hpp"
+#include "gpio-expander.hpp"
+#include "playback.hpp"
+#include "storage.hpp"
 
 #include <cstdint>
+#include <dirent.h>
 #include <memory>
+#include <stdio.h>
 
 #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) {

main/gpio-expander.cpp

@@ -1,8 +1,8 @@
-#include "gpio-expander.h"
+#include "gpio-expander.hpp"
 
-#include <cstdint>
+#include "i2c.hpp"
 
-#include "i2c.h"
+#include <cstdint>
 
 namespace gay_ipod {
 

main/gpio-expander.hpp

@@ -1,10 +1,9 @@
 #pragma once
 
-#include <stdint.h>
-
 #include <atomic>
 #include <functional>
 #include <mutex>
+#include <stdint.h>
 #include <tuple>
 #include <utility>
 

main/i2c.cpp

@@ -1,4 +1,4 @@
-#include "i2c.h"
+#include "i2c.hpp"
 
 #include "assert.h"
 

main/playback.cpp

@@ -1,11 +1,12 @@
-#include "playback.h"
+#include "playback.hpp"
+
+#include "dac.hpp"
 
 #include <cstdint>
 
 #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"

main/playback.hpp

@@ -1,5 +1,8 @@
 #pragma once
 
+#include "dac.hpp"
+#include "storage.hpp"
+
 #include <cstdint>
 #include <memory>
 #include <string>
@@ -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 {
 

main/storage.cpp

@@ -1,4 +1,6 @@
-#include "storage.h"
+#include "storage.hpp"
+
+#include "gpio-expander.hpp"
 
 #include <atomic>
 #include <memory>
@@ -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"

main/storage.hpp

@@ -1,12 +1,13 @@
 #pragma once
 
+#include "gpio-expander.hpp"
+
 #include <memory>
 
 #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 {