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 ILI934x XPT2046SoftSPI PwmBacklight driver vfs fatfs
+    REQUIRES TactilityKernel driver
 )
@@ -1,19 +0,0 @@
-#include "devices/Display.h"
-
-#include <Tactility/hal/Configuration.h>
-#include <PwmBacklight.h>
-
-static bool initBoot() {
-    return driver::pwmbacklight::init(LCD_BACKLIGHT_PIN);
-}
-
-static tt::hal::DeviceVector createDevices() {
-    return {
-        createDisplay(),
-    };
-}
-
-extern const tt::hal::Configuration hardwareConfiguration = {
-    .initBoot = initBoot,
-    .createDevices = createDevices
-};
@@ -1,51 +0,0 @@
-#include "Display.h"
-
-#include <Xpt2046SoftSpi.h>
-#include <Ili934xDisplay.h>
-#include <PwmBacklight.h>
-#include <Tactility/hal/touch/TouchDevice.h>
-
-static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
-    auto config = std::make_unique<Xpt2046SoftSpi::Configuration>(
-        TOUCH_MOSI_PIN,
-        TOUCH_MISO_PIN,
-        TOUCH_SCK_PIN,
-        TOUCH_CS_PIN,
-        LCD_HORIZONTAL_RESOLUTION,
-        LCD_VERTICAL_RESOLUTION,
-        false,
-        true,
-        false
-    );
-
-    return std::make_shared<Xpt2046SoftSpi>(std::move(config));
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-    Ili934xDisplay::Configuration panel_configuration = {
-        .horizontalResolution = LCD_HORIZONTAL_RESOLUTION,
-        .verticalResolution = LCD_VERTICAL_RESOLUTION,
-        .gapX = 0,
-        .gapY = 0,
-        .swapXY = false,
-        .mirrorX = true,
-        .mirrorY = false,
-        .invertColor = false,
-        .swapBytes = true,
-        .bufferSize = LCD_BUFFER_SIZE,
-        .touch = createTouch(),
-        .backlightDutyFunction = driver::pwmbacklight::setBacklightDuty,
-        .resetPin = GPIO_NUM_NC,
-        .rgbElementOrder = LCD_RGB_ELEMENT_ORDER_BGR
-    };
-
-    auto spi_configuration = std::make_shared<Ili934xDisplay::SpiConfiguration>(Ili934xDisplay::SpiConfiguration {
-        .spiHostDevice = LCD_SPI_HOST,
-        .csPin = LCD_PIN_CS,
-        .dcPin = LCD_PIN_DC,
-        .pixelClockFrequency = 40'000'000,
-        .transactionQueueDepth = 10
-    });
-
-    return std::make_shared<Ili934xDisplay>(panel_configuration, spi_configuration, true);
-}
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/display/DisplayDevice.h>
-#include <driver/gpio.h>
-#include <driver/spi_common.h>
-#include <memory>
-
-// Display
-constexpr auto LCD_SPI_HOST = SPI2_HOST;
-constexpr auto LCD_PIN_CS = GPIO_NUM_15;
-constexpr auto LCD_PIN_DC = GPIO_NUM_2;
-constexpr auto LCD_HORIZONTAL_RESOLUTION = 240;
-constexpr auto LCD_VERTICAL_RESOLUTION = 320;
-constexpr auto LCD_BUFFER_HEIGHT = (LCD_VERTICAL_RESOLUTION / 10);
-constexpr auto LCD_BUFFER_SIZE = (LCD_HORIZONTAL_RESOLUTION * LCD_BUFFER_HEIGHT);
-
-// Touch (Software SPI)
-constexpr auto TOUCH_MISO_PIN = GPIO_NUM_39;
-constexpr auto TOUCH_MOSI_PIN = GPIO_NUM_32;
-constexpr auto TOUCH_SCK_PIN = GPIO_NUM_25;
-constexpr auto TOUCH_CS_PIN = GPIO_NUM_33;
-constexpr auto TOUCH_IRQ_PIN = GPIO_NUM_36;
-
-// Backlight
-constexpr auto LCD_BACKLIGHT_PIN = GPIO_NUM_21;
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -5,8 +5,9 @@
 #include <tactility/bindings/esp32_gpio.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/ili9341.h>
+#include <bindings/xpt2046_softspi.h>

 / {
 	compatible = "root";
@@ -22,21 +23,43 @@
 		gpio-count = <40>;
 	};

+	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 21 GPIO_FLAG_NONE>;
+		frequency-hz = <512>;
+	};
+
+	touch {
+		compatible = "xptek,xpt2046-softspi";
+		pin-mosi = <&gpio0 32 GPIO_FLAG_NONE>;
+		pin-miso = <&gpio0 39 GPIO_FLAG_NONE>;
+		pin-sck = <&gpio0 25 GPIO_FLAG_NONE>;
+		pin-cs = <&gpio0 33 GPIO_FLAG_NONE>;
+		x-max = <240>;
+		y-max = <320>;
+		mirror-x;
+	};
+
 	spi0 {
 		compatible = "espressif,esp32-spi";
 		host = <SPI2_HOST>;
-		cs-gpios = <&gpio0 15 GPIO_FLAG_NONE>, // Display
-		            <&gpio0 33 GPIO_FLAG_NONE>; // Touch
+		cs-gpios = <&gpio0 15 GPIO_FLAG_NONE>;
 		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";
-		};

-		touch@1 {
-			compatible = "pointer-placeholder";
+		display@0 {
+			compatible = "ilitek,ili9341";
+			horizontal-resolution = <240>;
+			vertical-resolution = <320>;
+			mirror-x;
+			bgr-order;
+			pixel-clock-hz = <40000000>;
+			pin-dc = <&gpio0 2 GPIO_FLAG_NONE>;
+			backlight = <&display_backlight>;
 		};
 	};

@@ -47,7 +70,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=143

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