mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-02-20 15:35:05 +00:00
Rename core to TactilityKernel
This commit is contained in:
parent
99bbe105eb
commit
cc5050b7c6
@ -32,7 +32,7 @@ if (DEFINED ENV{ESP_IDF_VERSION})
|
|||||||
"Firmware"
|
"Firmware"
|
||||||
"Devices/${TACTILITY_DEVICE_PROJECT}"
|
"Devices/${TACTILITY_DEVICE_PROJECT}"
|
||||||
"Drivers"
|
"Drivers"
|
||||||
"core"
|
"TactilityKernel"
|
||||||
"Tactility"
|
"Tactility"
|
||||||
"TactilityC"
|
"TactilityC"
|
||||||
"TactilityCore"
|
"TactilityCore"
|
||||||
@ -75,13 +75,13 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION})
|
|||||||
add_subdirectory(Tactility)
|
add_subdirectory(Tactility)
|
||||||
add_subdirectory(TactilityCore)
|
add_subdirectory(TactilityCore)
|
||||||
add_subdirectory(TactilityFreeRtos)
|
add_subdirectory(TactilityFreeRtos)
|
||||||
|
add_subdirectory(TactilityKernel)
|
||||||
add_subdirectory(Devices/simulator)
|
add_subdirectory(Devices/simulator)
|
||||||
add_subdirectory(Libraries/cJSON)
|
add_subdirectory(Libraries/cJSON)
|
||||||
add_subdirectory(Libraries/lv_screenshot)
|
add_subdirectory(Libraries/lv_screenshot)
|
||||||
add_subdirectory(Libraries/QRCode)
|
add_subdirectory(Libraries/QRCode)
|
||||||
add_subdirectory(Libraries/minitar)
|
add_subdirectory(Libraries/minitar)
|
||||||
add_subdirectory(Libraries/minmea)
|
add_subdirectory(Libraries/minmea)
|
||||||
add_subdirectory(core)
|
|
||||||
|
|
||||||
# FreeRTOS
|
# FreeRTOS
|
||||||
set(FREERTOS_CONFIG_FILE_DIRECTORY ${PROJECT_SOURCE_DIR}/Devices/simulator/Source CACHE STRING "")
|
set(FREERTOS_CONFIG_FILE_DIRECTORY ${PROJECT_SOURCE_DIR}/Devices/simulator/Source CACHE STRING "")
|
||||||
|
|||||||
@ -7,7 +7,7 @@ if (DEFINED ENV{ESP_IDF_VERSION})
|
|||||||
idf_component_register(
|
idf_component_register(
|
||||||
SRCS ${SOURCES}
|
SRCS ${SOURCES}
|
||||||
INCLUDE_DIRS "include/"
|
INCLUDE_DIRS "include/"
|
||||||
REQUIRES core driver
|
REQUIRES TactilityKernel driver
|
||||||
)
|
)
|
||||||
|
|
||||||
else ()
|
else ()
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
dependencies:
|
dependencies:
|
||||||
- core
|
- TactilityKernel
|
||||||
bindings: bindings
|
bindings: bindings
|
||||||
|
|||||||
@ -22,7 +22,7 @@ if (DEFINED ENV{ESP_IDF_VERSION})
|
|||||||
idf_component_register(
|
idf_component_register(
|
||||||
SRCS ${SOURCE_FILES}
|
SRCS ${SOURCE_FILES}
|
||||||
REQUIRES ${DEVICE_COMPONENTS}
|
REQUIRES ${DEVICE_COMPONENTS}
|
||||||
REQUIRES Tactility TactilityC core drivers-esp ${TACTILITY_DEVICE_PROJECT}
|
REQUIRES Tactility TactilityC TactilityKernel drivers-esp ${TACTILITY_DEVICE_PROJECT}
|
||||||
)
|
)
|
||||||
|
|
||||||
else ()
|
else ()
|
||||||
@ -32,9 +32,9 @@ else ()
|
|||||||
PRIVATE Tactility
|
PRIVATE Tactility
|
||||||
PRIVATE TactilityCore
|
PRIVATE TactilityCore
|
||||||
PRIVATE TactilityFreeRtos
|
PRIVATE TactilityFreeRtos
|
||||||
|
PRIVATE TactilityKernel
|
||||||
PRIVATE Simulator
|
PRIVATE Simulator
|
||||||
PRIVATE SDL2::SDL2-static SDL2-static
|
PRIVATE SDL2::SDL2-static SDL2-static
|
||||||
PRIVATE core
|
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(FirmwareSim PRIVATE "${CMAKE_SOURCE_DIR}/Firmware/Generated")
|
target_include_directories(FirmwareSim PRIVATE "${CMAKE_SOURCE_DIR}/Firmware/Generated")
|
||||||
|
|||||||
@ -4,7 +4,7 @@ if (DEFINED ENV{ESP_IDF_VERSION})
|
|||||||
file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
|
file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
|
||||||
|
|
||||||
list(APPEND REQUIRES_LIST
|
list(APPEND REQUIRES_LIST
|
||||||
core
|
TactilityKernel
|
||||||
TactilityCore
|
TactilityCore
|
||||||
TactilityFreeRtos
|
TactilityFreeRtos
|
||||||
lvgl
|
lvgl
|
||||||
@ -72,12 +72,12 @@ else()
|
|||||||
PUBLIC cJSON
|
PUBLIC cJSON
|
||||||
PUBLIC TactilityFreeRtos
|
PUBLIC TactilityFreeRtos
|
||||||
PUBLIC TactilityCore
|
PUBLIC TactilityCore
|
||||||
|
PUBLIC TactilityKernel
|
||||||
PUBLIC freertos_kernel
|
PUBLIC freertos_kernel
|
||||||
PUBLIC lvgl
|
PUBLIC lvgl
|
||||||
PUBLIC lv_screenshot
|
PUBLIC lv_screenshot
|
||||||
PUBLIC minmea
|
PUBLIC minmea
|
||||||
PUBLIC minitar
|
PUBLIC minitar
|
||||||
PUBLIC core
|
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user