From 1d340db87193ca589c3bd5df241ae0ed51a3100d Mon Sep 17 00:00:00 2001 From: jacqueline Date: Wed, 16 Nov 2022 11:34:46 +1100 Subject: [PATCH] Order and group headers correctly --- src/drivers/audio_playback.cpp | 9 +++--- src/drivers/dac.cpp | 6 ++-- src/drivers/display.cpp | 5 ++- src/drivers/gpio_expander.cpp | 4 +-- src/drivers/i2c.cpp | 1 + src/drivers/include/a2dp_audio_output.hpp | 1 + src/drivers/include/audio_output.hpp | 1 + src/drivers/include/audio_playback.hpp | 8 ++--- src/drivers/include/dac.hpp | 5 +-- src/drivers/include/display.hpp | 6 ++-- src/drivers/include/gpio_expander.hpp | 1 + src/drivers/include/i2s_audio_output.hpp | 10 +++--- src/drivers/include/storage.hpp | 4 +-- src/drivers/storage.cpp | 4 +-- src/drivers/test/test_battery.cpp | 3 +- src/drivers/test/test_dac.cpp | 8 +++-- src/drivers/test/test_gpio_expander.cpp | 5 +-- src/drivers/test/test_storage.cpp | 8 +++-- src/main/app_console.cpp | 2 ++ src/main/app_console.hpp | 4 +-- src/main/main.cpp | 37 ++++++++++++----------- test/main/main.cpp | 1 + 22 files changed, 76 insertions(+), 57 deletions(-) diff --git a/src/drivers/audio_playback.cpp b/src/drivers/audio_playback.cpp index 29f7a7a4..300bf176 100644 --- a/src/drivers/audio_playback.cpp +++ b/src/drivers/audio_playback.cpp @@ -1,25 +1,24 @@ #include "audio_playback.hpp" -#include "audio_output.hpp" - #include #include #include #include +#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"; diff --git a/src/drivers/dac.cpp b/src/drivers/dac.cpp index 3b7011c4..f01d701f 100644 --- a/src/drivers/dac.cpp +++ b/src/drivers/dac.cpp @@ -1,8 +1,5 @@ #include "dac.hpp" -#include "gpio_expander.hpp" -#include "i2c.hpp" - #include #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"; diff --git a/src/drivers/display.cpp b/src/drivers/display.cpp index f5f926bf..c8d796a8 100644 --- a/src/drivers/display.cpp +++ b/src/drivers/display.cpp @@ -1,11 +1,12 @@ #include "display.hpp" + #include #include #include #include #include + #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; diff --git a/src/drivers/gpio_expander.cpp b/src/drivers/gpio_expander.cpp index 02bd73c3..e33a8079 100644 --- a/src/drivers/gpio_expander.cpp +++ b/src/drivers/gpio_expander.cpp @@ -1,9 +1,9 @@ #include "gpio_expander.hpp" -#include "i2c.hpp" - #include +#include "i2c.hpp" + namespace drivers { GpioExpander::GpioExpander() { diff --git a/src/drivers/i2c.cpp b/src/drivers/i2c.cpp index 0c195a25..04a6d7d1 100644 --- a/src/drivers/i2c.cpp +++ b/src/drivers/i2c.cpp @@ -1,4 +1,5 @@ #include "i2c.hpp" + #include #include "assert.h" diff --git a/src/drivers/include/a2dp_audio_output.hpp b/src/drivers/include/a2dp_audio_output.hpp index 32398880..a77d011b 100644 --- a/src/drivers/include/a2dp_audio_output.hpp +++ b/src/drivers/include/a2dp_audio_output.hpp @@ -1,6 +1,7 @@ #pragma once #include + #include "audio_common.h" #include "audio_element.h" #include "audio_output.hpp" diff --git a/src/drivers/include/audio_output.hpp b/src/drivers/include/audio_output.hpp index 916ee906..82dca82d 100644 --- a/src/drivers/include/audio_output.hpp +++ b/src/drivers/include/audio_output.hpp @@ -2,6 +2,7 @@ #include #include + #include "audio_common.h" #include "audio_element.h" diff --git a/src/drivers/include/audio_playback.hpp b/src/drivers/include/audio_playback.hpp index 8224d4bf..41ab46d2 100644 --- a/src/drivers/include/audio_playback.hpp +++ b/src/drivers/include/audio_playback.hpp @@ -1,9 +1,5 @@ #pragma once -#include "audio_output.hpp" -#include "dac.hpp" -#include "storage.hpp" - #include #include #include @@ -18,6 +14,10 @@ #include "mp3_decoder.h" #include "result.hpp" +#include "audio_output.hpp" +#include "dac.hpp" +#include "storage.hpp" + namespace drivers { /* diff --git a/src/drivers/include/dac.hpp b/src/drivers/include/dac.hpp index 8c4b6419..6d812b6a 100644 --- a/src/drivers/include/dac.hpp +++ b/src/drivers/include/dac.hpp @@ -1,13 +1,14 @@ #pragma once -#include "gpio_expander.hpp" - #include + #include #include "esp_err.h" #include "result.hpp" +#include "gpio_expander.hpp" + namespace drivers { /** diff --git a/src/drivers/include/display.hpp b/src/drivers/include/display.hpp index 958218ca..75b2f9a6 100644 --- a/src/drivers/include/display.hpp +++ b/src/drivers/include/display.hpp @@ -1,12 +1,14 @@ #pragma once #include -#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 { /* diff --git a/src/drivers/include/gpio_expander.hpp b/src/drivers/include/gpio_expander.hpp index 7ae0f107..de02e659 100644 --- a/src/drivers/include/gpio_expander.hpp +++ b/src/drivers/include/gpio_expander.hpp @@ -1,6 +1,7 @@ #pragma once #include + #include #include #include diff --git a/src/drivers/include/i2s_audio_output.hpp b/src/drivers/include/i2s_audio_output.hpp index dabf1ff0..ca0e6452 100644 --- a/src/drivers/include/i2s_audio_output.hpp +++ b/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 #include #include "audio_element.h" +#include "result.hpp" + +#include "audio_output.hpp" +#include "dac.hpp" +#include "gpio_expander.hpp" namespace drivers { diff --git a/src/drivers/include/storage.hpp b/src/drivers/include/storage.hpp index 3dec16a5..e1c576de 100644 --- a/src/drivers/include/storage.hpp +++ b/src/drivers/include/storage.hpp @@ -1,7 +1,5 @@ #pragma once -#include "gpio_expander.hpp" - #include #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; diff --git a/src/drivers/storage.cpp b/src/drivers/storage.cpp index 7840e6f4..9ddd092d 100644 --- a/src/drivers/storage.cpp +++ b/src/drivers/storage.cpp @@ -1,7 +1,5 @@ #include "storage.hpp" -#include "gpio_expander.hpp" - #include #include #include @@ -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; diff --git a/src/drivers/test/test_battery.cpp b/src/drivers/test/test_battery.cpp index a1499e40..f0006336 100644 --- a/src/drivers/test/test_battery.cpp +++ b/src/drivers/test/test_battery.cpp @@ -1,6 +1,7 @@ -#include #include "battery.hpp" +#include + #include "catch2/catch.hpp" namespace drivers { diff --git a/src/drivers/test/test_dac.cpp b/src/drivers/test/test_dac.cpp index 84be09b9..fab258e4 100644 --- a/src/drivers/test/test_dac.cpp +++ b/src/drivers/test/test_dac.cpp @@ -1,11 +1,13 @@ -#include #include "dac.hpp" + +#include + +#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]") { diff --git a/src/drivers/test/test_gpio_expander.cpp b/src/drivers/test/test_gpio_expander.cpp index d0d31002..7bf44d28 100644 --- a/src/drivers/test/test_gpio_expander.cpp +++ b/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]") { diff --git a/src/drivers/test/test_storage.cpp b/src/drivers/test/test_storage.cpp index 49b3d097..627fa615 100644 --- a/src/drivers/test/test_storage.cpp +++ b/src/drivers/test/test_storage.cpp @@ -1,16 +1,18 @@ +#include "storage.hpp" + #include + #include #include #include +#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 { diff --git a/src/main/app_console.cpp b/src/main/app_console.cpp index d032a631..74225534 100644 --- a/src/main/app_console.cpp +++ b/src/main/app_console.cpp @@ -1,11 +1,13 @@ #include "app_console.hpp" #include + #include #include #include #include #include + #include "esp_console.h" namespace console { diff --git a/src/main/app_console.hpp b/src/main/app_console.hpp index 1dcdce6d..0beffd76 100644 --- a/src/main/app_console.hpp +++ b/src/main/app_console.hpp @@ -1,10 +1,10 @@ #pragma once +#include + #include "audio_playback.hpp" #include "console.hpp" -#include - namespace console { class AppConsole : public Console { diff --git a/src/main/main.cpp b/src/main/main.cpp index c79cc055..a18e12d0 100644 --- a/src/main/main.cpp +++ b/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 #include + #include #include #include @@ -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) { diff --git a/test/main/main.cpp b/test/main/main.cpp index 13369cb4..21471fce 100644 --- a/test/main/main.cpp +++ b/test/main/main.cpp @@ -1,4 +1,5 @@ #include + #include #include "esp_console.h"