From 1573a8c4cde1cd9528b422b2dcc598e37ffe94a7 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 2 May 2024 19:12:26 +1000
Subject: WIP merge cyclically dependent components into one big component

---
 src/main/CMakeLists.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/main')

diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 3ae92ac2..9019c254 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -2,8 +2,5 @@
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
-idf_component_register(
-  SRCS "main.cpp"
-  INCLUDE_DIRS "."
-  REQUIRES "audio" "ui" "system_fsm" "events")
+idf_component_register(SRCS "main.cpp" INCLUDE_DIRS "." REQUIRES "tangara")
 target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})
-- 
cgit v1.2.3


From 7d7f7755d17e1e0a2348d75d797097f166b70471 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 2 May 2024 21:41:56 +1000
Subject: start moving include files into subdirs

---
 src/main/main.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/main')

diff --git a/src/main/main.cpp b/src/main/main.cpp
index cf27b132..811f2709 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -7,14 +7,14 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/portmacro.h"
 
-#include "i2c.hpp"
-#include "system_events.hpp"
 #include "tinyfsm.hpp"
 
-#include "audio_fsm.hpp"
-#include "event_queue.hpp"
-#include "system_fsm.hpp"
-#include "ui_fsm.hpp"
+#include "audio/audio_fsm.hpp"
+#include "events/event_queue.hpp"
+#include "i2c.hpp"
+#include "system_fsm/system_events.hpp"
+#include "system_fsm/system_fsm.hpp"
+#include "ui/ui_fsm.hpp"
 
 extern "C" void app_main(void) {
   ESP_ERROR_CHECK(drivers::init_i2c());
-- 
cgit v1.2.3


From 26eb580043ad176bdc58d996f30d470e1073ef00 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 2 May 2024 21:52:59 +1000
Subject: move driver includes into a subdir as well

---
 src/main/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/main.cpp b/src/main/main.cpp
index 811f2709..8c7565f3 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -10,8 +10,8 @@
 #include "tinyfsm.hpp"
 
 #include "audio/audio_fsm.hpp"
+#include "drivers/i2c.hpp"
 #include "events/event_queue.hpp"
-#include "i2c.hpp"
 #include "system_fsm/system_events.hpp"
 #include "system_fsm/system_fsm.hpp"
 #include "ui/ui_fsm.hpp"
-- 
cgit v1.2.3