Project restructuring (fixes macOS builds) (#198)

- Create `Include/` folder for all main projects
- Fix some issues here and there (found while moving things)
- All includes are now in `Tactility/` subfolder and must be included with that prefix. This fixes issues with clashing POSIX headers (e.g. `<semaphore.h>` versus Tactility's `Semaphore.h`)

TactilityCore/CMakeLists.txt

@@ -8,32 +8,29 @@ if (DEFINED ENV{ESP_IDF_VERSION})
 
     idf_component_register(
         SRCS ${SOURCE_FILES}
-        INCLUDE_DIRS "Source/"
+        INCLUDE_DIRS "Include/"
         REQUIRES mbedtls nvs_flash esp_rom
     )
 
-    add_definitions(-DESP_PLATFORM)
-
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         target_compile_options(${COMPONENT_LIB} PUBLIC -Wno-unused-variable)
     endif()
 else()
     file(GLOB_RECURSE SOURCES "Source/*.c*")
-    file(GLOB_RECURSE HEADERS "Source/*.h*")
 
     add_library(TactilityCore OBJECT)
 
     target_sources(TactilityCore
         PRIVATE ${SOURCES}
-        PUBLIC ${HEADERS}
     )
 
     target_include_directories(TactilityCore SYSTEM
-        PUBLIC Source/
+        PUBLIC Include/
     )
 
     add_definitions(-D_Nullable=)
     add_definitions(-D_Nonnull=)
+
     target_link_libraries(TactilityCore
         PUBLIC mbedtls
         PUBLIC freertos_kernel

TactilityCore/Include/Tactility/Check.h

@@ -13,9 +13,10 @@
  */
 #pragma once
 
-#include "Log.h"
-#include <cassert>
 #include "CoreDefines.h"
+#include "Log.h"
+
+#include <cassert>
 
 #define TT_NORETURN [[noreturn]]
 

TactilityCore/Include/Tactility/Dispatcher.h

@@ -8,6 +8,7 @@
 #include "MessageQueue.h"
 #include "Mutex.h"
 #include "EventFlag.h"
+
 #include <memory>
 #include <queue>
 

TactilityCore/Include/Tactility/EventFlag.h

@@ -43,7 +43,7 @@ public:
     uint32_t wait(
         uint32_t flags,
         uint32_t options = WaitAny,
-        uint32_t timeout = portMAX_DELAY
+        uint32_t timeout = (uint32_t)portMAX_DELAY
     ) const;
 };
 

TactilityCore/Include/Tactility/file/File.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include "TactilityCore.h"
+#include "Tactility/TactilityCore.h"
+
 #include <cstdio>
 
 namespace tt::file {

TactilityCore/Source/Bundle.cpp

@@ -1,4 +1,4 @@
-#include "Bundle.h"
+#include "Tactility/Bundle.h"
 
 namespace tt {
 

TactilityCore/Source/Check.cpp

@@ -1,7 +1,7 @@
-#include "Check.h"
+#include "Tactility/Check.h"
 
-#include "Log.h"
-#include "RtosCompatTask.h"
+#include "Tactility/Log.h"
+#include "Tactility/RtosCompatTask.h"
 
 #define TAG "kernel"
 

TactilityCore/Source/Dispatcher.cpp

@@ -1,6 +1,7 @@
-#include <kernel/Kernel.h>
-#include "Dispatcher.h"
-#include "Check.h"
+#include "Tactility/Dispatcher.h"
+
+#include "Tactility/Check.h"
+#include "Tactility/kernel/Kernel.h"
 
 namespace tt {
 

TactilityCore/Source/DispatcherThread.cpp

@@ -1,4 +1,4 @@
-#include "DispatcherThread.h"
+#include "Tactility/DispatcherThread.h"
 
 namespace tt {
 

TactilityCore/Source/EventFlag.cpp

@@ -1,7 +1,7 @@
-#include "EventFlag.h"
+#include "Tactility/EventFlag.h"
 
-#include "Check.h"
-#include "CoreDefines.h"
+#include "Tactility/Check.h"
+#include "Tactility/CoreDefines.h"
 
 #define TT_EVENT_FLAG_MAX_BITS_EVENT_GROUPS 24U
 #define TT_EVENT_FLAG_INVALID_BITS (~((1UL << TT_EVENT_FLAG_MAX_BITS_EVENT_GROUPS) - 1U))

TactilityCore/Source/Lockable.cpp

@@ -1,4 +1,4 @@
-#include "Lockable.h"
+#include "Tactility/Lockable.h"
 
 namespace tt {
 

TactilityCore/Source/Log.cpp

@@ -1,4 +1,5 @@
-#include "Mutex.h"
+#include "Tactility/Mutex.h"
+
 #include <cstring>
 #include <sstream>
 
@@ -49,7 +50,7 @@ std::unique_ptr<std::array<LogEntry, TT_LOG_ENTRY_COUNT>> copyLogEntries(std::si
 
 #ifndef ESP_PLATFORM
 
-#include "Log.h"
+#include "Tactility/Log.h"
 
 #include <cstdint>
 #include <sys/time.h>

TactilityCore/Source/MessageQueue.cpp

@@ -1,6 +1,6 @@
-#include "MessageQueue.h"
-#include "Check.h"
-#include "kernel/Kernel.h"
+#include "Tactility/MessageQueue.h"
+#include "Tactility/Check.h"
+#include "Tactility/kernel/Kernel.h"
 
 namespace tt {
 

TactilityCore/Source/Mutex.cpp

@@ -1,8 +1,8 @@
-#include "Mutex.h"
+#include "Tactility/Mutex.h"
 
-#include "Check.h"
-#include "CoreDefines.h"
-#include "Log.h"
+#include "Tactility/Check.h"
+#include "Tactility/CoreDefines.h"
+#include "Tactility/Log.h"
 
 namespace tt {
 

TactilityCore/Source/PubSub.cpp

@@ -1,5 +1,5 @@
-#include "PubSub.h"
-#include "Check.h"
+#include "Tactility/PubSub.h"
+#include "Tactility/Check.h"
 
 namespace tt {
 

TactilityCore/Source/Semaphore.cpp

@@ -1,6 +1,6 @@
-#include "Semaphore.h"
-#include "Check.h"
-#include "CoreDefines.h"
+#include "Tactility/Semaphore.h"
+#include "Tactility/Check.h"
+#include "Tactility/CoreDefines.h"
 
 namespace tt {
 

TactilityCore/Source/StreamBuffer.cpp

@@ -1,7 +1,7 @@
-#include "StreamBuffer.h"
+#include "Tactility/StreamBuffer.h"
 
-#include "Check.h"
-#include "CoreDefines.h"
+#include "Tactility/Check.h"
+#include "Tactility/CoreDefines.h"
 
 namespace tt {
 

TactilityCore/Source/StringUtils.cpp

@@ -1,4 +1,5 @@
-#include "StringUtils.h"
+#include "Tactility/StringUtils.h"
+
 #include <cstring>
 #include <sstream>
 #include <string>

TactilityCore/Source/Thread.cpp

@@ -1,11 +1,11 @@
-#include "Thread.h"
+#include "Tactility/Thread.h"
 
-#include "Check.h"
-#include "CoreDefines.h"
-#include "EventFlag.h"
-#include "kernel/Kernel.h"
-#include "Log.h"
-#include "TactilityCoreConfig.h"
+#include "Tactility/Check.h"
+#include "Tactility/CoreDefines.h"
+#include "Tactility/EventFlag.h"
+#include "Tactility/kernel/Kernel.h"
+#include "Tactility/Log.h"
+#include "Tactility/TactilityCoreConfig.h"
 
 #include <string>
 

TactilityCore/Source/Timer.cpp

@@ -1,8 +1,9 @@
-#include "Timer.h"
+#include "Tactility/Timer.h"
+
+#include "Tactility/Check.h"
+#include "Tactility/RtosCompat.h"
 
 #include <utility>
-#include "Check.h"
-#include "RtosCompat.h"
 
 namespace tt {
 

TactilityCore/Source/crypt/Crypt.cpp

@@ -1,8 +1,9 @@
-#include "Crypt.h"
+#include "Tactility/crypt/Crypt.h"
 
-#include "Check.h"
-#include "Log.h"
-#include "mbedtls/aes.h"
+#include "Tactility/Check.h"
+#include "Tactility/Log.h"
+
+#include <mbedtls/aes.h>
 #include <cstring>
 #include <cstdint>
 

TactilityCore/Source/crypt/Hash.cpp

@@ -1,4 +1,4 @@
-#include "Hash.h"
+#include "Tactility/crypt/Hash.h"
 
 namespace tt::crypt {
 

TactilityCore/Source/file/File.cpp

@@ -1,4 +1,4 @@
-#include "File.h"
+#include "Tactility/file/File.h"
 
 namespace tt::file {
 

TactilityCore/Source/kernel/Kernel.cpp

@@ -1,6 +1,6 @@
-#include "kernel/Kernel.h"
-#include "CoreDefines.h"
-#include "RtosCompatTask.h"
+#include "Tactility/kernel/Kernel.h"
+#include "Tactility/CoreDefines.h"
+#include "Tactility/RtosCompatTask.h"
 
 #ifdef ESP_PLATFORM
 #include "rom/ets_sys.h"

TactilityCore/Source/kernel/PanicHandler.cpp

@@ -1,6 +1,6 @@
 #ifdef ESP_PLATFORM
 
-#include "PanicHandler.h"
+#include "Tactility/kernel/PanicHandler.h"
 
 #include <esp_debug_helpers.h>
 #include <esp_attr.h>

TactilityCore/Source/kernel/critical/Critical.cpp

@@ -1,6 +1,7 @@
-#include "Critical.h"
-#include "CoreDefines.h"
-#include "RtosCompatTask.h"
+#include "Tactility/kernel/critical/Critical.h"
+
+#include "Tactility/CoreDefines.h"
+#include "Tactility/RtosCompatTask.h"
 
 #ifdef ESP_PLATFORM
 static portMUX_TYPE critical_mutex;