Skip to content

Fixes and improvements #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KenVanHoeylandt merged 5 commits into from
Jul 10, 2026
Merged

Fixes and improvements #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9b1dca
Add wifi to P4 devices
KenVanHoeylandt Jul 10, 2026
3c9e96b
StickC Plus2: not incubating, no more web server auto start
KenVanHoeylandt Jul 10, 2026
135bdeb
StickS3: remove SD support for now
KenVanHoeylandt Jul 10, 2026
65c2f2c
Fix for build
KenVanHoeylandt Jul 10, 2026
5ab2328
Fix for warning
KenVanHoeylandt Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Devices/guition-jc1060p470ciwy/guition,jc1060p470ciwy.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <tactility/bindings/esp32_i2c.h>
#include <tactility/bindings/esp32_i2s.h>
#include <tactility/bindings/esp32_sdmmc.h>
#include <tactility/bindings/esp32_wifi.h>

/**
* For future reference:
Expand All @@ -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";
Expand Down
2 changes: 0 additions & 2 deletions Devices/m5stack-stickc-plus2/device.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Devices/m5stack-sticks3/device.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 0 additions & 15 deletions Devices/m5stack-sticks3/m5stack,sticks3.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,6 @@
};
};

//DIY SD Card - https://wiki.bruce.computer/wiring-diagrams/m5sticks3/sd-card/
spi1 {
compatible = "espressif,esp32-spi";
host = <SPI3_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";
Expand Down
6 changes: 6 additions & 0 deletions Devices/m5stack-tab5/m5stack,tab5.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <tactility/bindings/esp32_sdmmc.h>
#include <tactility/bindings/esp32_uart.h>
#include <tactility/bindings/esp32_usbhost.h>
#include <tactility/bindings/esp32_wifi.h>
#include <bindings/bmi270.h>
#include <bindings/ina226.h>
#include <bindings/pi4ioe5v6408.h>
Expand All @@ -19,6 +20,11 @@
compatible = "root";
model = "Tab5";

wifi0 {
compatible = "espressif,esp32-wifi";
status = "disabled";
};

ble0 {
compatible = "espressif,esp32-ble";
status = "disabled";
Expand Down
2 changes: 1 addition & 1 deletion Tactility/Include/Tactility/service/rtctime/RtcTimeService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <Tactility/kernel/SystemEvents.h>
#include <Tactility/SystemEvents.h>
#include <Tactility/service/Service.h>
#include <Tactility/service/ServiceContext.h>
#include <Tactility/service/rtctime/RtcTime.h>
Expand Down
1 change: 1 addition & 0 deletions TactilityKernel/include/tactility/service/service_manifest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading