Merge develop into main (#361)

This commit is contained in:
Ken Van Hoeylandt
2025-10-05 19:37:59 +02:00
committed by GitHub
parent 5777a1381b
commit 2cb413c3d1
10 changed files with 16 additions and 69 deletions
+3 -3
View File
@@ -29,9 +29,9 @@ if (DEFINED ENV{ESP_IDF_VERSION})
init_tactility_globals("sdkconfig")
get_property(TACTILITY_BOARD_PROJECT GLOBAL PROPERTY TACTILITY_BOARD_PROJECT)
set(COMPONENTS App)
set(COMPONENTS Firmware)
set(EXTRA_COMPONENT_DIRS
"App"
"Firmware"
"Boards/${TACTILITY_BOARD_PROJECT}"
"Drivers"
"Tactility"
@@ -93,7 +93,7 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
add_subdirectory(Libraries/mbedtls)
# Sim app
add_subdirectory(App)
add_subdirectory(Firmware)
# Tests
add_subdirectory(Tests)