New kernel drivers and device migrations (#563)

Devices/cyd-2432s024r/CMakeLists.txt

@@ -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 XPT2046 PwmBacklight driver vfs fatfs
+    REQUIRES TactilityKernel driver
 )

Devices/cyd-2432s024r/Source/Configuration.cpp

@@ -1,21 +0,0 @@
-#include "devices/Display.h"
-
-#include <Tactility/hal/Configuration.h>
-#include <PwmBacklight.h>
-
-using namespace tt::hal;
-
-static bool initBoot() {
-    return driver::pwmbacklight::init(LCD_PIN_BACKLIGHT);
-}
-
-static DeviceVector createDevices() {
-    return {
-        createDisplay()
-    };
-}
-
-extern const Configuration hardwareConfiguration = {
-    .initBoot = initBoot,
-    .createDevices = createDevices
-};

Devices/cyd-2432s024r/Source/devices/Display.cpp

@@ -1,46 +0,0 @@
-#include "Display.h"
-#include "Xpt2046Touch.h"
-#include <Ili934xDisplay.h>
-#include <PwmBacklight.h>
-
-static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch(esp_lcd_spi_bus_handle_t spiDevice) {
-    auto configuration = std::make_unique<Xpt2046Touch::Configuration>(
-        spiDevice,
-        TOUCH_CS_PIN,
-        LCD_HORIZONTAL_RESOLUTION,
-        LCD_VERTICAL_RESOLUTION,
-        true,  // swapXY
-        false,   // mirrorX
-        true    // mirrorY
-    );
-    return std::make_shared<Xpt2046Touch>(std::move(configuration));
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-    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
-    });
-
-    Ili934xDisplay::Configuration panel_configuration = {
-        .horizontalResolution = LCD_HORIZONTAL_RESOLUTION,
-        .verticalResolution = LCD_VERTICAL_RESOLUTION,
-        .gapX = 0,
-        .gapY = 0,
-        .swapXY = true,
-        .mirrorX = true,
-        .mirrorY = true,
-        .invertColor = false,
-        .swapBytes = true,
-        .bufferSize = LCD_BUFFER_SIZE,
-        .touch = createTouch(spi_configuration->spiHostDevice),
-        .backlightDutyFunction = driver::pwmbacklight::setBacklightDuty,
-        .resetPin = LCD_PIN_RST,
-        .rgbElementOrder = LCD_RGB_ELEMENT_ORDER_RGB
-    };
-
-    return std::make_shared<Ili934xDisplay>(panel_configuration, spi_configuration, true);
-}

Devices/cyd-2432s024r/Source/devices/Display.h

@@ -1,28 +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_PIN_RST  = GPIO_NUM_NC;  // tied to ESP32 RST
-constexpr auto LCD_PIN_CLK  = GPIO_NUM_14;
-constexpr auto LCD_PIN_MOSI = GPIO_NUM_13;
-constexpr auto LCD_PIN_MISO = GPIO_NUM_12;
-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;
-
-// Backlight
-constexpr auto LCD_PIN_BACKLIGHT = GPIO_NUM_27;
-
-// Touch
-constexpr auto TOUCH_CS_PIN  = GPIO_NUM_33;
-constexpr auto TOUCH_IRQ_PIN = GPIO_NUM_36;
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Devices/cyd-2432s024r/cyd,2432s024r.dts

@@ -5,9 +5,10 @@
 #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_uart.h>
+#include <tactility/bindings/esp32_ledc_backlight.h>
+#include <bindings/ili9341.h>
+#include <bindings/xpt2046.h>
 
 / {
     compatible = "root";
@@ -23,6 +24,15 @@
         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 27 GPIO_FLAG_NONE>;
+		frequency-hz = <512>;
+	};
+
     spi0 {
         compatible = "espressif,esp32-spi";
         host = <SPI2_HOST>;
@@ -33,11 +43,23 @@
                    <&gpio0 33 GPIO_FLAG_NONE>; // Touch
 
 		display@0 {
-			compatible = "display-placeholder";
+			compatible = "ilitek,ili9341";
+			horizontal-resolution = <240>;
+			vertical-resolution = <320>;
+			swap-xy;
+			mirror-x;
+			mirror-y;
+			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>;
+			swap-xy;
+			mirror-y;
 		};
     };
 
@@ -61,4 +83,4 @@
         pin-tx = <&gpio0 1 GPIO_FLAG_NONE>;
         pin-rx = <&gpio0 3 GPIO_FLAG_NONE>;
     };
-};
+};

Devices/cyd-2432s024r/device.properties

@@ -7,6 +7,8 @@ hardware.target=ESP32
 hardware.flashSize=4MB
 hardware.spiRam=false
 
+dependencies.useDeprecatedHal=false
+
 storage.userDataLocation=SD
 
 display.size=2.4"

Devices/cyd-2432s024r/devicetree.yaml

@@ -1,3 +1,5 @@
 dependencies:
   - Platforms/platform-esp32
+  - Drivers/ili9341-module
+  - Drivers/xpt2046-module
 dts: cyd,2432s024r.dts