From 5565b77c7c62cc35c6d03561c15b953eb5dc6fac Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Thu, 22 Jan 2026 21:31:35 +0100 Subject: [PATCH] Fixes --- CMakeLists.txt | 1 + Devices/lilygo-tlora-pager/CMakeLists.txt | 2 +- Devices/lilygo-tlora-pager/devicetree.yaml | 2 +- Devices/simulator/devicetree.yaml | 1 + .../Bindings}/espressif,esp32-gpio.yaml | 0 .../Bindings}/espressif,esp32-i2c.yaml | 0 Drivers/PlatformEsp32/CMakeLists.txt | 20 +++++++++++++++++++ .../Include}/Tactility/bindings/esp32_gpio.h | 0 .../Include}/Tactility/bindings/esp32_i2c.h | 0 .../Include}/Tactility/drivers/Esp32Gpio.h | 0 .../Include}/Tactility/drivers/Esp32I2c.h | 0 .../Source}/Esp32Gpio.cpp | 0 .../Source}/Esp32I2c.cpp | 0 .../Source}/Register.cpp | 0 .../devicetree.yaml | 2 +- Drivers/PlatformPosix/CMakeLists.txt | 20 +++++++++++++++++++ Drivers/PlatformPosix/Source/Register.cpp | 9 +++++++++ Drivers/PlatformPosix/devicetree.yaml | 2 ++ Drivers/drivers-esp/CMakeLists.txt | 20 ------------------- Firmware/CMakeLists.txt | 18 +++++++++-------- .../gpio-controller.yaml | 0 .../i2c-controller.yaml | 0 .../{bindings => Bindings}/i2c-device.yaml | 0 .../{bindings => Bindings}/root.yaml | 0 TactilityKernel/CMakeLists.txt | 10 +++++----- .../{include => Include}/Tactility/Device.h | 0 .../{include => Include}/Tactility/Driver.h | 0 .../{include => Include}/Tactility/Error.h | 0 .../Tactility/FreeRTOS/FreeRTOS.h | 3 +++ .../Tactility/FreeRTOS/README.md | 0 .../Tactility/FreeRTOS/event_groups.h | 4 ++-- .../Tactility/FreeRTOS/port.h | 1 + .../Tactility/FreeRTOS/queue.h | 4 ++-- .../Tactility/FreeRTOS/semphr.h | 4 ++-- .../Tactility/FreeRTOS/task.h | 4 ++-- .../Tactility/FreeRTOS/timers.h | 4 ++-- .../{include => Include}/Tactility/Log.h | 0 .../Tactility/bindings/bindings.h | 0 .../Tactility/bindings/gpio.h | 0 .../Tactility/bindings/root.h | 0 .../Tactility/concurrent/Mutex.h | 0 .../Tactility/concurrent/RecursiveMutex.h | 0 .../Tactility/drivers/Gpio.h | 0 .../Tactility/drivers/GpioController.h | 0 .../Tactility/drivers/I2cController.h | 0 .../Tactility/drivers/Root.h | 0 TactilityKernel/{source => Source}/Device.cpp | 0 TactilityKernel/{source => Source}/Driver.cpp | 1 + TactilityKernel/{source => Source}/Log.cpp | 0 .../drivers/GpioController.cpp | 0 .../drivers/I2cController.cpp | 0 .../{source => Source}/drivers/Register.cpp | 0 .../{source => Source}/drivers/Root.cpp | 0 TactilityKernel/devicetree.yaml | 2 +- 54 files changed, 87 insertions(+), 47 deletions(-) rename Drivers/{drivers-esp/bindings => PlatformEsp32/Bindings}/espressif,esp32-gpio.yaml (100%) rename Drivers/{drivers-esp/bindings => PlatformEsp32/Bindings}/espressif,esp32-i2c.yaml (100%) create mode 100644 Drivers/PlatformEsp32/CMakeLists.txt rename Drivers/{drivers-esp/include => PlatformEsp32/Include}/Tactility/bindings/esp32_gpio.h (100%) rename Drivers/{drivers-esp/include => PlatformEsp32/Include}/Tactility/bindings/esp32_i2c.h (100%) rename Drivers/{drivers-esp/include => PlatformEsp32/Include}/Tactility/drivers/Esp32Gpio.h (100%) rename Drivers/{drivers-esp/include => PlatformEsp32/Include}/Tactility/drivers/Esp32I2c.h (100%) rename Drivers/{drivers-esp/source => PlatformEsp32/Source}/Esp32Gpio.cpp (100%) rename Drivers/{drivers-esp/source => PlatformEsp32/Source}/Esp32I2c.cpp (100%) rename Drivers/{drivers-esp/source => PlatformEsp32/Source}/Register.cpp (100%) rename Drivers/{drivers-esp => PlatformEsp32}/devicetree.yaml (64%) create mode 100644 Drivers/PlatformPosix/CMakeLists.txt create mode 100644 Drivers/PlatformPosix/Source/Register.cpp create mode 100644 Drivers/PlatformPosix/devicetree.yaml delete mode 100644 Drivers/drivers-esp/CMakeLists.txt rename TactilityKernel/{bindings => Bindings}/gpio-controller.yaml (100%) rename TactilityKernel/{bindings => Bindings}/i2c-controller.yaml (100%) rename TactilityKernel/{bindings => Bindings}/i2c-device.yaml (100%) rename TactilityKernel/{bindings => Bindings}/root.yaml (100%) rename TactilityKernel/{include => Include}/Tactility/Device.h (100%) rename TactilityKernel/{include => Include}/Tactility/Driver.h (100%) rename TactilityKernel/{include => Include}/Tactility/Error.h (100%) rename TactilityKernel/{include => Include}/Tactility/FreeRTOS/FreeRTOS.h (53%) rename TactilityKernel/{include => Include}/Tactility/FreeRTOS/README.md (100%) rename TactilityKernel/{include => Include}/Tactility/FreeRTOS/event_groups.h (67%) rename TactilityKernel/{include => Include}/Tactility/FreeRTOS/port.h (77%) rename TactilityKernel/{include => Include}/Tactility/FreeRTOS/queue.h (64%) rename TactilityKernel/{include => Include}/Tactility/FreeRTOS/semphr.h (60%) rename TactilityKernel/{include => Include}/Tactility/FreeRTOS/task.h (63%) rename TactilityKernel/{include => Include}/Tactility/FreeRTOS/timers.h (64%) rename TactilityKernel/{include => Include}/Tactility/Log.h (100%) rename TactilityKernel/{include => Include}/Tactility/bindings/bindings.h (100%) rename TactilityKernel/{include => Include}/Tactility/bindings/gpio.h (100%) rename TactilityKernel/{include => Include}/Tactility/bindings/root.h (100%) rename TactilityKernel/{include => Include}/Tactility/concurrent/Mutex.h (100%) rename TactilityKernel/{include => Include}/Tactility/concurrent/RecursiveMutex.h (100%) rename TactilityKernel/{include => Include}/Tactility/drivers/Gpio.h (100%) rename TactilityKernel/{include => Include}/Tactility/drivers/GpioController.h (100%) rename TactilityKernel/{include => Include}/Tactility/drivers/I2cController.h (100%) rename TactilityKernel/{include => Include}/Tactility/drivers/Root.h (100%) rename TactilityKernel/{source => Source}/Device.cpp (100%) rename TactilityKernel/{source => Source}/Driver.cpp (99%) rename TactilityKernel/{source => Source}/Log.cpp (100%) rename TactilityKernel/{source => Source}/drivers/GpioController.cpp (100%) rename TactilityKernel/{source => Source}/drivers/I2cController.cpp (100%) rename TactilityKernel/{source => Source}/drivers/Register.cpp (100%) rename TactilityKernel/{source => Source}/drivers/Root.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3062a46..46f04396 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,6 +76,7 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION}) add_subdirectory(TactilityCore) add_subdirectory(TactilityFreeRtos) add_subdirectory(TactilityKernel) + add_subdirectory(Drivers/PlatformPosix) add_subdirectory(Devices/simulator) add_subdirectory(Libraries/cJSON) add_subdirectory(Libraries/lv_screenshot) diff --git a/Devices/lilygo-tlora-pager/CMakeLists.txt b/Devices/lilygo-tlora-pager/CMakeLists.txt index 20fe5697..a15cda62 100644 --- a/Devices/lilygo-tlora-pager/CMakeLists.txt +++ b/Devices/lilygo-tlora-pager/CMakeLists.txt @@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES Source/*.c*) idf_component_register( SRCS ${SOURCE_FILES} INCLUDE_DIRS "Source" - REQUIRES Tactility esp_lcd ST7796 BQ25896 BQ27220 TCA8418 DRV2605 PwmBacklight driver esp_adc drivers-esp + REQUIRES Tactility esp_lcd ST7796 BQ25896 BQ27220 TCA8418 DRV2605 PwmBacklight driver esp_adc PlatformEsp32 ) diff --git a/Devices/lilygo-tlora-pager/devicetree.yaml b/Devices/lilygo-tlora-pager/devicetree.yaml index 13354fc0..7b9bf02d 100644 --- a/Devices/lilygo-tlora-pager/devicetree.yaml +++ b/Devices/lilygo-tlora-pager/devicetree.yaml @@ -1,4 +1,4 @@ dependencies: - - Drivers/drivers-esp + - Drivers/PlatformEsp32 bindings: ./ dts: lilygo,tlora_pager.dts diff --git a/Devices/simulator/devicetree.yaml b/Devices/simulator/devicetree.yaml index a1f5d125..e8ab02b4 100644 --- a/Devices/simulator/devicetree.yaml +++ b/Devices/simulator/devicetree.yaml @@ -1,3 +1,4 @@ dependencies: - TactilityKernel + - Drivers/PlatformPosix dts: ../placeholder.dts diff --git a/Drivers/drivers-esp/bindings/espressif,esp32-gpio.yaml b/Drivers/PlatformEsp32/Bindings/espressif,esp32-gpio.yaml similarity index 100% rename from Drivers/drivers-esp/bindings/espressif,esp32-gpio.yaml rename to Drivers/PlatformEsp32/Bindings/espressif,esp32-gpio.yaml diff --git a/Drivers/drivers-esp/bindings/espressif,esp32-i2c.yaml b/Drivers/PlatformEsp32/Bindings/espressif,esp32-i2c.yaml similarity index 100% rename from Drivers/drivers-esp/bindings/espressif,esp32-i2c.yaml rename to Drivers/PlatformEsp32/Bindings/espressif,esp32-i2c.yaml diff --git a/Drivers/PlatformEsp32/CMakeLists.txt b/Drivers/PlatformEsp32/CMakeLists.txt new file mode 100644 index 00000000..d8114435 --- /dev/null +++ b/Drivers/PlatformEsp32/CMakeLists.txt @@ -0,0 +1,20 @@ +cmake_minimum_required(VERSION 3.20) + +file(GLOB_RECURSE SOURCES "Source/*.c**") + +if (DEFINED ENV{ESP_IDF_VERSION}) + + idf_component_register( + SRCS ${SOURCES} + INCLUDE_DIRS "Include/" + REQUIRES TactilityKernel driver + ) + +else () + + add_library(PlatformEsp32 OBJECT) + target_sources(PlatformEsp32 PRIVATE ${SOURCES}) + target_include_directories(PlatformEsp32 PUBLIC Include/) + target_link_libraries(PlatformEsp32 PUBLIC TactilityKernel) + +endif () \ No newline at end of file diff --git a/Drivers/drivers-esp/include/Tactility/bindings/esp32_gpio.h b/Drivers/PlatformEsp32/Include/Tactility/bindings/esp32_gpio.h similarity index 100% rename from Drivers/drivers-esp/include/Tactility/bindings/esp32_gpio.h rename to Drivers/PlatformEsp32/Include/Tactility/bindings/esp32_gpio.h diff --git a/Drivers/drivers-esp/include/Tactility/bindings/esp32_i2c.h b/Drivers/PlatformEsp32/Include/Tactility/bindings/esp32_i2c.h similarity index 100% rename from Drivers/drivers-esp/include/Tactility/bindings/esp32_i2c.h rename to Drivers/PlatformEsp32/Include/Tactility/bindings/esp32_i2c.h diff --git a/Drivers/drivers-esp/include/Tactility/drivers/Esp32Gpio.h b/Drivers/PlatformEsp32/Include/Tactility/drivers/Esp32Gpio.h similarity index 100% rename from Drivers/drivers-esp/include/Tactility/drivers/Esp32Gpio.h rename to Drivers/PlatformEsp32/Include/Tactility/drivers/Esp32Gpio.h diff --git a/Drivers/drivers-esp/include/Tactility/drivers/Esp32I2c.h b/Drivers/PlatformEsp32/Include/Tactility/drivers/Esp32I2c.h similarity index 100% rename from Drivers/drivers-esp/include/Tactility/drivers/Esp32I2c.h rename to Drivers/PlatformEsp32/Include/Tactility/drivers/Esp32I2c.h diff --git a/Drivers/drivers-esp/source/Esp32Gpio.cpp b/Drivers/PlatformEsp32/Source/Esp32Gpio.cpp similarity index 100% rename from Drivers/drivers-esp/source/Esp32Gpio.cpp rename to Drivers/PlatformEsp32/Source/Esp32Gpio.cpp diff --git a/Drivers/drivers-esp/source/Esp32I2c.cpp b/Drivers/PlatformEsp32/Source/Esp32I2c.cpp similarity index 100% rename from Drivers/drivers-esp/source/Esp32I2c.cpp rename to Drivers/PlatformEsp32/Source/Esp32I2c.cpp diff --git a/Drivers/drivers-esp/source/Register.cpp b/Drivers/PlatformEsp32/Source/Register.cpp similarity index 100% rename from Drivers/drivers-esp/source/Register.cpp rename to Drivers/PlatformEsp32/Source/Register.cpp diff --git a/Drivers/drivers-esp/devicetree.yaml b/Drivers/PlatformEsp32/devicetree.yaml similarity index 64% rename from Drivers/drivers-esp/devicetree.yaml rename to Drivers/PlatformEsp32/devicetree.yaml index a07d6f33..df5465c0 100644 --- a/Drivers/drivers-esp/devicetree.yaml +++ b/Drivers/PlatformEsp32/devicetree.yaml @@ -1,3 +1,3 @@ dependencies: - TactilityKernel -bindings: bindings +bindings: Bindings diff --git a/Drivers/PlatformPosix/CMakeLists.txt b/Drivers/PlatformPosix/CMakeLists.txt new file mode 100644 index 00000000..0f794775 --- /dev/null +++ b/Drivers/PlatformPosix/CMakeLists.txt @@ -0,0 +1,20 @@ +cmake_minimum_required(VERSION 3.20) + +file(GLOB_RECURSE SOURCES "Source/*.c**") + +if (DEFINED ENV{ESP_IDF_VERSION}) + + idf_component_register( + SRCS ${SOURCES} +# INCLUDE_DIRS "Include/" + REQUIRES TactilityKernel driver + ) + +else () + + add_library(PlatformPosix OBJECT) + target_sources(PlatformPosix PRIVATE ${SOURCES}) +# target_include_directories(PlatformPosix PUBLIC Include/) + target_link_libraries(PlatformPosix PUBLIC TactilityKernel) + +endif () \ No newline at end of file diff --git a/Drivers/PlatformPosix/Source/Register.cpp b/Drivers/PlatformPosix/Source/Register.cpp new file mode 100644 index 00000000..6453236e --- /dev/null +++ b/Drivers/PlatformPosix/Source/Register.cpp @@ -0,0 +1,9 @@ +#include + +extern "C" { + +extern void register_platform_drivers() { + /* Placeholder */ +} + +} diff --git a/Drivers/PlatformPosix/devicetree.yaml b/Drivers/PlatformPosix/devicetree.yaml new file mode 100644 index 00000000..6bbb2436 --- /dev/null +++ b/Drivers/PlatformPosix/devicetree.yaml @@ -0,0 +1,2 @@ +dependencies: + - TactilityKernel diff --git a/Drivers/drivers-esp/CMakeLists.txt b/Drivers/drivers-esp/CMakeLists.txt deleted file mode 100644 index 40b0614c..00000000 --- a/Drivers/drivers-esp/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 3.20) - -file(GLOB_RECURSE SOURCES "source/*.c**") - -if (DEFINED ENV{ESP_IDF_VERSION}) - - idf_component_register( - SRCS ${SOURCES} - INCLUDE_DIRS "include/" - REQUIRES TactilityKernel driver - ) - -else () - - add_library(drivers-esp OBJECT) - target_sources(drivers-esp PRIVATE ${SOURCES}) - target_include_directories(drivers-esp PUBLIC include/) - target_link_libraries(drivers-esp PUBLIC core) - -endif () \ No newline at end of file diff --git a/Firmware/CMakeLists.txt b/Firmware/CMakeLists.txt index e0fafdd9..79d84657 100644 --- a/Firmware/CMakeLists.txt +++ b/Firmware/CMakeLists.txt @@ -18,19 +18,20 @@ if (DEFINED ENV{ESP_IDF_VERSION}) idf_component_register( SRCS ${SOURCE_FILES} "${CMAKE_SOURCE_DIR}/Firmware/Generated/devicetree.c" - REQUIRES Tactility TactilityC TactilityKernel drivers-esp ${TACTILITY_DEVICE_PROJECT} + REQUIRES Tactility TactilityC TactilityKernel PlatformEsp32 ${TACTILITY_DEVICE_PROJECT} ) else () add_executable(FirmwareSim ${SOURCE_FILES} "${CMAKE_SOURCE_DIR}/Firmware/Generated/devicetree.c") - target_link_libraries(FirmwareSim - PRIVATE Tactility - PRIVATE TactilityCore - PRIVATE TactilityFreeRtos - PRIVATE TactilityKernel - PRIVATE Simulator - PRIVATE SDL2::SDL2-static SDL2-static + target_link_libraries(FirmwareSim PRIVATE + Tactility + TactilityCore + TactilityFreeRtos + TactilityKernel + Simulator + PlatformPosix + SDL2::SDL2-static SDL2-static ) add_definitions(-D_Nullable=) @@ -52,6 +53,7 @@ add_custom_command( ) add_custom_target(Generated DEPENDS "${CMAKE_SOURCE_DIR}/Firmware/Generated/devicetree.c") set_source_files_properties("${CMAKE_SOURCE_DIR}/Firmware/Generated/devicetree.c" PROPERTIES GENERATED TRUE) +set_source_files_properties("${CMAKE_SOURCE_DIR}/Firmware/Generated/devicetree.h" PROPERTIES GENERATED TRUE) # Update target for generated code target_sources(${COMPONENT_LIB} PRIVATE "${CMAKE_SOURCE_DIR}/Firmware/Generated/devicetree.c") target_include_directories(${COMPONENT_LIB} PRIVATE "${CMAKE_SOURCE_DIR}/Firmware/Generated") diff --git a/TactilityKernel/bindings/gpio-controller.yaml b/TactilityKernel/Bindings/gpio-controller.yaml similarity index 100% rename from TactilityKernel/bindings/gpio-controller.yaml rename to TactilityKernel/Bindings/gpio-controller.yaml diff --git a/TactilityKernel/bindings/i2c-controller.yaml b/TactilityKernel/Bindings/i2c-controller.yaml similarity index 100% rename from TactilityKernel/bindings/i2c-controller.yaml rename to TactilityKernel/Bindings/i2c-controller.yaml diff --git a/TactilityKernel/bindings/i2c-device.yaml b/TactilityKernel/Bindings/i2c-device.yaml similarity index 100% rename from TactilityKernel/bindings/i2c-device.yaml rename to TactilityKernel/Bindings/i2c-device.yaml diff --git a/TactilityKernel/bindings/root.yaml b/TactilityKernel/Bindings/root.yaml similarity index 100% rename from TactilityKernel/bindings/root.yaml rename to TactilityKernel/Bindings/root.yaml diff --git a/TactilityKernel/CMakeLists.txt b/TactilityKernel/CMakeLists.txt index 6c1ba1a3..5644a317 100644 --- a/TactilityKernel/CMakeLists.txt +++ b/TactilityKernel/CMakeLists.txt @@ -1,18 +1,18 @@ cmake_minimum_required(VERSION 3.20) -file(GLOB_RECURSE SOURCES "source/*.c**") +file(GLOB_RECURSE SOURCES "Source/*.c**") if (DEFINED ENV{ESP_IDF_VERSION}) idf_component_register( SRCS ${SOURCES} - INCLUDE_DIRS "include/" + INCLUDE_DIRS "Include/" ) else () - add_library(core OBJECT ${SOURCES}) - target_include_directories(core PUBLIC include/) - target_link_libraries(core PUBLIC freertos_kernel) + add_library(TactilityKernel OBJECT ${SOURCES}) + target_include_directories(TactilityKernel PUBLIC Include/) + target_link_libraries(TactilityKernel PUBLIC freertos_kernel) endif () diff --git a/TactilityKernel/include/Tactility/Device.h b/TactilityKernel/Include/Tactility/Device.h similarity index 100% rename from TactilityKernel/include/Tactility/Device.h rename to TactilityKernel/Include/Tactility/Device.h diff --git a/TactilityKernel/include/Tactility/Driver.h b/TactilityKernel/Include/Tactility/Driver.h similarity index 100% rename from TactilityKernel/include/Tactility/Driver.h rename to TactilityKernel/Include/Tactility/Driver.h diff --git a/TactilityKernel/include/Tactility/Error.h b/TactilityKernel/Include/Tactility/Error.h similarity index 100% rename from TactilityKernel/include/Tactility/Error.h rename to TactilityKernel/Include/Tactility/Error.h diff --git a/TactilityKernel/include/Tactility/FreeRTOS/FreeRTOS.h b/TactilityKernel/Include/Tactility/FreeRTOS/FreeRTOS.h similarity index 53% rename from TactilityKernel/include/Tactility/FreeRTOS/FreeRTOS.h rename to TactilityKernel/Include/Tactility/FreeRTOS/FreeRTOS.h index 42481234..4d148d81 100644 --- a/TactilityKernel/include/Tactility/FreeRTOS/FreeRTOS.h +++ b/TactilityKernel/Include/Tactility/FreeRTOS/FreeRTOS.h @@ -5,3 +5,6 @@ #else #include #endif + +// Custom port compatibility definitins, mainly for PC compatibility +#include "port.h" diff --git a/TactilityKernel/include/Tactility/FreeRTOS/README.md b/TactilityKernel/Include/Tactility/FreeRTOS/README.md similarity index 100% rename from TactilityKernel/include/Tactility/FreeRTOS/README.md rename to TactilityKernel/Include/Tactility/FreeRTOS/README.md diff --git a/TactilityKernel/include/Tactility/FreeRTOS/event_groups.h b/TactilityKernel/Include/Tactility/FreeRTOS/event_groups.h similarity index 67% rename from TactilityKernel/include/Tactility/FreeRTOS/event_groups.h rename to TactilityKernel/Include/Tactility/FreeRTOS/event_groups.h index 49b52699..665eeb64 100644 --- a/TactilityKernel/include/Tactility/FreeRTOS/event_groups.h +++ b/TactilityKernel/Include/Tactility/FreeRTOS/event_groups.h @@ -1,10 +1,10 @@ #pragma once +#include "FreeRTOS.h" + #ifdef ESP_PLATFORM -#include #include #else -#include #include #endif diff --git a/TactilityKernel/include/Tactility/FreeRTOS/port.h b/TactilityKernel/Include/Tactility/FreeRTOS/port.h similarity index 77% rename from TactilityKernel/include/Tactility/FreeRTOS/port.h rename to TactilityKernel/Include/Tactility/FreeRTOS/port.h index cddbf9ff..d897dafc 100644 --- a/TactilityKernel/include/Tactility/FreeRTOS/port.h +++ b/TactilityKernel/Include/Tactility/FreeRTOS/port.h @@ -4,4 +4,5 @@ #ifndef ESP_PLATFORM #define xPortInIsrContext(x) (false) +#define vPortAssertIfInISR() #endif diff --git a/TactilityKernel/include/Tactility/FreeRTOS/queue.h b/TactilityKernel/Include/Tactility/FreeRTOS/queue.h similarity index 64% rename from TactilityKernel/include/Tactility/FreeRTOS/queue.h rename to TactilityKernel/Include/Tactility/FreeRTOS/queue.h index ef370454..b22e3584 100644 --- a/TactilityKernel/include/Tactility/FreeRTOS/queue.h +++ b/TactilityKernel/Include/Tactility/FreeRTOS/queue.h @@ -1,10 +1,10 @@ #pragma once +#include "FreeRTOS.h" + #ifdef ESP_PLATFORM -#include #include #else -#include #include #endif diff --git a/TactilityKernel/include/Tactility/FreeRTOS/semphr.h b/TactilityKernel/Include/Tactility/FreeRTOS/semphr.h similarity index 60% rename from TactilityKernel/include/Tactility/FreeRTOS/semphr.h rename to TactilityKernel/Include/Tactility/FreeRTOS/semphr.h index a6a16237..9aa7332b 100644 --- a/TactilityKernel/include/Tactility/FreeRTOS/semphr.h +++ b/TactilityKernel/Include/Tactility/FreeRTOS/semphr.h @@ -1,9 +1,9 @@ #pragma once +#include "FreeRTOS.h" + #ifdef ESP_PLATFORM -#include #include #else -#include #include #endif \ No newline at end of file diff --git a/TactilityKernel/include/Tactility/FreeRTOS/task.h b/TactilityKernel/Include/Tactility/FreeRTOS/task.h similarity index 63% rename from TactilityKernel/include/Tactility/FreeRTOS/task.h rename to TactilityKernel/Include/Tactility/FreeRTOS/task.h index 59b5d65c..cb01be7a 100644 --- a/TactilityKernel/include/Tactility/FreeRTOS/task.h +++ b/TactilityKernel/Include/Tactility/FreeRTOS/task.h @@ -1,10 +1,10 @@ #pragma once +#include "FreeRTOS.h" + #ifdef ESP_PLATFORM -#include #include #else -#include #include #endif diff --git a/TactilityKernel/include/Tactility/FreeRTOS/timers.h b/TactilityKernel/Include/Tactility/FreeRTOS/timers.h similarity index 64% rename from TactilityKernel/include/Tactility/FreeRTOS/timers.h rename to TactilityKernel/Include/Tactility/FreeRTOS/timers.h index 45cf6c6e..f1e60b47 100644 --- a/TactilityKernel/include/Tactility/FreeRTOS/timers.h +++ b/TactilityKernel/Include/Tactility/FreeRTOS/timers.h @@ -1,9 +1,9 @@ #pragma once +#include "FreeRTOS.h" + #ifdef ESP_PLATFORM -#include #include #else -#include #include #endif diff --git a/TactilityKernel/include/Tactility/Log.h b/TactilityKernel/Include/Tactility/Log.h similarity index 100% rename from TactilityKernel/include/Tactility/Log.h rename to TactilityKernel/Include/Tactility/Log.h diff --git a/TactilityKernel/include/Tactility/bindings/bindings.h b/TactilityKernel/Include/Tactility/bindings/bindings.h similarity index 100% rename from TactilityKernel/include/Tactility/bindings/bindings.h rename to TactilityKernel/Include/Tactility/bindings/bindings.h diff --git a/TactilityKernel/include/Tactility/bindings/gpio.h b/TactilityKernel/Include/Tactility/bindings/gpio.h similarity index 100% rename from TactilityKernel/include/Tactility/bindings/gpio.h rename to TactilityKernel/Include/Tactility/bindings/gpio.h diff --git a/TactilityKernel/include/Tactility/bindings/root.h b/TactilityKernel/Include/Tactility/bindings/root.h similarity index 100% rename from TactilityKernel/include/Tactility/bindings/root.h rename to TactilityKernel/Include/Tactility/bindings/root.h diff --git a/TactilityKernel/include/Tactility/concurrent/Mutex.h b/TactilityKernel/Include/Tactility/concurrent/Mutex.h similarity index 100% rename from TactilityKernel/include/Tactility/concurrent/Mutex.h rename to TactilityKernel/Include/Tactility/concurrent/Mutex.h diff --git a/TactilityKernel/include/Tactility/concurrent/RecursiveMutex.h b/TactilityKernel/Include/Tactility/concurrent/RecursiveMutex.h similarity index 100% rename from TactilityKernel/include/Tactility/concurrent/RecursiveMutex.h rename to TactilityKernel/Include/Tactility/concurrent/RecursiveMutex.h diff --git a/TactilityKernel/include/Tactility/drivers/Gpio.h b/TactilityKernel/Include/Tactility/drivers/Gpio.h similarity index 100% rename from TactilityKernel/include/Tactility/drivers/Gpio.h rename to TactilityKernel/Include/Tactility/drivers/Gpio.h diff --git a/TactilityKernel/include/Tactility/drivers/GpioController.h b/TactilityKernel/Include/Tactility/drivers/GpioController.h similarity index 100% rename from TactilityKernel/include/Tactility/drivers/GpioController.h rename to TactilityKernel/Include/Tactility/drivers/GpioController.h diff --git a/TactilityKernel/include/Tactility/drivers/I2cController.h b/TactilityKernel/Include/Tactility/drivers/I2cController.h similarity index 100% rename from TactilityKernel/include/Tactility/drivers/I2cController.h rename to TactilityKernel/Include/Tactility/drivers/I2cController.h diff --git a/TactilityKernel/include/Tactility/drivers/Root.h b/TactilityKernel/Include/Tactility/drivers/Root.h similarity index 100% rename from TactilityKernel/include/Tactility/drivers/Root.h rename to TactilityKernel/Include/Tactility/drivers/Root.h diff --git a/TactilityKernel/source/Device.cpp b/TactilityKernel/Source/Device.cpp similarity index 100% rename from TactilityKernel/source/Device.cpp rename to TactilityKernel/Source/Device.cpp diff --git a/TactilityKernel/source/Driver.cpp b/TactilityKernel/Source/Driver.cpp similarity index 99% rename from TactilityKernel/source/Driver.cpp rename to TactilityKernel/Source/Driver.cpp index 3c8c1cd6..cd907f31 100644 --- a/TactilityKernel/source/Driver.cpp +++ b/TactilityKernel/Source/Driver.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include diff --git a/TactilityKernel/source/Log.cpp b/TactilityKernel/Source/Log.cpp similarity index 100% rename from TactilityKernel/source/Log.cpp rename to TactilityKernel/Source/Log.cpp diff --git a/TactilityKernel/source/drivers/GpioController.cpp b/TactilityKernel/Source/drivers/GpioController.cpp similarity index 100% rename from TactilityKernel/source/drivers/GpioController.cpp rename to TactilityKernel/Source/drivers/GpioController.cpp diff --git a/TactilityKernel/source/drivers/I2cController.cpp b/TactilityKernel/Source/drivers/I2cController.cpp similarity index 100% rename from TactilityKernel/source/drivers/I2cController.cpp rename to TactilityKernel/Source/drivers/I2cController.cpp diff --git a/TactilityKernel/source/drivers/Register.cpp b/TactilityKernel/Source/drivers/Register.cpp similarity index 100% rename from TactilityKernel/source/drivers/Register.cpp rename to TactilityKernel/Source/drivers/Register.cpp diff --git a/TactilityKernel/source/drivers/Root.cpp b/TactilityKernel/Source/drivers/Root.cpp similarity index 100% rename from TactilityKernel/source/drivers/Root.cpp rename to TactilityKernel/Source/drivers/Root.cpp diff --git a/TactilityKernel/devicetree.yaml b/TactilityKernel/devicetree.yaml index 3f9c0837..6723f7af 100644 --- a/TactilityKernel/devicetree.yaml +++ b/TactilityKernel/devicetree.yaml @@ -1 +1 @@ -bindings: bindings +bindings: Bindings