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/drivers/CMakeLists.txt  | 4 ++--
 src/drivers/bluetooth.cpp   | 1 -
 src/drivers/include/nvs.hpp | 1 -
 src/drivers/nvs.cpp         | 3 ---
 4 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/CMakeLists.txt b/src/drivers/CMakeLists.txt
index c2018d3f..91534edb 100644
--- a/src/drivers/CMakeLists.txt
+++ b/src/drivers/CMakeLists.txt
@@ -7,6 +7,6 @@ idf_component_register(
   "i2c.cpp" "bluetooth.cpp" "spi.cpp" "display.cpp" "display_init.cpp"
   "samd.cpp" "wm8523.cpp" "nvs.cpp" "haptics.cpp" "spiffs.cpp"
   INCLUDE_DIRS "include"
-  REQUIRES "esp_adc" "fatfs" "result" "lvgl" "tasks" "nvs_flash" "spiffs"
-  "bt" "tinyfsm" "util")
+  REQUIRES "esp_adc" "fatfs" "result" "lvgl" "nvs_flash" "spiffs" "bt"
+  "tasks" "tinyfsm" "util" "libcppbor")
 target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})
diff --git a/src/drivers/bluetooth.cpp b/src/drivers/bluetooth.cpp
index 5d1b35fa..40be530e 100644
--- a/src/drivers/bluetooth.cpp
+++ b/src/drivers/bluetooth.cpp
@@ -25,7 +25,6 @@
 #include "freertos/portmacro.h"
 #include "freertos/projdefs.h"
 #include "freertos/timers.h"
-#include "sample.hpp"
 #include "tinyfsm/include/tinyfsm.hpp"
 
 #include "bluetooth_types.hpp"
diff --git a/src/drivers/include/nvs.hpp b/src/drivers/include/nvs.hpp
index 7c74ceb0..ac1a1096 100644
--- a/src/drivers/include/nvs.hpp
+++ b/src/drivers/include/nvs.hpp
@@ -15,7 +15,6 @@
 
 #include "bluetooth_types.hpp"
 #include "lru_cache.hpp"
-#include "tasks.hpp"
 
 namespace drivers {
 
diff --git a/src/drivers/nvs.cpp b/src/drivers/nvs.cpp
index c8befe48..0aaf79f0 100644
--- a/src/drivers/nvs.cpp
+++ b/src/drivers/nvs.cpp
@@ -5,8 +5,6 @@
  */
 
 #include "nvs.hpp"
-#include <stdint.h>
-#include <sys/_stdint.h>
 
 #include <cstdint>
 #include <memory>
@@ -18,7 +16,6 @@
 #include "esp_log.h"
 #include "nvs.h"
 #include "nvs_flash.h"
-#include "tasks.hpp"
 #include "wm8523.hpp"
 
 namespace drivers {
-- 
cgit v1.2.3