Merge TactilityHeadless into Tactility (#263)

There currently is no practical use to have TactilityHeadless as a subproject. I'm merging it with the Tactility project.

.github/workflows/tests.yml

@@ -22,4 +22,4 @@ jobs:
       - name: "Run TactilityCore Tests"
         run: build/Tests/TactilityCore/TactilityCoreTests --exit
       - name: "Run TactilityHeadless Tests"
-        run: build/Tests/TactilityHeadless/TactilityHeadlessTests --exit
+        run: build/Tests/Tactility/TactilityTests --exit

App/CMakeLists.txt

@@ -19,7 +19,6 @@ else ()
     target_link_libraries(AppSim
         PRIVATE Tactility
         PRIVATE TactilityCore
-        PRIVATE TactilityHeadless
         PRIVATE Simulator
         PRIVATE SDL2::SDL2-static SDL2-static
     )

Boards/Simulator/CMakeLists.txt

@@ -15,7 +15,6 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
     target_link_libraries(Simulator
         PRIVATE Tactility
         PRIVATE TactilityCore
-        PRIVATE TactilityHeadless
         PRIVATE lvgl
         PRIVATE SDL2-static
     )

Buildscripts/runtests.sh

@@ -3,5 +3,5 @@
 cmake -S ./ -B build-sim
 cmake --build build-sim --target build-tests -j 14
 build-sim/Tests/TactilityCore/TactilityCoreTests --exit
-build-sim/Tests/TactilityHeadless/TactilityHeadlessTests --exit
+build-sim/Tests/Tactility/TactilityTests --exit
 

CMakeLists.txt

@@ -27,7 +27,6 @@ if (DEFINED ENV{ESP_IDF_VERSION})
         "Tactility"
         "TactilityC"
         "TactilityCore"
-        "TactilityHeadless"
         "Libraries/esp_lvgl_port"
         "Libraries/elf_loader"
         "Libraries/lvgl"
@@ -58,7 +57,6 @@ project(Tactility)
 if (NOT DEFINED ENV{ESP_IDF_VERSION})
     add_subdirectory(Tactility)
     add_subdirectory(TactilityCore)
-    add_subdirectory(TactilityHeadless)
     add_subdirectory(Boards/Simulator)
 endif()
 

Documentation/application-lifecycle.puml

@@ -1,9 +0,0 @@
-@startuml
-[*] --> onStart : app is created
-onStart --> onShow : app becomes visible
-onShow --> onHide : app is no longer visible
-onHide --> onStop : app is preparing to be destroyed
-onStop --> [*] : app is destroyed
-skinparam ranksep 25
-skinparam padding 2
-@enduml

Documentation/project-structure.puml

@@ -1,19 +0,0 @@
-@startuml
-skinparam componentStyle uml1
-
-[Tactility] as t
-note right of t : to build and use graphical apps
-[TactilityHeadless] as theadless
-note right of theadless : to build and use background services
-[TactilityCore] as tcore
-note right of tcore : defines, data types, logging, async, etc.
-
-[App] as app
-
-note right of app : App depends on the board \n projects for configuration
-
-[app] ..> [t]
-[t] ..> [theadless]
-[theadless] ..> [tcore]
-
-@enduml

Tactility/CMakeLists.txt

@@ -6,16 +6,29 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if (DEFINED ENV{ESP_IDF_VERSION})
     file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
 
+    list(APPEND REQUIRES_LIST TactilityCore lvgl driver elf_loader lv_screenshot QRCode esp_lvgl_port minmea esp_wifi nvs_flash spiffs vfs fatfs lwip)
+    if ("${IDF_TARGET}" STREQUAL "esp32s3")
+        list(APPEND REQUIRES_LIST esp_tinyusb)
+    endif ()
+
     idf_component_register(
         SRCS ${SOURCE_FILES}
         INCLUDE_DIRS "Include/"
         PRIV_INCLUDE_DIRS "Private/"
-        REQUIRES TactilityHeadless lvgl driver elf_loader lv_screenshot QRCode esp_lvgl_port
+        REQUIRES ${REQUIRES_LIST}
     )
 
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         target_compile_options(${COMPONENT_LIB} PUBLIC -Wno-unused-variable)
-    endif()
+    endif ()
+
+    if (NOT DEFINED TACTILITY_SKIP_SPIFFS)
+        # Read-only
+        fatfs_create_rawflash_image(system "${CMAKE_CURRENT_SOURCE_DIR}/../Data/system" FLASH_IN_PROJECT PRESERVE_TIME)
+        # Read-write
+        fatfs_create_spiflash_image(data "${CMAKE_CURRENT_SOURCE_DIR}/../Data/data" FLASH_IN_PROJECT PRESERVE_TIME)
+    endif ()
+
 else()
     file(GLOB_RECURSE SOURCES "Source/*.c*")
 
@@ -37,10 +50,11 @@ else()
     add_definitions(-D_Nonnull=)
 
     target_link_libraries(Tactility
-        PUBLIC TactilityHeadless
-        PUBLIC lvgl
+        PUBLIC TactilityCore
         PUBLIC freertos_kernel
+        PUBLIC lvgl
         PUBLIC lv_screenshot
+        PUBLIC minmea
     )
 endif()