From 1d340db87193ca589c3bd5df241ae0ed51a3100d Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Wed, 16 Nov 2022 11:34:46 +1100
Subject: Order and group headers correctly

---
 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 ++--
 8 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'src/drivers/include')

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 <cstdint>
+
 #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 <cstdint>
 #include <memory>
+
 #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 <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 {
 
 /*
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 <stdint.h>
+
 #include <functional>
 
 #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 <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 {
 
 /*
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 <stdint.h>
+
 #include <atomic>
 #include <functional>
 #include <mutex>
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 <cstdint>
 #include <memory>
 
 #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 <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;
-- 
cgit v1.2.3