New kernel drivers, filesystem API, and more

.github/workflows/build.yml

@@ -53,7 +53,7 @@ jobs:
           { id: guition-jc8048w550c, arch: esp32s3 },
           { id: heltec-wifi-lora-32-v3, arch: esp32s3 },
           { id: lilygo-tdeck, arch: esp32s3 },
-          { id: lilygo-thmi-s3, arch: esp32s3 },
+          { id: lilygo-thmi, arch: esp32s3 },
           { id: lilygo-tdongle-s3, arch: esp32s3 },
           { id: lilygo-tdisplay-s3, arch: esp32s3 },
           { id: lilygo-tlora-pager, arch: esp32s3 },

Devices/guition-jc1060p470ciwy/Source/devices/SdCard.cpp

@@ -18,6 +18,7 @@ static const auto LOGGER = tt::Logger("JcSdCard");
 // ESP32-P4 Slot 0 uses IO MUX (fixed pins, not manually configurable)
 // CLK=43, CMD=44, D0=39, D1=40, D2=41, D3=42 (defined automatically by hardware)
 
+// TODO: Migrate to "espressif,esp32-sdmmc" driver (needs LDO code porting)
 class SdCardDeviceImpl final : public SdCardDevice {
 
     class NoLock final : public tt::Lock {

Devices/lilygo-tdongle-s3/Source/Configuration.cpp

@@ -1,5 +1,4 @@
 #include "devices/Display.h"
-#include "devices/Sdcard.h"
 
 #include <Tactility/hal/Configuration.h>
 
@@ -9,8 +8,7 @@ using namespace tt::hal;
 
 static std::vector<std::shared_ptr<tt::hal::Device>> createDevices() {
     return {
-        createDisplay(),
-        createSdCard()
+        createDisplay()
     };
 }
 

Devices/lilygo-tdongle-s3/device.properties

@@ -22,3 +22,4 @@ dpi=186
 [lvgl]
 colorDepth=16
 uiDensity=compact
+fontSize=10

Devices/lilygo-tdongle-s3/lilygo,tdongle-s3.dts

@@ -3,6 +3,7 @@
 #include <tactility/bindings/root.h>
 #include <tactility/bindings/esp32_gpio.h>
 #include <tactility/bindings/esp32_i2c.h>
+#include <tactility/bindings/esp32_sdmmc.h>
 #include <tactility/bindings/esp32_spi.h>
 #include <tactility/bindings/esp32_uart.h>
 
@@ -30,6 +31,17 @@
 		pin-sclk = <&gpio0 5 GPIO_FLAG_NONE>;
 	};
 
+	sdmmc0 {
+		compatible = "espressif,esp32-sdmmc";
+		pin-clk = <&gpio0 12 GPIO_FLAG_NONE>;
+		pin-cmd = <&gpio0 16 GPIO_FLAG_NONE>;
+		pin-d0 = <&gpio0 14 GPIO_FLAG_NONE>;
+		pin-d1 = <&gpio0 17 GPIO_FLAG_NONE>;
+		pin-d2 = <&gpio0 21 GPIO_FLAG_NONE>;
+		pin-d3 = <&gpio0 18 GPIO_FLAG_NONE>;
+		bus-width = <4>;
+	};
+
 	stemma_qt: uart1 {
 		compatible = "espressif,esp32-uart";
 		port = <UART_NUM_1>;

Devices/lilygo-thmi-s3/Source/Configuration.cpp → Devices/lilygo-thmi/Source/Configuration.cpp

@@ -1,5 +1,4 @@
 #include "devices/Power.h"
-#include "devices/SdCard.h"
 #include "devices/Display.h"
 
 #include <ButtonControl.h>
@@ -11,7 +10,6 @@ using namespace tt::hal;
 
 static std::vector<std::shared_ptr<tt::hal::Device>> createDevices() {
     return {
-        createSdCard(),
         createDisplay(),
         std::make_shared<Power>(),
         ButtonControl::createOneButtonControl(0)

Devices/lilygo-thmi-s3/Source/Init.cpp → Devices/lilygo-thmi/Source/Init.cpp

@@ -5,11 +5,11 @@
 #include "Tactility/kernel/SystemEvents.h"
 #include <Tactility/TactilityCore.h>
 
-#define TAG "thmi-s3"
+#define TAG "thmi"
 
 static bool powerOn() {
     gpio_config_t power_signal_config = {
-        .pin_bit_mask =  (1ULL << THMI_S3_POWERON_GPIO) | (1ULL << THMI_S3_POWEREN_GPIO),
+        .pin_bit_mask =  (1ULL << THMI_POWERON_GPIO) | (1ULL << THMI_POWEREN_GPIO),
         .mode = GPIO_MODE_OUTPUT,
         .pull_up_en = GPIO_PULLUP_DISABLE,
         .pull_down_en = GPIO_PULLDOWN_DISABLE,
@@ -20,11 +20,11 @@ static bool powerOn() {
         return false;
     }
 
-    if (gpio_set_level(THMI_S3_POWERON_GPIO, 1) != ESP_OK) {
+    if (gpio_set_level(THMI_POWERON_GPIO, 1) != ESP_OK) {
         return false;
     }
 
-    if (gpio_set_level(THMI_S3_POWEREN_GPIO, 1) != ESP_OK) {
+    if (gpio_set_level(THMI_POWEREN_GPIO, 1) != ESP_OK) {
         return false;
     }
 

Devices/lilygo-thmi-s3/Source/devices/Power.h → Devices/lilygo-thmi/Source/devices/Power.h

@@ -6,16 +6,16 @@
 #include <ChargeFromVoltage.h>
 #include <Tactility/hal/power/PowerDevice.h>
 
-constexpr auto THMI_S3_POWEREN_GPIO = GPIO_NUM_10;
-constexpr auto THMI_S3_POWERON_GPIO = GPIO_NUM_14;
+constexpr auto THMI_POWEREN_GPIO = GPIO_NUM_10;
+constexpr auto THMI_POWERON_GPIO = GPIO_NUM_14;
 
 using tt::hal::power::PowerDevice;
 
 class Power final : public PowerDevice {
 
     ChargeFromVoltage chargeFromAdcVoltage = ChargeFromVoltage(3.3f, 4.2f);
-    bool initialized = false;
     esp_adc_cal_characteristics_t adcCharacteristics;
+    bool initialized = false;
     bool calibrated = false;
 
     bool adcInitCalibration();
@@ -25,7 +25,7 @@ class Power final : public PowerDevice {
 
 public:
 
-    std::string getName() const override { return "T-hmi Power"; }
+    std::string getName() const override { return "T-HMI Power"; }
     std::string getDescription() const override { return "Power measurement via ADC"; }
 
     bool supportsMetric(MetricType type) const override;

Devices/lilygo-thmi-s3/Source/module.cpp → Devices/lilygo-thmi/Source/module.cpp

@@ -13,7 +13,7 @@ static error_t stop() {
 }
 
 struct Module lilygo_thmi_s3_module = {
-    .name = "lilygo-thmi-s3",
+    .name = "lilygo-thmi",
     .start = start,
     .stop = stop,
     .symbols = nullptr,

Devices/lilygo-thmi-s3/device.properties → Devices/lilygo-thmi/device.properties

@@ -1,6 +1,6 @@
 [general]
 vendor=LilyGO
-name=T-HMI S3
+name=T-HMI
 
 [apps]
 launcherAppId=Launcher

Devices/lilygo-thmi-s3/devicetree.yaml → Devices/lilygo-thmi/devicetree.yaml

@@ -1,3 +1,3 @@
 dependencies:
   - Platforms/platform-esp32
-dts: lilygo,thmi-s3.dts
+dts: lilygo,thmi.dts

Devices/lilygo-thmi-s3/lilygo,thmi-s3.dts → Devices/lilygo-thmi/lilygo,thmi.dts

@@ -3,11 +3,12 @@
 #include <tactility/bindings/root.h>
 #include <tactility/bindings/esp32_gpio.h>
 #include <tactility/bindings/esp32_i2c.h>
+#include <tactility/bindings/esp32_sdmmc.h>
 #include <tactility/bindings/esp32_spi.h>
 
 / {
 	compatible = "root";
-	model = "LilyGO T-HMI S3";
+	model = "LilyGO T-HMI";
 
 	gpio0 {
 		compatible = "espressif,esp32-gpio";
@@ -21,4 +22,12 @@
 		pin-miso = <&gpio0 4 GPIO_FLAG_NONE>;
 		pin-sclk = <&gpio0 1 GPIO_FLAG_NONE>;
 	};
+
+	sdmmc0 {
+		compatible = "espressif,esp32-sdmmc";
+		pin-clk = <&gpio0 12 GPIO_FLAG_NONE>;
+		pin-cmd = <&gpio0 11 GPIO_FLAG_NONE>;
+		pin-d0 = <&gpio0 13 GPIO_FLAG_NONE>;
+		bus-width = <1>;
+	};
 };

Devices/m5stack-tab5/CMakeLists.txt

@@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
 idf_component_register(
     SRCS ${SOURCE_FILES}
     INCLUDE_DIRS "Source"
-    REQUIRES Tactility esp_lvgl_port esp_lcd EspLcdCompat esp_lcd_ili9881c GT911 PwmBacklight driver vfs fatfs pi4ioe5v6408-module
+    REQUIRES Tactility esp_lvgl_port esp_lcd EspLcdCompat esp_lcd_ili9881c GT911 PwmBacklight driver vfs fatfs
 )