WIP merge cyclically dependent components into one big component

lib/lvgl/env_support/cmake/esp.cmake

@@ -27,7 +27,6 @@ else()
       ${LVGL_ROOT_DIR}
       ${LVGL_ROOT_DIR}/src
       ${LVGL_ROOT_DIR}/../
-      $ENV{PROJ_PATH}/src/ui/include/
     REQUIRES esp_timer)
 
   target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_CONF_INCLUDE_SIMPLE")

lib/lvgl/lv_conf.h

@@ -87,7 +87,8 @@
  *It removes the need to manually update the tick with `lv_tick_inc()`)*/
 #define LV_TICK_CUSTOM 1
 #if LV_TICK_CUSTOM
-    #define LV_TICK_CUSTOM_INCLUDE "ui_tick.hpp"         /*Header for the system time function*/
+    #define LV_TICK_CUSTOM_INCLUDE "esp_timer.h"
+    #define LV_TICK_CUSTOM_SYS_TIME_EXPR (esp_timer_get_time() / 1000)
 #endif   /*LV_TICK_CUSTOM*/
 
 /*Default Dot Per Inch. Used to initialize default sizes such as widgets sized, style paddings.

src/app_console/CMakeLists.txt

@@ -1,9 +0,0 @@
-# Copyright 2023 jacqueline <me@jacqueline.id.au>
-#
-# SPDX-License-Identifier: GPL-3.0-only
-
-idf_component_register(
-  SRCS "app_console.cpp"
-  INCLUDE_DIRS "include"
-  REQUIRES "dev_console" "events" "database")
-target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})

src/audio/CMakeLists.txt

@@ -1,14 +0,0 @@
-# Copyright 2023 jacqueline <me@jacqueline.id.au>
-#
-# SPDX-License-Identifier: GPL-3.0-only
-
-idf_component_register(
-  SRCS "audio_decoder.cpp" "fatfs_audio_input.cpp" "i2s_audio_output.cpp"
-  "track_queue.cpp" "audio_fsm.cpp" "audio_converter.cpp" "resample.cpp"
-  "fatfs_source.cpp" "bt_audio_output.cpp" "readahead_source.cpp"
-  "audio_source.cpp"
-  INCLUDE_DIRS "include"
-  REQUIRES "codecs" "drivers" "cbor" "result" "tasks" "memory" "tinyfsm"
-  "database" "system_fsm" "speexdsp" "millershuffle" "libcppbor")
-
-target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})

src/battery/CMakeLists.txt

@@ -1,10 +0,0 @@
-# Copyright 2023 jacqueline <me@jacqueline.id.au>
-#
-# SPDX-License-Identifier: GPL-3.0-only
-
-idf_component_register(
-  SRCS "battery.cpp"
-  INCLUDE_DIRS "include"
-  REQUIRES "drivers" "events")
-
-target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})

src/database/CMakeLists.txt

@@ -1,22 +0,0 @@
-# Copyright 2023 jacqueline <me@jacqueline.id.au>
-#
-# SPDX-License-Identifier: GPL-3.0-only
-
-idf_component_register(
-  SRCS "env_esp.cpp" "database.cpp" "track.cpp" "records.cpp"
-  "file_gatherer.cpp" "tag_parser.cpp" "index.cpp"
-  INCLUDE_DIRS "include"
-  REQUIRES "result" "esp_psram" "fatfs" "libtags" "komihash" "cbor"
-  "tasks" "memory" "util" "tinyfsm" "events" "opusfile" "libcppbor")
-
-target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})
-
-set(LEVELDB_BUILD_TESTS OFF)
-set(LEVELDB_BUILD_BENCHMARKS OFF)
-set(LEVELDB_INSTALL OFF)
-
-set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
-
-add_subdirectory($ENV{PROJ_PATH}/lib/leveldb ${CMAKE_CURRENT_BINARY_DIR}/leveldb)
-
-target_link_libraries(${COMPONENT_LIB} PUBLIC leveldb)

src/dev_console/CMakeLists.txt

@@ -1,9 +0,0 @@
-# Copyright 2023 jacqueline <me@jacqueline.id.au>
-#
-# SPDX-License-Identifier: GPL-3.0-only
-
-idf_component_register(
-  SRCS "console.cpp"
-  INCLUDE_DIRS "include"
-  REQUIRES "console" "memory")
-target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})

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"
+  REQUIRES "esp_adc" "fatfs" "result" "lvgl" "nvs_flash" "spiffs" "bt"
-  "bt" "tinyfsm" "util")
+  "tasks" "tinyfsm" "util" "libcppbor")
 target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})

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"

src/drivers/include/nvs.hpp

@@ -15,7 +15,6 @@
 
 #include "bluetooth_types.hpp"
 #include "lru_cache.hpp"
-#include "tasks.hpp"
 
 namespace drivers {
 

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 {

src/events/CMakeLists.txt

@@ -1,9 +0,0 @@
-# Copyright 2023 jacqueline <me@jacqueline.id.au>
-#
-# SPDX-License-Identifier: GPL-3.0-only
-
-idf_component_register(
-  SRCS "event_queue.cpp"
-  INCLUDE_DIRS "include"
-  REQUIRES "tinyfsm" "ui")
-target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})

src/input/CMakeLists.txt

@@ -1,13 +0,0 @@
-# Copyright 2023 jacqueline <me@jacqueline.id.au>
-#
-# SPDX-License-Identifier: GPL-3.0-only
-
-idf_component_register(
-  SRCS "input_touch_wheel.cpp" "input_touch_dpad.cpp" "input_trigger.cpp"
-  "input_volume_buttons.cpp" "lvgl_input_driver.cpp" "feedback_haptics.cpp"
-  "device_factory.cpp" "input_nav_buttons.cpp" "input_hook.cpp"
-  "input_hook_actions.cpp"
-  INCLUDE_DIRS "include"
-  REQUIRES "drivers" "lvgl" "events" "system_fsm")
-
-target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})

src/lua/CMakeLists.txt

@@ -1,13 +0,0 @@
-# Copyright 2023 jacqueline <me@jacqueline.id.au>
-#
-# SPDX-License-Identifier: GPL-3.0-only
-
-idf_component_register(
-  SRCS "lua_theme.cpp" "lua_thread.cpp" "bridge.cpp" "property.cpp" "lua_database.cpp"
-  "lua_queue.cpp" "lua_version.cpp" "lua_theme.cpp" "lua_controls.cpp" "registry.cpp"
-  "lua_screen.cpp"
-  INCLUDE_DIRS "include"
-  REQUIRES "drivers" "lvgl" "tinyfsm" "events" "system_fsm" "database"
-  "esp_timer" "battery" "esp-idf-lua" "luavgl" "lua-linenoise" "lua-term"
-  "esp_app_format")
-target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})

src/main/CMakeLists.txt

@@ -2,8 +2,5 @@
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
-idf_component_register(
+idf_component_register(SRCS "main.cpp" INCLUDE_DIRS "." REQUIRES "tangara")
-  SRCS "main.cpp"
-  INCLUDE_DIRS "."
-  REQUIRES "audio" "ui" "system_fsm" "events")
 target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})

src/system_fsm/CMakeLists.txt

@@ -1,11 +0,0 @@
-# Copyright 2023 jacqueline <me@jacqueline.id.au>
-#
-# SPDX-License-Identifier: GPL-3.0-only
-
-idf_component_register(
-  SRCS "system_fsm.cpp" "running.cpp" "booting.cpp" "idle.cpp"
-  "service_locator.cpp"
-  INCLUDE_DIRS "include"
-  REQUIRES "tinyfsm" "drivers" "database" "ui" "result" "events" "audio"
-  "app_console" "battery" "locale")
-target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})

src/tangara/CMakeLists.txt

@@ -0,0 +1,23 @@
+# Copyright 2024 jacqueline <me@jacqueline.id.au>
+#
+# SPDX-License-Identifier: GPL-3.0-only
+
+idf_component_register(
+  SRC_DIRS "app_console" "audio" "battery" "database" "dev_console" "events"
+  "input" "lua" "system_fsm" "ui"
+  INCLUDE_DIRS "." "app_console" "audio" "battery" "database" "dev_console"
+  "events" "input" "lua" "system_fsm" "ui"
+  REQUIRES "codecs" "drivers" "locale" "memory" "tasks" "util"
+  "tinyfsm" "lvgl" "esp_timer" "luavgl" "esp_app_format" "libcppbor" "libtags"
+  "komihash" "result" "esp_psram" "fatfs" "millershuffle" "speexdsp" "console"
+  "esp-idf-lua" "lua-linenoise" "lua-term")
+target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})
+
+set(LEVELDB_BUILD_TESTS OFF)
+set(LEVELDB_BUILD_BENCHMARKS OFF)
+set(LEVELDB_INSTALL OFF)
+
+set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+
+add_subdirectory($ENV{PROJ_PATH}/lib/leveldb ${CMAKE_CURRENT_BINARY_DIR}/leveldb)
+target_link_libraries(${COMPONENT_LIB} PUBLIC leveldb)

src/tangara/app_console/app_console.cpp

@@ -4,11 +4,9 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "app_console.hpp"
+#include "app_console/app_console.hpp"
 
 #include <dirent.h>
-#include <stdint.h>
-#include <sys/_stdint.h>
 
 #include <algorithm>
 #include <cstdint>
@@ -21,11 +19,7 @@
 #include <string>
 
 #include "FreeRTOSConfig.h"
-#include "audio_events.hpp"
+
-#include "audio_fsm.hpp"
-#include "bluetooth.hpp"
-#include "bluetooth_types.hpp"
-#include "database.hpp"
 #include "esp_app_desc.h"
 #include "esp_console.h"
 #include "esp_err.h"
@@ -34,19 +28,25 @@
 #include "esp_intr_alloc.h"
 #include "esp_log.h"
 #include "esp_system.h"
-#include "event_queue.hpp"
 #include "ff.h"
-#include "freertos/FreeRTOSConfig_arch.h"
 #include "freertos/projdefs.h"
+
+#include "bluetooth.hpp"
+#include "bluetooth_types.hpp"
 #include "haptics.hpp"
-#include "index.hpp"
-#include "lua_registry.hpp"
 #include "memory_resource.hpp"
 #include "samd.hpp"
-#include "service_locator.hpp"
+
-#include "system_events.hpp"
+#include "audio/audio_events.hpp"
-#include "track.hpp"
+#include "audio/audio_fsm.hpp"
-#include "ui_events.hpp"
+#include "database/database.hpp"
+#include "database/index.hpp"
+#include "database/track.hpp"
+#include "events/event_queue.hpp"
+#include "lua/lua_registry.hpp"
+#include "system_fsm/service_locator.hpp"
+#include "system_fsm/system_events.hpp"
+#include "ui/ui_events.hpp"
 
 namespace console {
 

src/tangara/audio/audio_decoder.cpp

@@ -6,20 +6,17 @@
 
 #include "audio_decoder.hpp"
 
-#include <cstdint>
-#include <cstdlib>
-
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
 #include <cstdint>
+#include <cstdlib>
 #include <cstring>
 #include <deque>
 #include <memory>
 #include <span>
 #include <variant>
 
-#include "cbor.h"
 #include "esp_err.h"
 #include "esp_heap_caps.h"
 #include "esp_log.h"
@@ -27,7 +24,6 @@
 #include "freertos/projdefs.h"
 #include "freertos/queue.h"
 #include "freertos/ringbuf.h"
-#include "i2s_dac.hpp"
 
 #include "audio_converter.hpp"
 #include "audio_events.hpp"
@@ -37,6 +33,7 @@
 #include "codec.hpp"
 #include "event_queue.hpp"
 #include "fatfs_audio_input.hpp"
+#include "i2s_dac.hpp"
 #include "sample.hpp"
 #include "tasks.hpp"
 #include "track.hpp"

src/tangara/events/event_queue.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "event_queue.hpp"
+#include "events/event_queue.hpp"
 
 #include "audio_fsm.hpp"
 #include "freertos/FreeRTOS.h"

src/tangara/input/feedback_haptics.cpp

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "feedback_haptics.hpp"
+#include "input/feedback_haptics.hpp"
 
 #include <cstdint>
 

src/tangara/input/input_hook.cpp

@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "input_hook.hpp"
+#include "input/input_hook.hpp"
 
 #include <functional>
 #include <optional>
+
 #include "hal/lv_hal_indev.h"
-#include "input_trigger.hpp"
+#include "lua.hpp"
-#include "lua.h"
+
+#include "input/input_trigger.hpp"
 
 namespace input {
 

src/tangara/input/input_hook_actions.cpp

@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "input_hook_actions.hpp"
+#include "input/input_hook_actions.hpp"
 
 #include <cstdint>
 
 #include "hal/lv_hal_indev.h"
 
-#include "event_queue.hpp"
+#include "events/event_queue.hpp"
-#include "ui_events.hpp"
+#include "ui/ui_events.hpp"
 
 namespace input {
 namespace actions {

src/tangara/input/input_touch_dpad.cpp

@@ -4,19 +4,20 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "input_touch_dpad.hpp"
+#include "input/input_touch_dpad.hpp"
 
 #include <cstdint>
 
 #include "hal/lv_hal_indev.h"
 
-#include "event_queue.hpp"
 #include "haptics.hpp"
-#include "input_device.hpp"
-#include "input_hook_actions.hpp"
-#include "input_touch_dpad.hpp"
 #include "touchwheel.hpp"
 
+#include "events/event_queue.hpp"
+#include "input/input_device.hpp"
+#include "input/input_hook_actions.hpp"
+#include "input/input_touch_dpad.hpp"
+
 namespace input {
 
 TouchDPad::TouchDPad(drivers::TouchWheel& wheel)

src/tangara/input/input_touch_wheel.cpp

@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "input_touch_wheel.hpp"
+#include "input/input_touch_wheel.hpp"
 
 #include <cstdint>
 #include <variant>
 
 #include "hal/lv_hal_indev.h"
 
-#include "event_queue.hpp"
+#include "events/event_queue.hpp"
 #include "haptics.hpp"
 #include "input_device.hpp"
 #include "input_hook_actions.hpp"

src/tangara/input/input_trigger.cpp

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "input_trigger.hpp"
+#include "input/input_trigger.hpp"
-#include <sys/_stdint.h>
 
 #include <cstdint>
+
 #include "esp_timer.h"
 
 namespace input {

src/tangara/input/lvgl_input_driver.cpp

@@ -4,25 +4,25 @@
  * SPDX-License-Identifier: GPL-3.0-only
  */
 
-#include "lvgl_input_driver.hpp"
+#include "input/lvgl_input_driver.hpp"
-#include <stdint.h>
 
 #include <cstdint>
 #include <memory>
 #include <variant>
 
-#include "device_factory.hpp"
+#include "lua.hpp"
-#include "feedback_haptics.hpp"
-#include "input_hook.hpp"
-#include "input_touch_wheel.hpp"
-#include "input_trigger.hpp"
-#include "input_volume_buttons.hpp"
-#include "lauxlib.h"
-#include "lua.h"
-#include "lua_thread.hpp"
 #include "lvgl.h"
+
 #include "nvs.hpp"
-#include "property.hpp"
+
+#include "input/device_factory.hpp"
+#include "input/feedback_haptics.hpp"
+#include "input/input_hook.hpp"
+#include "input/input_touch_wheel.hpp"
+#include "input/input_trigger.hpp"
+#include "input/input_volume_buttons.hpp"
+#include "lua/lua_thread.hpp"
+#include "lua/property.hpp"
 
 [[maybe_unused]] static constexpr char kTag[] = "input";