New kernel drivers and device migrations (#563)

2026-07-14 20:26:57 +02:00
parent 955416dac8
commit 8af6204ba1
215 changed files with 6359 additions and 3633 deletions
@@ -1,7 +1,6 @@
-file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
+file(GLOB_RECURSE SOURCE_FILES source/*.c*)

 idf_component_register(
    SRCS ${SOURCE_FILES}
-    INCLUDE_DIRS "Source"
-    REQUIRES Tactility esp_lvgl_port ST7789 XPT2046 PwmBacklight EstimatedPower driver vfs fatfs
+    REQUIRES TactilityKernel driver
 )
@@ -1,23 +0,0 @@
-#include "devices/Display.h"
-#include "devices/Power.h"
-
-#include <Tactility/hal/Configuration.h>
-#include <PwmBacklight.h>
-
-using namespace tt::hal;
-
-static bool initBoot() {
-    return driver::pwmbacklight::init(DISPLAY_BACKLIGHT_PIN);
-}
-
-static tt::hal::DeviceVector createDevices() {
-    return {
-        createPower(),
-        createDisplay(),
-    };
-}
-
-extern const Configuration hardwareConfiguration = {
-    .initBoot = initBoot,
-    .createDevices = createDevices
-};
@@ -1,52 +0,0 @@
-#include "Display.h"
-
-#include <Xpt2046Touch.h>
-#include <St7789Display.h>
-#include <PwmBacklight.h>
-#include <Tactility/hal/touch/TouchDevice.h>
-
-// Create the XPT2046 touch device (hardware/esp_lcd driver)
-static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
-    auto config = std::make_unique<Xpt2046Touch::Configuration>(
-        DISPLAY_SPI_HOST,                                // spi device / bus (SPI2_HOST)
-        TOUCH_CS_PIN,                                    // touch CS (IO33)
-        (uint16_t)DISPLAY_HORIZONTAL_RESOLUTION,         // x max
-        (uint16_t)DISPLAY_VERTICAL_RESOLUTION,           // y max
-        false,                                               // swapXy
-        true,                                                // mirrorX
-        true                                                 // mirrorY
-    );
-
-    return std::make_shared<Xpt2046Touch>(std::move(config));
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-    // Create the ST7789 panel configuration
-    St7789Display::Configuration panel_configuration = {
-        .horizontalResolution = DISPLAY_HORIZONTAL_RESOLUTION,
-        .verticalResolution = DISPLAY_VERTICAL_RESOLUTION,
-        .gapX = 0,
-        .gapY = 0,
-        .swapXY = false,
-        .mirrorX = false,
-        .mirrorY = false,
-        .invertColor = false,
-        .bufferSize = DISPLAY_DRAW_BUFFER_SIZE,  // 0 -> default 1/10 screen
-        .touch = createTouch(),
-        .backlightDutyFunction = driver::pwmbacklight::setBacklightDuty,
-        .resetPin = GPIO_NUM_NC,
-        .lvglSwapBytes = false,
-        .rgbElementOrder = LCD_RGB_ELEMENT_ORDER_BGR  // BGR for this display
-    };
-
-    // Create the SPI configuration (from EspLcdSpiDisplay base class)
-    auto spi_configuration = std::make_shared<EspLcdSpiDisplay::SpiConfiguration>(EspLcdSpiDisplay::SpiConfiguration {
-        .spiHostDevice = DISPLAY_SPI_HOST,
-        .csPin = DISPLAY_PIN_CS,
-        .dcPin = DISPLAY_PIN_DC,
-        .pixelClockFrequency = 40'000'000,
-        .transactionQueueDepth = 10
-    });
-
-    return std::make_shared<St7789Display>(panel_configuration, spi_configuration);
-}
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/display/DisplayDevice.h>
-#include "driver/gpio.h"
-#include "driver/spi_common.h"
-#include <memory>
-
-// Display (ST7789P3 on this board)
-constexpr auto DISPLAY_SPI_HOST = SPI2_HOST;
-constexpr auto DISPLAY_PIN_CS = GPIO_NUM_15;
-constexpr auto DISPLAY_PIN_DC = GPIO_NUM_2;
-constexpr auto DISPLAY_HORIZONTAL_RESOLUTION = 240;
-constexpr auto DISPLAY_VERTICAL_RESOLUTION = 320;
-constexpr auto DISPLAY_DRAW_BUFFER_HEIGHT = (DISPLAY_VERTICAL_RESOLUTION / 10);
-constexpr auto DISPLAY_DRAW_BUFFER_SIZE = (DISPLAY_HORIZONTAL_RESOLUTION * DISPLAY_DRAW_BUFFER_HEIGHT);
-constexpr auto DISPLAY_BACKLIGHT_PIN = GPIO_NUM_27;
-
-// Touch (XPT2046, resistive, shared SPI with display)
-constexpr auto TOUCH_MISO_PIN = GPIO_NUM_12;
-constexpr auto TOUCH_MOSI_PIN = GPIO_NUM_13;
-constexpr auto TOUCH_SCK_PIN = GPIO_NUM_14;
-constexpr auto TOUCH_CS_PIN = GPIO_NUM_33;
-constexpr auto TOUCH_IRQ_PIN = GPIO_NUM_36;
-
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -1,12 +0,0 @@
-#include "Power.h"
-
-#include <ChargeFromAdcVoltage.h>
-#include <EstimatedPower.h>
-
-std::shared_ptr<tt::hal::power::PowerDevice> createPower() {
-    ChargeFromAdcVoltage::Configuration configuration;
-    // 2.0 ratio, but +.11 added as display voltage sag compensation.
-    configuration.adcMultiplier = 2.11;
-
-    return std::make_shared<EstimatedPower>(configuration);
-}
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <Tactility/hal/power/PowerDevice.h>
-
-std::shared_ptr<tt::hal::power::PowerDevice> createPower();
@@ -1,13 +1,16 @@
 /dts-v1/;

 #include <tactility/bindings/root.h>
+#include <tactility/bindings/battery_sense.h>
+#include <tactility/bindings/esp32_adc_oneshot.h>
 #include <tactility/bindings/esp32_wifi_pinned.h>
 #include <tactility/bindings/esp32_gpio.h>
 #include <tactility/bindings/esp32_i2c.h>
 #include <tactility/bindings/esp32_spi.h>
 #include <tactility/bindings/esp32_sdspi.h>
-#include <tactility/bindings/display_placeholder.h>
-#include <tactility/bindings/pointer_placeholder.h>
+#include <tactility/bindings/esp32_ledc_backlight.h>
+#include <bindings/st7789.h>
+#include <bindings/xpt2046.h>

 / {
 	compatible = "root";
@@ -31,6 +34,31 @@
 		pin-scl = <&gpio0 25 GPIO_FLAG_NONE>;
 	};

+	adc0 {
+		compatible = "espressif,esp32-adc-oneshot";
+		unit-id = <ADC_UNIT_1>;
+		channels = <ADC_CHANNEL_6 ADC_ATTEN_DB_12 ADC_BITWIDTH_DEFAULT>;
+	};
+
+	// Matches the deprecated HAL's old ChargeFromAdcVoltage config: adcMultiplier=2.11,
+	// adcRefVoltage=3.3 (default), voltageMin/Max=3.2/4.2 (default, same as battery-sense's own
+	// fixed curve - see TactilityKernel/source/drivers/battery_sense.cpp).
+	battery-sense {
+		compatible = "battery-sense";
+		io-channel = <&adc0 0>;
+		reference-voltage-mv = <3300>;
+		multiplier = <2110>;
+	};
+
+	display_backlight {
+		compatible = "espressif,esp32-ledc-backlight";
+		// Off by default so display power-on won't show the screen from before the last power loss.
+		// The display backlight is turned on during the boot process.
+		status = "disabled";
+		pin-backlight = <&gpio0 27 GPIO_FLAG_NONE>;
+		frequency-hz = <40000>;
+	};
+
 	spi0 {
 		compatible = "espressif,esp32-spi";
 		host = <SPI2_HOST>;
@@ -39,13 +67,23 @@
 		pin-mosi = <&gpio0 13 GPIO_FLAG_NONE>;
 		pin-miso = <&gpio0 12 GPIO_FLAG_NONE>;
 		pin-sclk = <&gpio0 14 GPIO_FLAG_NONE>;
-	
+
 		display@0 {
-			compatible = "display-placeholder";
+			compatible = "sitronix,st7789";
+			horizontal-resolution = <240>;
+			vertical-resolution = <320>;
+			bgr-order;
+			pixel-clock-hz = <40000000>;
+			pin-dc = <&gpio0 2 GPIO_FLAG_NONE>;
+			backlight = <&display_backlight>;
 		};

 		touch@1 {
-			compatible = "pointer-placeholder";
+			compatible = "xptek,xpt2046";
+			x-max = <240>;
+			y-max = <320>;
+			mirror-x;
+			mirror-y;
 		};
 	};

@@ -56,7 +94,7 @@
 		pin-mosi = <&gpio0 23 GPIO_FLAG_NONE>;
 		pin-miso = <&gpio0 19 GPIO_FLAG_NONE>;
 		pin-sclk = <&gpio0 18 GPIO_FLAG_NONE>;
-	
+
 		sdcard@0 {
 			compatible = "espressif,esp32-sdspi";
 			frequency-khz = <20000>;
@@ -7,10 +7,15 @@ hardware.target=ESP32
 hardware.flashSize=4MB
 hardware.spiRam=false

+dependencies.useDeprecatedHal=false
+
 storage.userDataLocation=SD

 display.size=2.8"
 display.shape=rectangle
 display.dpi=125

+touch.calibrationSupported=true
+touch.calibrationRequired=false
+
 lvgl.colorDepth=16
@@ -1,3 +1,5 @@
 dependencies:
  - Platforms/platform-esp32
+  - Drivers/st7789-module
+  - Drivers/xpt2046-module
 dts: cyd,e32r32p.dts