From dae0970cee353f68eb2cf374fd02316ec3f45b40 Mon Sep 17 00:00:00 2001
From: Ken Van Hoeylandt <git@kenvanhoeylandt.net>
Date: Thu, 15 Oct 2026 19:37:21 +0200
Subject: [PATCH] Add TactilityKernelCpp too TactilitySDK

---
 Buildscripts/TactilitySDK/CMakeLists.txt           | 1 +
 Buildscripts/TactilitySDK/TactilitySDK.posix.cmake | 1 +
 Buildscripts/release-sdk-esp32.py                  | 3 +++
 Buildscripts/release-sdk-posix.py                  | 3 +++
 Documentation/ideas.md                             | 1 -
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Buildscripts/TactilitySDK/CMakeLists.txt b/Buildscripts/TactilitySDK/CMakeLists.txt
index 9a8f9a518..0c46d1433 100644
--- a/Buildscripts/TactilitySDK/CMakeLists.txt
+++ b/Buildscripts/TactilitySDK/CMakeLists.txt
@@ -1,6 +1,7 @@
 idf_component_register(
     INCLUDE_DIRS
         "Libraries/TactilityKernel/include"
+        "Libraries/TactilityKernelCpp/Include"
         "Libraries/TactilityFreeRtos/Include"
         "Libraries/lvgl/include"
         "Libraries/minmea/include"
diff --git a/Buildscripts/TactilitySDK/TactilitySDK.posix.cmake b/Buildscripts/TactilitySDK/TactilitySDK.posix.cmake
index ae4ebe95f..4945d4019 100644
--- a/Buildscripts/TactilitySDK/TactilitySDK.posix.cmake
+++ b/Buildscripts/TactilitySDK/TactilitySDK.posix.cmake
@@ -26,6 +26,7 @@ macro(tactility_project_post project_name)
         ${TACTILITY_SDK_PATH}/Modules/lvgl-window-manager-module/include
         ${TACTILITY_SDK_PATH}/Modules/service-module/include
         ${TACTILITY_SDK_PATH}/Libraries/TactilityKernel/include
+        ${TACTILITY_SDK_PATH}/Libraries/TactilityKernelCpp/Include
         ${TACTILITY_SDK_PATH}/Libraries/lvgl/include
         ${TACTILITY_SDK_PATH}/Libraries/FreeRTOS-Kernel/include
         ${TACTILITY_SDK_PATH}/Libraries/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
diff --git a/Buildscripts/release-sdk-esp32.py b/Buildscripts/release-sdk-esp32.py
index e35df036f..1d2cfb4df 100644
--- a/Buildscripts/release-sdk-esp32.py
+++ b/Buildscripts/release-sdk-esp32.py
@@ -101,6 +101,9 @@ def main():
         {'src': 'TactilityKernel/include/**', 'dst': 'Libraries/TactilityKernel/include/'},
         {'src': 'TactilityKernel/CMakeLists.txt', 'dst': 'Libraries/TactilityKernel/'},
         {'src': 'TactilityKernel/*.md', 'dst': 'Libraries/TactilityKernel/'},
+        # TactilityKernelCpp (header-only)
+        {'src': 'TactilityKernelCpp/Include/**', 'dst': 'Libraries/TactilityKernelCpp/Include/'},
+        {'src': 'TactilityKernelCpp/*.md', 'dst': 'Libraries/TactilityKernelCpp/'},
         # lvgl (basics)
         {'src': 'build/esp-idf/lvgl__lvgl/liblvgl__lvgl.a', 'dst': 'Libraries/lvgl/binary/liblvgl.a'},
         {'src': 'Libraries/lvgl/lvgl.h', 'dst': 'Libraries/lvgl/include/'},
diff --git a/Buildscripts/release-sdk-posix.py b/Buildscripts/release-sdk-posix.py
index 539e413c6..af30616c0 100755
--- a/Buildscripts/release-sdk-posix.py
+++ b/Buildscripts/release-sdk-posix.py
@@ -58,6 +58,9 @@ def main():
         {'src': 'TactilityKernel/include/**', 'dst': 'Libraries/TactilityKernel/include/'},
         {'src': 'TactilityKernel/CMakeLists.txt', 'dst': 'Libraries/TactilityKernel/'},
         {'src': 'TactilityKernel/*.md', 'dst': 'Libraries/TactilityKernel/'},
+        # TactilityKernelCpp (header-only)
+        {'src': 'TactilityKernelCpp/Include/**', 'dst': 'Libraries/TactilityKernelCpp/Include/'},
+        {'src': 'TactilityKernelCpp/*.md', 'dst': 'Libraries/TactilityKernelCpp/'},
         # FreeRTOS-Kernel - TactilityKernel's public headers (tactility/freertos/*.h) include the
         # real FreeRTOS.h/task.h/etc directly, unlike ESP32 where ESP-IDF's own "freertos"
         # component and Kconfig-generated FreeRTOSConfig.h are already part of every project.
diff --git a/Documentation/ideas.md b/Documentation/ideas.md
index 79cfbb5f5..60c036b42 100644
--- a/Documentation/ideas.md
+++ b/Documentation/ideas.md
@@ -10,7 +10,6 @@
 - BlueTooth as radio backend for MeshCore/Meshtastic?
 - ESP-NOW as radio backend. Use it for MeshCore/Meshtastic?
 - Find out why the first build of an app with a clean build cache folder always fails
-- Export TactilityKernelCpp with SDK as optional library
 - Fix BT: an esp32 device connecting to a peripheral isn't working
 - "update all" functionality for app hub module, including commandline app. add button to app hub toolbar if there are 1 or more apps to update (does "update all").
 - Improve Wi-Fi mock so it actually works with connect/disconnect/scan list. It connects to literally anything from the scan list.