Order and group headers correctly

src/drivers/audio_playback.cpp

@@ -1,25 +1,24 @@
 #include "audio_playback.hpp"
 
-#include "audio_output.hpp"
-
 #include <algorithm>
 #include <cstdint>
 #include <memory>
 #include <string_view>
 
+#include "aac_decoder.h"
+#include "amr_decoder.h"
 #include "audio_element.h"
 #include "audio_event_iface.h"
 #include "audio_pipeline.h"
 #include "esp_err.h"
-
-#include "aac_decoder.h"
-#include "amr_decoder.h"
 #include "flac_decoder.h"
 #include "mp3_decoder.h"
 #include "ogg_decoder.h"
 #include "opus_decoder.h"
 #include "wav_decoder.h"
 
+#include "audio_output.hpp"
+
 static const char* kTag = "PLAYBACK";
 static const char* kSource = "src";
 static const char* kDecoder = "dec";

src/drivers/dac.cpp

@@ -1,8 +1,5 @@
 #include "dac.hpp"
 
-#include "gpio_expander.hpp"
-#include "i2c.hpp"
-
 #include <cstdint>
 
 #include "assert.h"
@@ -11,6 +8,9 @@
 #include "esp_log.h"
 #include "hal/i2c_types.h"
 
+#include "gpio_expander.hpp"
+#include "i2c.hpp"
+
 namespace drivers {
 
 static const char* kTag = "AUDIODAC";

src/drivers/display.cpp

@@ -1,11 +1,12 @@
 #include "display.hpp"
+
 #include <atomic>
 #include <cstdint>
 #include <cstring>
 #include <memory>
 #include <mutex>
+
 #include "assert.h"
-#include "display_init.hpp"
 #include "driver/gpio.h"
 #include "driver/spi_master.h"
 #include "esp_attr.h"
@@ -17,6 +18,8 @@
 #include "hal/spi_types.h"
 #include "lvgl/lvgl.h"
 
+#include "display_init.hpp"
+
 static const char* kTag = "DISPLAY";
 static const gpio_num_t kCommandOrDataPin = GPIO_NUM_21;
 static const gpio_num_t kLedPin = GPIO_NUM_22;

src/drivers/gpio_expander.cpp

@@ -1,9 +1,9 @@
 #include "gpio_expander.hpp"
 
-#include "i2c.hpp"
-
 #include <cstdint>
 
+#include "i2c.hpp"
+
 namespace drivers {
 
 GpioExpander::GpioExpander() {

src/drivers/i2c.cpp

@@ -1,4 +1,5 @@
 #include "i2c.hpp"
+
 #include <cstdint>
 
 #include "assert.h"

src/drivers/include/a2dp_audio_output.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+
 #include "audio_common.h"
 #include "audio_element.h"
 #include "audio_output.hpp"

src/drivers/include/audio_output.hpp

@@ -2,6 +2,7 @@
 
 #include <cstdint>
 #include <memory>
+
 #include "audio_common.h"
 #include "audio_element.h"
 

src/drivers/include/audio_playback.hpp

@@ -1,9 +1,5 @@
 #pragma once
 
-#include "audio_output.hpp"
-#include "dac.hpp"
-#include "storage.hpp"
-
 #include <cstdint>
 #include <memory>
 #include <string>
@@ -18,6 +14,10 @@
 #include "mp3_decoder.h"
 #include "result.hpp"
 
+#include "audio_output.hpp"
+#include "dac.hpp"
+#include "storage.hpp"
+
 namespace drivers {
 
 /*

src/drivers/include/dac.hpp

@@ -1,13 +1,14 @@
 #pragma once
 
-#include "gpio_expander.hpp"
-
 #include <stdint.h>
+
 #include <functional>
 
 #include "esp_err.h"
 #include "result.hpp"
 
+#include "gpio_expander.hpp"
+
 namespace drivers {
 
 /**

src/drivers/include/display.hpp

@@ -1,12 +1,14 @@
 #pragma once
 
 #include <cstdint>
-#include "display_init.hpp"
+
 #include "driver/spi_master.h"
-#include "gpio_expander.hpp"
 #include "lvgl/lvgl.h"
 #include "result.hpp"
 
+#include "display_init.hpp"
+#include "gpio_expander.hpp"
+
 namespace drivers {
 
 /*

src/drivers/include/gpio_expander.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+
 #include <atomic>
 #include <functional>
 #include <mutex>

src/drivers/include/i2s_audio_output.hpp

@@ -1,14 +1,14 @@
 #pragma once
 
-#include "audio_output.hpp"
-#include "dac.hpp"
-#include "gpio_expander.hpp"
-#include "result.hpp"
-
 #include <cstdint>
 #include <memory>
 
 #include "audio_element.h"
+#include "result.hpp"
+
+#include "audio_output.hpp"
+#include "dac.hpp"
+#include "gpio_expander.hpp"
 
 namespace drivers {
 

src/drivers/include/storage.hpp

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "gpio_expander.hpp"
-
 #include <memory>
 
 #include "driver/sdmmc_types.h"
@@ -10,6 +8,8 @@
 #include "esp_vfs_fat.h"
 #include "result.hpp"
 
+#include "gpio_expander.hpp"
+
 namespace drivers {
 
 extern const char* kStoragePath;

src/drivers/storage.cpp

@@ -1,7 +1,5 @@
 #include "storage.hpp"
 
-#include "gpio_expander.hpp"
-
 #include <atomic>
 #include <memory>
 #include <mutex>
@@ -19,6 +17,8 @@
 #include "hal/spi_types.h"
 #include "sdmmc_cmd.h"
 
+#include "gpio_expander.hpp"
+
 static const char* kTag = "SDSTORAGE";
 static const uint8_t kMaxOpenFiles = 8;
 

src/drivers/test/test_battery.cpp

@@ -1,6 +1,7 @@
-#include <cstdint>
 #include "battery.hpp"
 
+#include <cstdint>
+
 #include "catch2/catch.hpp"
 
 namespace drivers {

src/drivers/test/test_dac.cpp

@@ -1,11 +1,13 @@
-#include <cstdint>
 #include "dac.hpp"
+
+#include <cstdint>
+
+#include "catch2/catch.hpp"
+
 #include "gpio_expander.hpp"
 #include "i2c.hpp"
 #include "i2c_fixture.hpp"
 
-#include "catch2/catch.hpp"
-
 namespace drivers {
 
 TEST_CASE("dac configuration", "[integration]") {

src/drivers/test/test_gpio_expander.cpp

@@ -1,9 +1,10 @@
 #include "gpio_expander.hpp"
-#include "i2c.hpp"
-#include "i2c_fixture.hpp"
 
 #include "catch2/catch.hpp"
 
+#include "i2c.hpp"
+#include "i2c_fixture.hpp"
+
 namespace drivers {
 
 TEST_CASE("gpio expander", "[integration]") {

src/drivers/test/test_storage.cpp

@@ -1,16 +1,18 @@
+#include "storage.hpp"
+
 #include <dirent.h>
+
 #include <cstdio>
 #include <fstream>
 #include <iostream>
 
+#include "catch2/catch.hpp"
+
 #include "gpio_expander.hpp"
 #include "i2c.hpp"
 #include "i2c_fixture.hpp"
 #include "spi.hpp"
 #include "spi_fixture.hpp"
-#include "storage.hpp"
-
-#include "catch2/catch.hpp"
 
 namespace drivers {
 

src/main/app_console.cpp

@@ -1,11 +1,13 @@
 #include "app_console.hpp"
 
 #include <dirent.h>
+
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
 #include <iostream>
 #include <string>
+
 #include "esp_console.h"
 
 namespace console {

src/main/app_console.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
+#include <memory>
+
 #include "audio_playback.hpp"
 #include "console.hpp"
 
-#include <memory>
-
 namespace console {
 
 class AppConsole : public Console {

src/main/main.cpp

@@ -1,23 +1,6 @@
-#include "app_console.hpp"
-#include "audio_playback.hpp"
-#include "battery.hpp"
-#include "core/lv_disp.h"
-#include "core/lv_obj_pos.h"
-#include "dac.hpp"
-#include "display_init.hpp"
-#include "display.hpp"
-#include "esp_freertos_hooks.h"
-#include "freertos/portmacro.h"
-#include "gpio_expander.hpp"
-#include "i2c.hpp"
-#include "i2s_audio_output.hpp"
-#include "misc/lv_color.h"
-#include "misc/lv_timer.h"
-#include "spi.hpp"
-#include "storage.hpp"
-
 #include <dirent.h>
 #include <stdio.h>
+
 #include <cstddef>
 #include <cstdint>
 #include <memory>
@@ -25,18 +8,36 @@
 #include "audio_common.h"
 #include "audio_element.h"
 #include "audio_pipeline.h"
+#include "core/lv_disp.h"
+#include "core/lv_obj_pos.h"
 #include "driver/gpio.h"
 #include "driver/i2c.h"
 #include "driver/sdspi_host.h"
 #include "driver/spi_common.h"
 #include "driver/spi_master.h"
+#include "esp_freertos_hooks.h"
 #include "esp_intr_alloc.h"
 #include "esp_log.h"
+#include "freertos/portmacro.h"
 #include "hal/gpio_types.h"
 #include "hal/spi_types.h"
 #include "lvgl/lvgl.h"
+#include "misc/lv_color.h"
+#include "misc/lv_timer.h"
 #include "widgets/lv_label.h"
 
+#include "app_console.hpp"
+#include "audio_playback.hpp"
+#include "battery.hpp"
+#include "dac.hpp"
+#include "display.hpp"
+#include "display_init.hpp"
+#include "gpio_expander.hpp"
+#include "i2c.hpp"
+#include "i2s_audio_output.hpp"
+#include "spi.hpp"
+#include "storage.hpp"
+
 static const char* TAG = "MAIN";
 
 void IRAM_ATTR tick_hook(void) {