move driver includes into a subdir as well

18 files changed, 8 insertions, 8 deletions

diff --git a/src/drivers/include/a2dp_audio_output.hpp b/src/drivers/include/drivers/a2dp_audio_output.hpp
index 010470c6..010470c6 100644
--- a/src/drivers/include/a2dp_audio_output.hpp
+++ b/src/drivers/include/drivers/a2dp_audio_output.hpp
diff --git a/src/drivers/include/adc.hpp b/src/drivers/include/drivers/adc.hpp
index 3e94a9ee..3e94a9ee 100644
--- a/src/drivers/include/adc.hpp
+++ b/src/drivers/include/drivers/adc.hpp
diff --git a/src/drivers/include/bluetooth.hpp b/src/drivers/include/drivers/bluetooth.hpp
index 8da5ce2e..5960de7e 100644
--- a/src/drivers/include/bluetooth.hpp
+++ b/src/drivers/include/drivers/bluetooth.hpp
@@ -12,11 +12,11 @@
 #include <freertos/FreeRTOS.h>
 #include <freertos/stream_buffer.h>
 #include <stdint.h>
-#include "bluetooth_types.hpp"
+#include "drivers/bluetooth_types.hpp"
 #include "esp_a2dp_api.h"
 #include "esp_avrc_api.h"
 #include "esp_gap_bt_api.h"
-#include "nvs.hpp"
+#include "drivers/nvs.hpp"
 #include "tasks.hpp"
 #include "tinyfsm.hpp"
 #include "tinyfsm/include/tinyfsm.hpp"
diff --git a/src/drivers/include/bluetooth_types.hpp b/src/drivers/include/drivers/bluetooth_types.hpp
index 7cfb236f..7cfb236f 100644
--- a/src/drivers/include/bluetooth_types.hpp
+++ b/src/drivers/include/drivers/bluetooth_types.hpp
diff --git a/src/drivers/include/display.hpp b/src/drivers/include/drivers/display.hpp
index d2e18a5c..6dc78e01 100644
--- a/src/drivers/include/display.hpp
+++ b/src/drivers/include/drivers/display.hpp
@@ -15,8 +15,8 @@
 #include "result.hpp"
 #include "tasks.hpp"
 
-#include "display_init.hpp"
-#include "gpios.hpp"
+#include "drivers/display_init.hpp"
+#include "drivers/gpios.hpp"
 
 namespace drivers {
 
diff --git a/src/drivers/include/display_init.hpp b/src/drivers/include/drivers/display_init.hpp
index 9bf5b3f5..9bf5b3f5 100644
--- a/src/drivers/include/display_init.hpp
+++ b/src/drivers/include/drivers/display_init.hpp
diff --git a/src/drivers/include/fatfs_audio_input.hpp b/src/drivers/include/drivers/fatfs_audio_input.hpp
index 705f6e7d..705f6e7d 100644
--- a/src/drivers/include/fatfs_audio_input.hpp
+++ b/src/drivers/include/drivers/fatfs_audio_input.hpp
diff --git a/src/drivers/include/gpios.hpp b/src/drivers/include/drivers/gpios.hpp
index e27a3ade..e27a3ade 100644
--- a/src/drivers/include/gpios.hpp
+++ b/src/drivers/include/drivers/gpios.hpp
diff --git a/src/drivers/include/haptics.hpp b/src/drivers/include/drivers/haptics.hpp
index 940c3c6d..940c3c6d 100644
--- a/src/drivers/include/haptics.hpp
+++ b/src/drivers/include/drivers/haptics.hpp
diff --git a/src/drivers/include/i2c.hpp b/src/drivers/include/drivers/i2c.hpp
index 0dc1e7c0..0dc1e7c0 100644
--- a/src/drivers/include/i2c.hpp
+++ b/src/drivers/include/drivers/i2c.hpp
diff --git a/src/drivers/include/i2s_dac.hpp b/src/drivers/include/drivers/i2s_dac.hpp
index 569f0a9a..5e81f875 100644
--- a/src/drivers/include/i2s_dac.hpp
+++ b/src/drivers/include/drivers/i2s_dac.hpp
@@ -22,7 +22,7 @@
 #include "freertos/stream_buffer.h"
 #include "result.hpp"
 
-#include "gpios.hpp"
+#include "drivers/gpios.hpp"
 #include "sys/_stdint.h"
 
 namespace drivers {
diff --git a/src/drivers/include/nvs.hpp b/src/drivers/include/drivers/nvs.hpp
index ac1a1096..83bb8097 100644
--- a/src/drivers/include/nvs.hpp
+++ b/src/drivers/include/drivers/nvs.hpp
@@ -13,7 +13,7 @@
 #include "esp_err.h"
 #include "nvs.h"
 
-#include "bluetooth_types.hpp"
+#include "drivers/bluetooth_types.hpp"
 #include "lru_cache.hpp"
 
 namespace drivers {
diff --git a/src/drivers/include/samd.hpp b/src/drivers/include/drivers/samd.hpp
index 55ea513c..55ea513c 100644
--- a/src/drivers/include/samd.hpp
+++ b/src/drivers/include/drivers/samd.hpp
diff --git a/src/drivers/include/spi.hpp b/src/drivers/include/drivers/spi.hpp
index 60638f71..60638f71 100644
--- a/src/drivers/include/spi.hpp
+++ b/src/drivers/include/drivers/spi.hpp
diff --git a/src/drivers/include/spiffs.hpp b/src/drivers/include/drivers/spiffs.hpp
index 04478590..04478590 100644
--- a/src/drivers/include/spiffs.hpp
+++ b/src/drivers/include/drivers/spiffs.hpp
diff --git a/src/drivers/include/storage.hpp b/src/drivers/include/drivers/storage.hpp
index 836bbbdc..3aefff2d 100644
--- a/src/drivers/include/storage.hpp
+++ b/src/drivers/include/drivers/storage.hpp
@@ -15,7 +15,7 @@
 #include "ff.h"
 #include "result.hpp"
 
-#include "gpios.hpp"
+#include "drivers/gpios.hpp"
 
 namespace drivers {
 
diff --git a/src/drivers/include/touchwheel.hpp b/src/drivers/include/drivers/touchwheel.hpp
index 18ace2b4..60902087 100644
--- a/src/drivers/include/touchwheel.hpp
+++ b/src/drivers/include/drivers/touchwheel.hpp
@@ -12,7 +12,7 @@
 #include "esp_err.h"
 #include "result.hpp"
 
-#include "gpios.hpp"
+#include "drivers/gpios.hpp"
 
 namespace drivers {
 
diff --git a/src/drivers/include/wm8523.hpp b/src/drivers/include/drivers/wm8523.hpp
index a64f6bac..a64f6bac 100644
--- a/src/drivers/include/wm8523.hpp
+++ b/src/drivers/include/drivers/wm8523.hpp