From f9b1dcad842a2d391139c62133516b91be4ec6e7 Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Fri, 10 Jul 2026 17:41:46 +0200 Subject: [PATCH 1/5] Add wifi to P4 devices --- Devices/guition-jc1060p470ciwy/guition,jc1060p470ciwy.dts | 6 ++++++ Devices/m5stack-tab5/m5stack,tab5.dts | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Devices/guition-jc1060p470ciwy/guition,jc1060p470ciwy.dts b/Devices/guition-jc1060p470ciwy/guition,jc1060p470ciwy.dts index 4d41439e0..67611202d 100644 --- a/Devices/guition-jc1060p470ciwy/guition,jc1060p470ciwy.dts +++ b/Devices/guition-jc1060p470ciwy/guition,jc1060p470ciwy.dts @@ -6,6 +6,7 @@ #include #include #include +#include /** * For future reference: @@ -19,6 +20,11 @@ compatible = "root"; model = "Guition JC1060P470C-I-W-Y"; + wifi0 { + compatible = "espressif,esp32-wifi"; + status = "disabled"; + }; + ble0 { compatible = "espressif,esp32-ble"; status = "disabled"; diff --git a/Devices/m5stack-tab5/m5stack,tab5.dts b/Devices/m5stack-tab5/m5stack,tab5.dts index 7db61c6e8..170b6ed10 100644 --- a/Devices/m5stack-tab5/m5stack,tab5.dts +++ b/Devices/m5stack-tab5/m5stack,tab5.dts @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -19,6 +20,11 @@ compatible = "root"; model = "Tab5"; + wifi0 { + compatible = "espressif,esp32-wifi"; + status = "disabled"; + }; + ble0 { compatible = "espressif,esp32-ble"; status = "disabled"; From 3c9e96b1d517b8dc2c97564a4812d169a134f4a6 Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Fri, 10 Jul 2026 17:42:06 +0200 Subject: [PATCH 2/5] StickC Plus2: not incubating, no more web server auto start --- Devices/m5stack-stickc-plus2/device.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/Devices/m5stack-stickc-plus2/device.properties b/Devices/m5stack-stickc-plus2/device.properties index 0dddc0764..9178ad240 100644 --- a/Devices/m5stack-stickc-plus2/device.properties +++ b/Devices/m5stack-stickc-plus2/device.properties @@ -1,9 +1,7 @@ general.vendor=M5Stack general.name=StickC Plus2 -general.incubating=true apps.launcherAppId=Launcher -apps.autoStartAppId=ApWebServer hardware.target=ESP32 hardware.flashSize=8MB From 135bdebef4aa9f64b52cb3abdff10ed34458caee Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Fri, 10 Jul 2026 17:42:21 +0200 Subject: [PATCH 3/5] StickS3: remove SD support for now --- Devices/m5stack-sticks3/device.properties | 2 +- Devices/m5stack-sticks3/m5stack,sticks3.dts | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/Devices/m5stack-sticks3/device.properties b/Devices/m5stack-sticks3/device.properties index 685147d1c..057115eca 100644 --- a/Devices/m5stack-sticks3/device.properties +++ b/Devices/m5stack-sticks3/device.properties @@ -12,7 +12,7 @@ hardware.esptoolFlashFreq=80M hardware.tinyUsb=true hardware.bluetooth=true -storage.userDataLocation=SD +storage.userDataLocation=Internal display.size=1.14" display.shape=rectangle diff --git a/Devices/m5stack-sticks3/m5stack,sticks3.dts b/Devices/m5stack-sticks3/m5stack,sticks3.dts index abe0f83e0..289559870 100644 --- a/Devices/m5stack-sticks3/m5stack,sticks3.dts +++ b/Devices/m5stack-sticks3/m5stack,sticks3.dts @@ -69,21 +69,6 @@ }; }; - //DIY SD Card - https://wiki.bruce.computer/wiring-diagrams/m5sticks3/sd-card/ - spi1 { - compatible = "espressif,esp32-spi"; - host = ; - cs-gpios = <&gpio0 7 GPIO_FLAG_NONE>; - pin-mosi = <&gpio0 6 GPIO_FLAG_NONE>; - pin-miso = <&gpio0 4 GPIO_FLAG_NONE>; - pin-sclk = <&gpio0 5 GPIO_FLAG_NONE>; - - sdcard@0 { - compatible = "espressif,esp32-sdspi"; - frequency-khz = <20000>; - }; - }; - // Speaker and microphone (ES8311) i2s0 { compatible = "espressif,esp32-i2s"; From 65c2f2cbefa11795cdb56089a418502a8536a901 Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Fri, 10 Jul 2026 17:42:24 +0200 Subject: [PATCH 4/5] Fix for build --- Tactility/Include/Tactility/service/rtctime/RtcTimeService.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tactility/Include/Tactility/service/rtctime/RtcTimeService.h b/Tactility/Include/Tactility/service/rtctime/RtcTimeService.h index 0eca7f52d..70df668e4 100644 --- a/Tactility/Include/Tactility/service/rtctime/RtcTimeService.h +++ b/Tactility/Include/Tactility/service/rtctime/RtcTimeService.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include From 5ab23281d588adfaa8f8ff350b6526a27fd925fc Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Fri, 10 Jul 2026 17:42:28 +0200 Subject: [PATCH 5/5] Fix for warning --- TactilityKernel/include/tactility/service/service_manifest.h | 1 + 1 file changed, 1 insertion(+) diff --git a/TactilityKernel/include/tactility/service/service_manifest.h b/TactilityKernel/include/tactility/service/service_manifest.h index 7a0cd67c2..0ad779c6a 100644 --- a/TactilityKernel/include/tactility/service/service_manifest.h +++ b/TactilityKernel/include/tactility/service/service_manifest.h @@ -12,6 +12,7 @@ extern "C" { // so the callback types below are declared directly in terms of ServiceInstance to avoid // a conflicting forward-declaration of an unrelated "ServiceContext" struct tag. struct ServiceInstance; +struct ServiceManifest; /** * Allocates and initializes the service's custom data.