From c1ac1942181aedb507634dffa2127873c26438fd Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Fri, 6 Feb 2026 08:59:27 +0100 Subject: [PATCH] Fixes --- .../Source/drivers/TloraPager.cpp | 2 +- TactilityKernel/Source/driver.cpp | 20 +++++++++---------- Tests/CMakeLists.txt | 2 +- Tests/{ => Doctest}/Include/doctest.h | 0 Tests/Tactility/CMakeLists.txt | 10 +++------- .../Tactility/{ => Source}/HalDeviceTest.cpp | 0 Tests/Tactility/{ => Source}/Main.cpp | 0 .../Tactility/{ => Source}/ObjectFileTest.cpp | 0 .../{ => Source}/PropertiesFileTest.cpp | 0 Tests/Tactility/{ => Source}/UrlTest.cpp | 0 Tests/TactilityCore/CMakeLists.txt | 10 +++------- .../TactilityCore/{ => Source}/BundleTest.cpp | 0 Tests/TactilityCore/{ => Source}/FileTest.cpp | 0 Tests/TactilityCore/{ => Source}/Main.cpp | 0 .../TactilityCore/{ => Source}/StringTest.cpp | 0 Tests/TactilityCore/{ => Source}/TestFile.h | 0 Tests/TactilityFreeRtos/CMakeLists.txt | 10 +++------- .../{ => Source}/DispatcherTest.cpp | 0 .../{ => Source}/DispatcherThreadTest.cpp | 0 .../{ => Source}/LockTest.cpp | 0 Tests/TactilityFreeRtos/{ => Source}/Main.cpp | 0 .../{ => Source}/MessageQueueTest.cpp | 0 .../{ => Source}/MutexTest.cpp | 0 .../{ => Source}/PubSubTest.cpp | 0 .../{ => Source}/RecursiveMutexTest.cpp | 0 .../{ => Source}/SemaphoreTest.cpp | 0 .../{ => Source}/ThreadTest.cpp | 0 .../{ => Source}/TimerTest.cpp | 0 Tests/TactilityKernel/CMakeLists.txt | 2 +- .../{ => Source}/DeviceTest.cpp | 0 .../{ => Source}/DispatcherTest.cpp | 0 .../{ => Source}/DriverIntegrationTest.cpp | 0 .../{ => Source}/DriverTest.cpp | 0 Tests/TactilityKernel/{ => Source}/Main.cpp | 0 .../{ => Source}/ModuleTest.cpp | 0 .../{ => Source}/MutexTest.cpp | 0 .../{ => Source}/RecursiveMutexTest.cpp | 0 .../{ => Source}/ThreadTest.cpp | 0 .../{ => Source}/TimeAndDelay.cpp | 0 .../{ => Source}/TimerTest.cpp | 0 40 files changed, 22 insertions(+), 34 deletions(-) rename Tests/{ => Doctest}/Include/doctest.h (100%) rename Tests/Tactility/{ => Source}/HalDeviceTest.cpp (100%) rename Tests/Tactility/{ => Source}/Main.cpp (100%) rename Tests/Tactility/{ => Source}/ObjectFileTest.cpp (100%) rename Tests/Tactility/{ => Source}/PropertiesFileTest.cpp (100%) rename Tests/Tactility/{ => Source}/UrlTest.cpp (100%) rename Tests/TactilityCore/{ => Source}/BundleTest.cpp (100%) rename Tests/TactilityCore/{ => Source}/FileTest.cpp (100%) rename Tests/TactilityCore/{ => Source}/Main.cpp (100%) rename Tests/TactilityCore/{ => Source}/StringTest.cpp (100%) rename Tests/TactilityCore/{ => Source}/TestFile.h (100%) rename Tests/TactilityFreeRtos/{ => Source}/DispatcherTest.cpp (100%) rename Tests/TactilityFreeRtos/{ => Source}/DispatcherThreadTest.cpp (100%) rename Tests/TactilityFreeRtos/{ => Source}/LockTest.cpp (100%) rename Tests/TactilityFreeRtos/{ => Source}/Main.cpp (100%) rename Tests/TactilityFreeRtos/{ => Source}/MessageQueueTest.cpp (100%) rename Tests/TactilityFreeRtos/{ => Source}/MutexTest.cpp (100%) rename Tests/TactilityFreeRtos/{ => Source}/PubSubTest.cpp (100%) rename Tests/TactilityFreeRtos/{ => Source}/RecursiveMutexTest.cpp (100%) rename Tests/TactilityFreeRtos/{ => Source}/SemaphoreTest.cpp (100%) rename Tests/TactilityFreeRtos/{ => Source}/ThreadTest.cpp (100%) rename Tests/TactilityFreeRtos/{ => Source}/TimerTest.cpp (100%) rename Tests/TactilityKernel/{ => Source}/DeviceTest.cpp (100%) rename Tests/TactilityKernel/{ => Source}/DispatcherTest.cpp (100%) rename Tests/TactilityKernel/{ => Source}/DriverIntegrationTest.cpp (100%) rename Tests/TactilityKernel/{ => Source}/DriverTest.cpp (100%) rename Tests/TactilityKernel/{ => Source}/Main.cpp (100%) rename Tests/TactilityKernel/{ => Source}/ModuleTest.cpp (100%) rename Tests/TactilityKernel/{ => Source}/MutexTest.cpp (100%) rename Tests/TactilityKernel/{ => Source}/RecursiveMutexTest.cpp (100%) rename Tests/TactilityKernel/{ => Source}/ThreadTest.cpp (100%) rename Tests/TactilityKernel/{ => Source}/TimeAndDelay.cpp (100%) rename Tests/TactilityKernel/{ => Source}/TimerTest.cpp (100%) diff --git a/Devices/lilygo-tlora-pager/Source/drivers/TloraPager.cpp b/Devices/lilygo-tlora-pager/Source/drivers/TloraPager.cpp index 741750ae..f659b872 100644 --- a/Devices/lilygo-tlora-pager/Source/drivers/TloraPager.cpp +++ b/Devices/lilygo-tlora-pager/Source/drivers/TloraPager.cpp @@ -24,7 +24,7 @@ Driver tlora_pager_driver = { .api = nullptr, .device_type = nullptr, .owner = &device_module, - .driver_private = nullptr + .internal = nullptr }; } diff --git a/TactilityKernel/Source/driver.cpp b/TactilityKernel/Source/driver.cpp index 0f4cb484..a8ed0d11 100644 --- a/TactilityKernel/Source/driver.cpp +++ b/TactilityKernel/Source/driver.cpp @@ -44,9 +44,9 @@ static DriverLedger& get_ledger() { #define ledger get_ledger() -#define get_driver_private(driver) static_cast(driver->internal) -#define driver_lock(driver) mutex_lock(&get_driver_private(driver)->mutex); -#define driver_unlock(driver) mutex_unlock(&get_driver_private(driver)->mutex); +#define get_driver_internal(driver) static_cast(driver->internal) +#define driver_lock(driver) mutex_lock(&get_driver_internal(driver)->mutex); +#define driver_unlock(driver) mutex_unlock(&get_driver_internal(driver)->mutex); extern "C" { @@ -65,14 +65,14 @@ error_t driver_destruct(Driver* driver) { driver_unlock(driver); return ERROR_NOT_ALLOWED; } - if (get_driver_private(driver)->use_count != 0 || get_driver_private(driver)->destroying) { + if (get_driver_internal(driver)->use_count != 0 || get_driver_internal(driver)->destroying) { driver_unlock(driver); return ERROR_INVALID_STATE; } - get_driver_private(driver)->destroying = true; + get_driver_internal(driver)->destroying = true; driver_unlock(driver); - delete get_driver_private(driver); + delete get_driver_internal(driver); driver->internal = nullptr; return ERROR_NONE; @@ -146,7 +146,7 @@ error_t driver_bind(Driver* driver, Device* device) { driver_lock(driver); error_t error = ERROR_NONE; - if (get_driver_private(driver)->destroying || !device_is_added(device)) { + if (get_driver_internal(driver)->destroying || !device_is_added(device)) { error = ERROR_INVALID_STATE; goto error; } @@ -158,7 +158,7 @@ error_t driver_bind(Driver* driver, Device* device) { } } - get_driver_private(driver)->use_count++; + get_driver_internal(driver)->use_count++; driver_unlock(driver); LOG_I(TAG, "bound %s to %s", driver->name, device->name); @@ -174,7 +174,7 @@ error_t driver_unbind(Driver* driver, Device* device) { driver_lock(driver); error_t error = ERROR_NONE; - if (get_driver_private(driver)->destroying || !device_is_added(device)) { + if (get_driver_internal(driver)->destroying || !device_is_added(device)) { error = ERROR_INVALID_STATE; goto error; } @@ -186,7 +186,7 @@ error_t driver_unbind(Driver* driver, Device* device) { } } - get_driver_private(driver)->use_count--; + get_driver_internal(driver)->use_count--; driver_unlock(driver); LOG_I(TAG, "unbound %s from %s", driver->name, device->name); diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5883c72c..7cae47be 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1,6 +1,6 @@ project(tests) -set(DOCTESTINC ${PROJECT_SOURCE_DIR}/Include) +set(DOCTESTINC ${PROJECT_SOURCE_DIR}/Doctest/Include) enable_testing() add_subdirectory(TactilityCore) diff --git a/Tests/Include/doctest.h b/Tests/Doctest/Include/doctest.h similarity index 100% rename from Tests/Include/doctest.h rename to Tests/Doctest/Include/doctest.h diff --git a/Tests/Tactility/CMakeLists.txt b/Tests/Tactility/CMakeLists.txt index 9a070b7c..c31c724d 100644 --- a/Tests/Tactility/CMakeLists.txt +++ b/Tests/Tactility/CMakeLists.txt @@ -4,16 +4,12 @@ enable_language(C CXX ASM) set(CMAKE_CXX_COMPILER g++) -file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/*.cpp) +file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp) add_executable(TactilityTests EXCLUDE_FROM_ALL ${TEST_SOURCES}) -target_include_directories(TactilityTests PRIVATE - ${DOCTESTINC} -) +target_include_directories(TactilityTests PRIVATE ${DOCTESTINC}) -add_test(NAME TactilityTests - COMMAND TactilityTests -) +add_test(NAME TactilityTests COMMAND TactilityTests) target_link_libraries(TactilityTests PRIVATE Tactility diff --git a/Tests/Tactility/HalDeviceTest.cpp b/Tests/Tactility/Source/HalDeviceTest.cpp similarity index 100% rename from Tests/Tactility/HalDeviceTest.cpp rename to Tests/Tactility/Source/HalDeviceTest.cpp diff --git a/Tests/Tactility/Main.cpp b/Tests/Tactility/Source/Main.cpp similarity index 100% rename from Tests/Tactility/Main.cpp rename to Tests/Tactility/Source/Main.cpp diff --git a/Tests/Tactility/ObjectFileTest.cpp b/Tests/Tactility/Source/ObjectFileTest.cpp similarity index 100% rename from Tests/Tactility/ObjectFileTest.cpp rename to Tests/Tactility/Source/ObjectFileTest.cpp diff --git a/Tests/Tactility/PropertiesFileTest.cpp b/Tests/Tactility/Source/PropertiesFileTest.cpp similarity index 100% rename from Tests/Tactility/PropertiesFileTest.cpp rename to Tests/Tactility/Source/PropertiesFileTest.cpp diff --git a/Tests/Tactility/UrlTest.cpp b/Tests/Tactility/Source/UrlTest.cpp similarity index 100% rename from Tests/Tactility/UrlTest.cpp rename to Tests/Tactility/Source/UrlTest.cpp diff --git a/Tests/TactilityCore/CMakeLists.txt b/Tests/TactilityCore/CMakeLists.txt index a97a301b..93f494da 100644 --- a/Tests/TactilityCore/CMakeLists.txt +++ b/Tests/TactilityCore/CMakeLists.txt @@ -4,16 +4,12 @@ enable_language(C CXX ASM) set(CMAKE_CXX_COMPILER g++) -file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/*.cpp) +file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp) add_executable(TactilityCoreTests EXCLUDE_FROM_ALL ${TEST_SOURCES}) -target_include_directories(TactilityCoreTests PRIVATE - ${DOCTESTINC} -) +target_include_directories(TactilityCoreTests PRIVATE ${DOCTESTINC}) -add_test(NAME TactilityCoreTests - COMMAND TactilityCoreTests -) +add_test(NAME TactilityCoreTests COMMAND TactilityCoreTests) target_link_libraries(TactilityCoreTests PUBLIC TactilityCore diff --git a/Tests/TactilityCore/BundleTest.cpp b/Tests/TactilityCore/Source/BundleTest.cpp similarity index 100% rename from Tests/TactilityCore/BundleTest.cpp rename to Tests/TactilityCore/Source/BundleTest.cpp diff --git a/Tests/TactilityCore/FileTest.cpp b/Tests/TactilityCore/Source/FileTest.cpp similarity index 100% rename from Tests/TactilityCore/FileTest.cpp rename to Tests/TactilityCore/Source/FileTest.cpp diff --git a/Tests/TactilityCore/Main.cpp b/Tests/TactilityCore/Source/Main.cpp similarity index 100% rename from Tests/TactilityCore/Main.cpp rename to Tests/TactilityCore/Source/Main.cpp diff --git a/Tests/TactilityCore/StringTest.cpp b/Tests/TactilityCore/Source/StringTest.cpp similarity index 100% rename from Tests/TactilityCore/StringTest.cpp rename to Tests/TactilityCore/Source/StringTest.cpp diff --git a/Tests/TactilityCore/TestFile.h b/Tests/TactilityCore/Source/TestFile.h similarity index 100% rename from Tests/TactilityCore/TestFile.h rename to Tests/TactilityCore/Source/TestFile.h diff --git a/Tests/TactilityFreeRtos/CMakeLists.txt b/Tests/TactilityFreeRtos/CMakeLists.txt index 883244e4..a2558f8e 100644 --- a/Tests/TactilityFreeRtos/CMakeLists.txt +++ b/Tests/TactilityFreeRtos/CMakeLists.txt @@ -4,16 +4,12 @@ enable_language(C CXX ASM) set(CMAKE_CXX_COMPILER g++) -file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/*.cpp) +file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp) add_executable(TactilityFreeRtosTests EXCLUDE_FROM_ALL ${TEST_SOURCES}) -target_include_directories(TactilityFreeRtosTests PRIVATE - ${DOCTESTINC} -) +target_include_directories(TactilityFreeRtosTests PRIVATE ${DOCTESTINC}) -add_test(NAME TactilityFreeRtosTests - COMMAND TactilityFreeRtosTests -) +add_test(NAME TactilityFreeRtosTests COMMAND TactilityFreeRtosTests) target_link_libraries(TactilityFreeRtosTests PUBLIC TactilityFreeRtos diff --git a/Tests/TactilityFreeRtos/DispatcherTest.cpp b/Tests/TactilityFreeRtos/Source/DispatcherTest.cpp similarity index 100% rename from Tests/TactilityFreeRtos/DispatcherTest.cpp rename to Tests/TactilityFreeRtos/Source/DispatcherTest.cpp diff --git a/Tests/TactilityFreeRtos/DispatcherThreadTest.cpp b/Tests/TactilityFreeRtos/Source/DispatcherThreadTest.cpp similarity index 100% rename from Tests/TactilityFreeRtos/DispatcherThreadTest.cpp rename to Tests/TactilityFreeRtos/Source/DispatcherThreadTest.cpp diff --git a/Tests/TactilityFreeRtos/LockTest.cpp b/Tests/TactilityFreeRtos/Source/LockTest.cpp similarity index 100% rename from Tests/TactilityFreeRtos/LockTest.cpp rename to Tests/TactilityFreeRtos/Source/LockTest.cpp diff --git a/Tests/TactilityFreeRtos/Main.cpp b/Tests/TactilityFreeRtos/Source/Main.cpp similarity index 100% rename from Tests/TactilityFreeRtos/Main.cpp rename to Tests/TactilityFreeRtos/Source/Main.cpp diff --git a/Tests/TactilityFreeRtos/MessageQueueTest.cpp b/Tests/TactilityFreeRtos/Source/MessageQueueTest.cpp similarity index 100% rename from Tests/TactilityFreeRtos/MessageQueueTest.cpp rename to Tests/TactilityFreeRtos/Source/MessageQueueTest.cpp diff --git a/Tests/TactilityFreeRtos/MutexTest.cpp b/Tests/TactilityFreeRtos/Source/MutexTest.cpp similarity index 100% rename from Tests/TactilityFreeRtos/MutexTest.cpp rename to Tests/TactilityFreeRtos/Source/MutexTest.cpp diff --git a/Tests/TactilityFreeRtos/PubSubTest.cpp b/Tests/TactilityFreeRtos/Source/PubSubTest.cpp similarity index 100% rename from Tests/TactilityFreeRtos/PubSubTest.cpp rename to Tests/TactilityFreeRtos/Source/PubSubTest.cpp diff --git a/Tests/TactilityFreeRtos/RecursiveMutexTest.cpp b/Tests/TactilityFreeRtos/Source/RecursiveMutexTest.cpp similarity index 100% rename from Tests/TactilityFreeRtos/RecursiveMutexTest.cpp rename to Tests/TactilityFreeRtos/Source/RecursiveMutexTest.cpp diff --git a/Tests/TactilityFreeRtos/SemaphoreTest.cpp b/Tests/TactilityFreeRtos/Source/SemaphoreTest.cpp similarity index 100% rename from Tests/TactilityFreeRtos/SemaphoreTest.cpp rename to Tests/TactilityFreeRtos/Source/SemaphoreTest.cpp diff --git a/Tests/TactilityFreeRtos/ThreadTest.cpp b/Tests/TactilityFreeRtos/Source/ThreadTest.cpp similarity index 100% rename from Tests/TactilityFreeRtos/ThreadTest.cpp rename to Tests/TactilityFreeRtos/Source/ThreadTest.cpp diff --git a/Tests/TactilityFreeRtos/TimerTest.cpp b/Tests/TactilityFreeRtos/Source/TimerTest.cpp similarity index 100% rename from Tests/TactilityFreeRtos/TimerTest.cpp rename to Tests/TactilityFreeRtos/Source/TimerTest.cpp diff --git a/Tests/TactilityKernel/CMakeLists.txt b/Tests/TactilityKernel/CMakeLists.txt index 37589f7a..082d5dcb 100644 --- a/Tests/TactilityKernel/CMakeLists.txt +++ b/Tests/TactilityKernel/CMakeLists.txt @@ -4,7 +4,7 @@ enable_language(C CXX ASM) set(CMAKE_CXX_COMPILER g++) -file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/*.cpp) +file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp) add_executable(TactilityKernelTests EXCLUDE_FROM_ALL ${TEST_SOURCES}) target_include_directories(TactilityKernelTests PRIVATE ${DOCTESTINC}) diff --git a/Tests/TactilityKernel/DeviceTest.cpp b/Tests/TactilityKernel/Source/DeviceTest.cpp similarity index 100% rename from Tests/TactilityKernel/DeviceTest.cpp rename to Tests/TactilityKernel/Source/DeviceTest.cpp diff --git a/Tests/TactilityKernel/DispatcherTest.cpp b/Tests/TactilityKernel/Source/DispatcherTest.cpp similarity index 100% rename from Tests/TactilityKernel/DispatcherTest.cpp rename to Tests/TactilityKernel/Source/DispatcherTest.cpp diff --git a/Tests/TactilityKernel/DriverIntegrationTest.cpp b/Tests/TactilityKernel/Source/DriverIntegrationTest.cpp similarity index 100% rename from Tests/TactilityKernel/DriverIntegrationTest.cpp rename to Tests/TactilityKernel/Source/DriverIntegrationTest.cpp diff --git a/Tests/TactilityKernel/DriverTest.cpp b/Tests/TactilityKernel/Source/DriverTest.cpp similarity index 100% rename from Tests/TactilityKernel/DriverTest.cpp rename to Tests/TactilityKernel/Source/DriverTest.cpp diff --git a/Tests/TactilityKernel/Main.cpp b/Tests/TactilityKernel/Source/Main.cpp similarity index 100% rename from Tests/TactilityKernel/Main.cpp rename to Tests/TactilityKernel/Source/Main.cpp diff --git a/Tests/TactilityKernel/ModuleTest.cpp b/Tests/TactilityKernel/Source/ModuleTest.cpp similarity index 100% rename from Tests/TactilityKernel/ModuleTest.cpp rename to Tests/TactilityKernel/Source/ModuleTest.cpp diff --git a/Tests/TactilityKernel/MutexTest.cpp b/Tests/TactilityKernel/Source/MutexTest.cpp similarity index 100% rename from Tests/TactilityKernel/MutexTest.cpp rename to Tests/TactilityKernel/Source/MutexTest.cpp diff --git a/Tests/TactilityKernel/RecursiveMutexTest.cpp b/Tests/TactilityKernel/Source/RecursiveMutexTest.cpp similarity index 100% rename from Tests/TactilityKernel/RecursiveMutexTest.cpp rename to Tests/TactilityKernel/Source/RecursiveMutexTest.cpp diff --git a/Tests/TactilityKernel/ThreadTest.cpp b/Tests/TactilityKernel/Source/ThreadTest.cpp similarity index 100% rename from Tests/TactilityKernel/ThreadTest.cpp rename to Tests/TactilityKernel/Source/ThreadTest.cpp diff --git a/Tests/TactilityKernel/TimeAndDelay.cpp b/Tests/TactilityKernel/Source/TimeAndDelay.cpp similarity index 100% rename from Tests/TactilityKernel/TimeAndDelay.cpp rename to Tests/TactilityKernel/Source/TimeAndDelay.cpp diff --git a/Tests/TactilityKernel/TimerTest.cpp b/Tests/TactilityKernel/Source/TimerTest.cpp similarity index 100% rename from Tests/TactilityKernel/TimerTest.cpp rename to Tests/TactilityKernel/Source/TimerTest.cpp