.github/actions/build-firmware/action.yml

@@ -18,9 +18,9 @@ runs:
       shell: bash
       run: cp sdkconfig.board.${{ inputs.board_id }} sdkconfig
     - name: 'Build'
-      uses: espressif/esp-idf-ci-action@v1
+      uses: espressif/esp-idf-ci-action@main
       with:
-        esp_idf_version: v5.5
+        esp_idf_version: v5.4
         target: ${{ inputs.arch }}
         path: './'
     - name: 'Release'

.github/actions/build-sdk/action.yml

@@ -18,18 +18,14 @@ runs:
       shell: bash
       run: cp sdkconfig.board.${{ inputs.board_id }} sdkconfig
     - name: 'Build'
-      uses: espressif/esp-idf-ci-action@v1
+      uses: espressif/esp-idf-ci-action@main
       with:
-        # NOTE: Update with ESP-IDF!
-        esp_idf_version: v5.5
+        esp_idf_version: v5.4
         target: ${{ inputs.arch }}
         path: './'
     - name: 'Release'
       shell: bash
-      env:
-        # NOTE: Update with ESP-IDF!
-        ESP_IDF_VERSION: '5.5'
-      run: Buildscripts/release-sdk.sh release/TactilitySDK
+      run: Buildscripts/release-sdk.sh  release/TactilitySDK
     - name: 'Upload Artifact'
       uses: actions/upload-artifact@v4
       with:

.github/workflows/build-firmware.yml

@@ -18,24 +18,6 @@ jobs:
         with:
           board_id: cyd-2432s024c
           arch: esp32
-  cyd-2432s028r:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: cyd-2432s028r
-          arch: esp32
-  cyd-e32r28t:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: cyd-e32r28t
-          arch: esp32
   cyd-2432s032c:
     runs-on: ubuntu-latest
     steps:
@@ -144,24 +126,6 @@ jobs:
         with:
           board_id: lilygo-tdeck
           arch: esp32s3
-  lilygo-tlora-pager:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: lilygo-tlora-pager
-          arch: esp32s3
-  m5stack-cardputer:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: m5stack-cardputer
-          arch: esp32s3
   m5stack-core2:
     runs-on: ubuntu-latest
     steps:
@@ -197,31 +161,4 @@ jobs:
         uses: ./.github/actions/build-firmware
         with:
           board_id: waveshare-s3-touch-43
-          arch: esp32s3
-  waveshare-s3-touch-lcd-147:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: waveshare-s3-touch-lcd-147
-          arch: esp32s3
-  waveshare-s3-touch-lcd-128:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: "Build"
-      uses: ./.github/actions/build-firmware
-      with:
-        board_id: waveshare-s3-touch-lcd-128
-        arch: esp32s3
-  waveshare-s3-lcd-13:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: "Build"
-      uses: ./.github/actions/build-firmware
-      with:
-        board_id: waveshare-s3-lcd-13
-        arch: esp32s3
+          arch: esp32s3

.gitignore

@@ -7,7 +7,6 @@ build-sim/
 cmake-build-*/
 CMakeCache.txt
 *.cbp
-CMakeFiles
 
 release/
 
@@ -17,7 +16,3 @@ sdkconfig.old
 managed_components/
 dependencies.lock
 
-.vscode/
-.gitpod.yml
-
-sdkconfig.board.*.dev

.gitmodules

@@ -10,6 +10,3 @@
 [submodule "Libraries/SDL"]
 	path = Libraries/SDL
 	url = https://github.com/libsdl-org/SDL.git
-[submodule "Libraries/minitar/minitar"]
-	path = Libraries/minitar/minitar
-	url = https://github.com/ByteWelder/minitar.git

App/CMakeLists.txt

@@ -25,4 +25,4 @@ else ()
 
     add_definitions(-D_Nullable=)
     add_definitions(-D_Nonnull=)
-endif ()
+endif ()

App/Kconfig

@@ -13,10 +13,6 @@ menu "Tactility App"
             bool "Custom"
         config TT_BOARD_CYD_2432S024C
             bool "CYD 2432S024C"
-        config TT_BOARD_CYD_2432S028R
-            bool "CYD 2432S028R"
-        config TT_BOARD_CYD_E32R28T
-            bool "CYD E32R28T"    
         config TT_BOARD_CYD_2432S032C
             bool "CYD 2432S032C"
         config TT_BOARD_CYD_8048S043C
@@ -41,10 +37,6 @@ menu "Tactility App"
             bool "Elecrow CrowPanel Basic 5.0"
         config TT_BOARD_LILYGO_TDECK
             bool "LilyGo T-Deck"
-        config TT_BOARD_LILYGO_TLORA_PAGER
-            bool "LilyGo T-Lora Pager"
-        config TT_BOARD_M5STACK_CARDPUTER
-            bool "M5Stack Cardputer"
         config TT_BOARD_M5STACK_CORE2
             bool "M5Stack Core2"
         config TT_BOARD_M5STACK_CORES3
@@ -53,12 +45,6 @@ menu "Tactility App"
             bool "unPhone"
         config TT_BOARD_WAVESHARE_S3_TOUCH_43
             bool "Waveshare ESP32 S3 Touch LCD 4.3"
-        config TT_BOARD_WAVESHARE_S3_TOUCH_LCD_147
-            bool "Waveshare ESP32 S3 Touch LCD 1.47"
-        config TT_BOARD_WAVESHARE_S3_TOUCH_LCD_128
-            bool "Waveshare ESP32 S3 Touch LCD 1.28"
-        config TT_BOARD_WAVESHARE_S3_LCD_13
-            bool "Waveshare ESP32 S3 LCD 1.3"
         help
             Select a board/hardware configuration.
             Use TT_BOARD_CUSTOM if you will manually configure the board in your project.

App/Source/Boards.h

@@ -8,18 +8,9 @@
 #if defined(CONFIG_TT_BOARD_LILYGO_TDECK)
 #include "LilygoTdeck.h"
 #define TT_BOARD_HARDWARE &lilygo_tdeck
-#elif defined(CONFIG_TT_BOARD_LILYGO_TLORA_PAGER)
-#include "LilygoTloraPager.h"
-#define TT_BOARD_HARDWARE &lilygo_tlora_pager
 #elif defined(CONFIG_TT_BOARD_CYD_2432S024C)
 #include "CYD2432S024C.h"
 #define TT_BOARD_HARDWARE &cyd_2432s024c_config
-#elif defined(CONFIG_TT_BOARD_CYD_2432S028R)
-#include "CYD2432S028R.h"
-#define TT_BOARD_HARDWARE &cyd_2432s028r_config
-#elif defined(CONFIG_TT_BOARD_CYD_E32R28T)
-#include "E32R28T.h"
-#define TT_BOARD_HARDWARE &cyd_e32r28t_config
 #elif defined(CONFIG_TT_BOARD_CYD_2432S032C)
 #include "CYD2432S032C.h"
 #define TT_BOARD_HARDWARE &cyd_2432S032c_config
@@ -41,9 +32,6 @@
 #elif (defined(CONFIG_TT_BOARD_ELECROW_CROWPANEL_BASIC_50))
 #define TT_BOARD_HARDWARE &crowpanel_basic_50
 #include "CrowPanelBasic50.h"
-#elif defined(CONFIG_TT_BOARD_M5STACK_CARDPUTER)
-#include "M5stackCardputer.h"
-#define TT_BOARD_HARDWARE &m5stack_cardputer
 #elif defined(CONFIG_TT_BOARD_M5STACK_CORE2)
 #include "M5stackCore2.h"
 #define TT_BOARD_HARDWARE &m5stack_core2
@@ -68,15 +56,6 @@
 #elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_TOUCH_43)
 #include "WaveshareS3Touch43.h"
 #define TT_BOARD_HARDWARE &waveshare_s3_touch_43
-#elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_TOUCH_LCD_147)
-#include "WaveshareS3TouchLcd147.h"
-#define TT_BOARD_HARDWARE &waveshare_s3_touch_lcd_147
-#elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_TOUCH_LCD_128)
-#include "WaveshareS3TouchLcd128.h"
-#define TT_BOARD_HARDWARE &waveshare_s3_touch_lcd_128
-#elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_LCD_13)
-#include "WaveshareS3Lcd13.h"
-#define TT_BOARD_HARDWARE &waveshare_s3_lcd_13
 #else
 #define TT_BOARD_HARDWARE NULL
 #error Replace TT_BOARD_HARDWARE in main.c with your own. Or copy one of the ./sdkconfig.board.* files into ./sdkconfig.
@@ -89,4 +68,4 @@
 extern tt::hal::Configuration hardware;
 #define TT_BOARD_HARDWARE &hardware
 
-#endif // ESP_PLATFORM
+#endif // ESP_PLATFORM

App/Source/Main.cpp

@@ -5,7 +5,7 @@
 #include "tt_init.h"
 #endif
 
-extern const tt::app::AppManifest hello_world_app;
+// extern const tt::app::AppManifest hello_world_app;
 
 extern "C" {
 
@@ -28,4 +28,4 @@ void app_main() {
     tt::run(config);
 }
 
-} // extern
+} // extern

App/idf_component.yml

@@ -1,5 +1,5 @@
 dependencies:
-  espressif/esp_lcd_ili9341: "2.0.1"
+  espressif/esp_lcd_ili9341: "2.0.0"
   atanisoft/esp_lcd_ili9488: "1.0.10"
   espressif/esp_lcd_touch: "1.1.2"
   atanisoft/esp_lcd_touch_xpt2046: "1.0.5"
@@ -9,15 +9,12 @@ dependencies:
   espressif/esp_io_expander: "1.0.1"
   espressif/esp_io_expander_tca95xx_16bit: "1.0.1"
   espressif/esp_lcd_st7701:
-    version: "1.1.3"
+    version: "1.1.1"
     rules:
       - if: "target in [esp32s3, esp32p4]"
-  espressif/esp_lcd_st7796:
-    version: "1.3.4"
-  espressif/esp_lcd_gc9a01: "2.0.3"
   espressif/esp_lcd_panel_io_additions: "1.0.1"
   espressif/esp_tinyusb:
-    version: "1.7.6~1"
+    version: "1.5.0"
     rules:
       - if: "target == esp32s3"
-  idf: '5.5'
+  idf: '5.4'

Boards/CYD-2432S024C/Source/CYD2432S024C.cpp

@@ -1,26 +1,22 @@
 #include "CYD2432S024C.h"
-#include "devices/Display.h"
-#include "devices/SdCard.h"
+#include "hal/YellowDisplay.h"
+#include "hal/YellowDisplayConstants.h"
+#include "hal/YellowSdCard.h"
 
 #include <Tactility/lvgl/LvglSync.h>
 #include <PwmBacklight.h>
 
 #define CYD_SPI_TRANSFER_SIZE_LIMIT (TWODOTFOUR_LCD_DRAW_BUFFER_SIZE * LV_COLOR_DEPTH / 8)
 
-static bool initBoot() {
+bool initBoot() {
     return driver::pwmbacklight::init(TWODOTFOUR_LCD_PIN_BACKLIGHT);
 }
 
-static tt::hal::DeviceVector createDevices() {
-    return {
-        createDisplay(),
-        createSdCard()
-    };
-}
-
 const tt::hal::Configuration cyd_2432s024c_config = {
     .initBoot = initBoot,
-    .createDevices = createDevices,
+    .createDisplay = createDisplay,
+    .sdcard = createYellowSdCard(),
+    .power = nullptr,
     .i2c = {
         tt::hal::i2c::Configuration {
             .name = "First",

Boards/CYD-2432S024C/Source/devices/SdCard.cpp

@@ -1,28 +0,0 @@
-#include "SdCard.h"
-
-#define TAG "twodotfour_sdcard"
-
-#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
-
-constexpr auto SDCARD_SPI_HOST = SPI3_HOST;
-constexpr auto SDCARD_PIN_CS = GPIO_NUM_5;
-
-using tt::hal::sdcard::SpiSdCardDevice;
-
-std::shared_ptr<SdCardDevice> createSdCard() {
-    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
-        SDCARD_PIN_CS,
-        GPIO_NUM_NC,
-        GPIO_NUM_NC,
-        GPIO_NUM_NC,
-        SdCardDevice::MountBehaviour::AtBoot,
-        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
-        std::vector<gpio_num_t>(),
-        SDCARD_SPI_HOST
-    );
-
-    return std::make_shared<SpiSdCardDevice>(
-        std::move(configuration)
-    );
-}
-

Boards/CYD-2432S024C/Source/hal/YellowDisplay.cpp

@@ -1,5 +1,6 @@
-#include "Display.h"
+#include "YellowDisplay.h"
 #include "Cst816Touch.h"
+#include "YellowDisplayConstants.h"
 
 #include <Ili934xDisplay.h>
 #include <PwmBacklight.h>
@@ -31,6 +32,5 @@ std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
     configuration->mirrorX = true;
     configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
 
-    auto display = std::make_shared<Ili934xDisplay>(std::move(configuration));
-    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
+    return std::make_shared<Ili934xDisplay>(std::move(configuration));
 }

Boards/CYD-2432S024C/Source/hal/YellowDisplay.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Tactility/hal/display/DisplayDevice.h>
+#include "Tactility/hal/display/DisplayDevice.h"
 #include <memory>
 
 std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/CYD-2432S024C/Source/hal/YellowDisplayConstants.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#include "Tactility/hal/display/DisplayDevice.h"
-#include <memory>
-
 #define TWODOTFOUR_LCD_PIN_BACKLIGHT GPIO_NUM_27
 
 // Display
@@ -14,4 +11,3 @@
 #define TWODOTFOUR_LCD_PIN_CS GPIO_NUM_15
 #define TWODOTFOUR_LCD_PIN_DC GPIO_NUM_2
 
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/CYD-2432S024C/Source/hal/YellowSdCard.cpp

@@ -0,0 +1,30 @@
+#include "YellowSdCard.h"
+
+#define TAG "twodotfour_sdcard"
+
+#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
+
+#define SDCARD_SPI_HOST SPI3_HOST
+#define SDCARD_PIN_CS GPIO_NUM_5
+
+using tt::hal::sdcard::SpiSdCardDevice;
+
+std::shared_ptr<SdCardDevice> createYellowSdCard() {
+    auto* configuration = new SpiSdCardDevice::Config(
+        SDCARD_PIN_CS,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        SdCardDevice::MountBehaviour::AtBoot,
+        std::make_shared<tt::Mutex>(),
+        std::vector<gpio_num_t>(),
+        SDCARD_SPI_HOST
+    );
+
+    auto* sdcard = (SdCardDevice*) new SpiSdCardDevice(
+        std::unique_ptr<SpiSdCardDevice::Config>(configuration)
+    );
+
+    return std::shared_ptr<SdCardDevice>(sdcard);
+}
+

Boards/CYD-2432S024C/Source/hal/YellowSdCard.h

@@ -4,5 +4,5 @@
 
 using tt::hal::sdcard::SdCardDevice;
 
-std::shared_ptr<SdCardDevice> createSdCard();
+std::shared_ptr<SdCardDevice> createYellowSdCard();
 

Boards/CYD-2432S024C/Source/hal/YellowTouchConstants.h

@@ -0,0 +1,5 @@
+#pragma once
+
+// Touch
+#define TWODOTFOUR_TOUCH_I2C_PORT I2C_NUM_0
+

Boards/CYD-2432S028R/CMakeLists.txt

@@ -1,7 +0,0 @@
-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
-)

Boards/CYD-2432S028R/Source/CYD2432S028R.cpp

@@ -1,134 +0,0 @@
-#include "CYD2432S028R.h"
-#include "devices/Display.h"
-#include "devices/SdCard.h"
-#include <Tactility/lvgl/LvglSync.h>
-#include <PwmBacklight.h>
-#include <Tactility/hal/Configuration.h>
-
-// SPI Transfer
-#define CYD_SPI_TRANSFER_SIZE_LIMIT (CYD2432S028R_LCD_DRAW_BUFFER_SIZE * LV_COLOR_DEPTH / 8)
-// Display backlight (PWM)
-#define CYD2432S028R_LCD_PIN_BACKLIGHT GPIO_NUM_21
-
-using namespace tt::hal;
-
-static bool initBoot() {
-    //Set the RGB Led Pins to output and turn them off
-    ESP_ERROR_CHECK(gpio_set_direction(GPIO_NUM_4, GPIO_MODE_OUTPUT)); //Red
-    ESP_ERROR_CHECK(gpio_set_direction(GPIO_NUM_16, GPIO_MODE_OUTPUT)); //Green
-    ESP_ERROR_CHECK(gpio_set_direction(GPIO_NUM_17, GPIO_MODE_OUTPUT)); //Blue
-
-    //0 on, 1 off... yep it's backwards.
-    ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_4, 1)); //Red
-    ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_16, 1)); //Green
-    ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_17, 1)); //Blue
-
-    return driver::pwmbacklight::init(CYD2432S028R_LCD_PIN_BACKLIGHT);
-}
-
-static DeviceVector createDevices() {
-    return {
-        createDisplay(),
-        createSdCard()
-    };
-}
-
-const Configuration cyd_2432s028r_config = {
-    .initBoot = initBoot,
-    .createDevices = createDevices,
-    .i2c = {
-        i2c::Configuration {
-            .name = "CN1",
-            .port = I2C_NUM_0,
-            .initMode = i2c::InitMode::ByTactility,
-            .isMutable = true,
-            .config = (i2c_config_t) {
-                .mode = I2C_MODE_MASTER,
-                .sda_io_num = GPIO_NUM_27,
-                .scl_io_num = GPIO_NUM_22,
-                .sda_pullup_en = false,
-                .scl_pullup_en = false,
-                .master = {
-                    .clk_speed = 400000
-                },
-                .clk_flags = 0
-            }
-        }
-    },
-    .spi {
-        // Display
-        spi::Configuration {
-            .device = SPI2_HOST,
-            .dma = SPI_DMA_CH_AUTO,
-            .config = {
-                .mosi_io_num = GPIO_NUM_13,
-                .miso_io_num = GPIO_NUM_12,
-                .sclk_io_num = GPIO_NUM_14,
-                .quadwp_io_num = GPIO_NUM_NC,
-                .quadhd_io_num = GPIO_NUM_NC,
-                .data4_io_num = GPIO_NUM_NC,
-                .data5_io_num = GPIO_NUM_NC,
-                .data6_io_num = GPIO_NUM_NC,
-                .data7_io_num = GPIO_NUM_NC,
-                .data_io_default_level = false,
-                .max_transfer_sz = CYD_SPI_TRANSFER_SIZE_LIMIT,
-                .flags = 0,
-                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
-                .intr_flags = 0
-            },
-            .initMode = spi::InitMode::ByTactility,
-            .isMutable = false,
-            .lock = tt::lvgl::getSyncLock()
-        },
-        // SDCard
-        spi::Configuration {
-            .device = SPI3_HOST,
-            .dma = SPI_DMA_CH_AUTO,
-            .config = {
-                .mosi_io_num = GPIO_NUM_23,
-                .miso_io_num = GPIO_NUM_19,
-                .sclk_io_num = GPIO_NUM_18,
-                .quadwp_io_num = GPIO_NUM_NC,
-                .quadhd_io_num = GPIO_NUM_NC,
-                .data4_io_num = GPIO_NUM_NC,
-                .data5_io_num = GPIO_NUM_NC,
-                .data6_io_num = GPIO_NUM_NC,
-                .data7_io_num = GPIO_NUM_NC,
-                .data_io_default_level = false,
-                .max_transfer_sz = 0,
-                .flags = 0,
-                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
-                .intr_flags = 0
-            },
-            .initMode = spi::InitMode::ByTactility,
-            .isMutable = false,
-            .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
-        },
-    },
-
-    .uart {
-        uart::Configuration {
-            .name = "P1",
-            .port = UART_NUM_1,
-            .rxPin = GPIO_NUM_1,
-            .txPin = GPIO_NUM_3,
-            .rtsPin = GPIO_NUM_NC,
-            .ctsPin = GPIO_NUM_NC,
-            .rxBufferSize = 1024,
-            .txBufferSize = 1024,
-            .config = {
-                .baud_rate = 115200,
-                .data_bits = UART_DATA_8_BITS,
-                .parity    = UART_PARITY_DISABLE,
-                .stop_bits = UART_STOP_BITS_1,
-                .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
-                .rx_flow_ctrl_thresh = 0,
-                .source_clk = UART_SCLK_DEFAULT,
-                .flags = {
-                    .allow_pd = 0,
-                    .backup_before_sleep = 0,
-                }
-            }
-        }
-    }
-};

Boards/CYD-2432S028R/Source/CYD2432S028R.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-// Resistive touch version of the 2.8" yellow board
-extern const tt::hal::Configuration cyd_2432s028r_config;

Boards/CYD-2432S028R/Source/devices/Display.cpp

@@ -1,54 +0,0 @@
-#include "Display.h"
-#include "Xpt2046SoftSpi.h"
-#include <Ili934xDisplay.h>
-#include <PwmBacklight.h>
-
-constexpr auto* TAG = "CYD";
-
-static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
-    auto configuration = std::make_unique<Xpt2046SoftSpi::Configuration>(
-        CYD_TOUCH_MOSI_PIN,
-        CYD_TOUCH_MISO_PIN,
-        CYD_TOUCH_SCK_PIN,
-        CYD_TOUCH_CS_PIN,
-        CYD2432S028R_LCD_HORIZONTAL_RESOLUTION, // 240
-        CYD2432S028R_LCD_VERTICAL_RESOLUTION, // 320
-        false, // swapXY
-        true, // mirrorX
-        false // mirrorY
-    );
-
-    // Allocate the driver
-    auto touch = std::make_shared<Xpt2046SoftSpi>(std::move(configuration));
-    
-    // Start the driver
-    if (!touch->start()) {
-        ESP_LOGE(TAG, "Touch driver start failed");
-        return nullptr;
-    }
-
-    return touch;
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-    auto touch = createTouch();
-
-    auto configuration = std::make_unique<Ili934xDisplay::Configuration>(
-        CYD2432S028R_LCD_SPI_HOST,
-        CYD2432S028R_LCD_PIN_CS,
-        CYD2432S028R_LCD_PIN_DC,
-        CYD2432S028R_LCD_HORIZONTAL_RESOLUTION,
-        CYD2432S028R_LCD_VERTICAL_RESOLUTION,
-        touch,
-        false, // swapXY
-        true, // mirrorX
-        false, // mirrorY
-        false,
-        CYD2432S028R_LCD_DRAW_BUFFER_SIZE
-    );
-
-    configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
-
-    auto display = std::make_shared<Ili934xDisplay>(std::move(configuration));
-    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
-}

Boards/CYD-2432S028R/Source/devices/Display.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include "Tactility/hal/display/DisplayDevice.h"
-#include <memory>
-
-// Display
-#define CYD2432S028R_LCD_SPI_HOST SPI2_HOST
-#define CYD2432S028R_LCD_HORIZONTAL_RESOLUTION 240
-#define CYD2432S028R_LCD_VERTICAL_RESOLUTION 320
-#define CYD2432S028R_LCD_DRAW_BUFFER_HEIGHT (CYD2432S028R_LCD_VERTICAL_RESOLUTION / 10)
-#define CYD2432S028R_LCD_DRAW_BUFFER_SIZE (CYD2432S028R_LCD_HORIZONTAL_RESOLUTION * CYD2432S028R_LCD_DRAW_BUFFER_HEIGHT)
-#define CYD2432S028R_LCD_PIN_CS GPIO_NUM_15
-#define CYD2432S028R_LCD_PIN_DC GPIO_NUM_2
-
-// Touch (Software SPI)
-#define CYD_TOUCH_MISO_PIN GPIO_NUM_39
-#define CYD_TOUCH_MOSI_PIN GPIO_NUM_32
-#define CYD_TOUCH_SCK_PIN GPIO_NUM_25
-#define CYD_TOUCH_CS_PIN GPIO_NUM_33
-#define CYD_TOUCH_IRQ_PIN GPIO_NUM_36
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/CYD-2432S028R/Source/devices/SdCard.cpp

@@ -1,21 +0,0 @@
-#include "SdCard.h"
-#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
-#include <Tactility/lvgl/LvglSync.h>
-
-using tt::hal::sdcard::SpiSdCardDevice;
-
-std::shared_ptr<SdCardDevice> createSdCard() {
-    auto config = std::make_unique<SpiSdCardDevice::Config>(
-        GPIO_NUM_5,
-        GPIO_NUM_NC,
-        GPIO_NUM_NC,
-        GPIO_NUM_NC,
-        SdCardDevice::MountBehaviour::AtBoot,
-        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
-        std::vector<gpio_num_t>(),
-        SPI3_HOST
-    );
-
-    return std::make_shared<SpiSdCardDevice>(std::move(config));
-}
-

Boards/CYD-2432S032C/Source/CYD2432S032C.cpp

@@ -1,7 +1,7 @@
 #include "CYD2432S032C.h"
 #include "Tactility/lvgl/LvglSync.h"
-#include "devices/Display.h"
-#include "devices/SdCard.h"
+#include "hal/CydDisplay.h"
+#include "hal/CydSdCard.h"
 
 #include <Tactility/kernel/SystemEvents.h>
 
@@ -14,7 +14,7 @@ bool initBoot() {
 
     // This display has a weird glitch with gamma during boot, which results in uneven dark gray colours.
     // Setting gamma curve index to 0 doesn't work at boot for an unknown reason, so we set the curve index to 1:
-    tt::kernel::subscribeSystemEvent(tt::kernel::SystemEvent::BootSplash, [](auto) {
+    tt::kernel::subscribeSystemEvent(tt::kernel::SystemEvent::BootInitLvglEnd, [](auto event) {
         auto display = tt::hal::findFirstDevice<tt::hal::display::DisplayDevice>(tt::hal::Device::Type::Display);
         assert(display != nullptr);
         tt::lvgl::lock(portMAX_DELAY);
@@ -25,16 +25,11 @@ bool initBoot() {
     return true;
 }
 
-static tt::hal::DeviceVector createDevices() {
-    return {
-        createDisplay(),
-        createSdCard()
-    };
-}
-
 const tt::hal::Configuration cyd_2432S032c_config = {
     .initBoot = initBoot,
-    .createDevices = createDevices,
+    .createDisplay = createDisplay,
+    .sdcard = createSdCard(),
+    .power = nullptr,
     .i2c = {
         tt::hal::i2c::Configuration {
             .name = "Internal",

Boards/CYD-2432S032C/Source/devices/SdCard.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/sdcard/SdCardDevice.h>
-
-using tt::hal::sdcard::SdCardDevice;
-
-std::shared_ptr<SdCardDevice> createSdCard();
-

Boards/CYD-2432S032C/Source/hal/CydDisplay.cpp

@@ -1,4 +1,4 @@
-#include "Display.h"
+#include "CydDisplay.h"
 
 #include <Gt911Touch.h>
 #include <Ili934xDisplay.h>
@@ -35,6 +35,5 @@ std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
 
     configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
 
-    auto display = std::make_shared<Ili934xDisplay>(std::move(configuration));
-    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
+    return std::make_shared<Ili934xDisplay>(std::move(configuration));
 }

Boards/CYD-2432S032C/Source/hal/CydDisplay.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include "Tactility/hal/display/DisplayDevice.h"
+#include <memory>
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/CYD-2432S032C/Source/hal/CydSdCard.cpp

@@ -1,27 +1,29 @@
-#include "SdCard.h"
+#include "CydSdCard.h"
 
 #include <Tactility/hal/sdcard/SpiSdCardDevice.h>
 #include <Tactility/lvgl/LvglSync.h>
 
-constexpr auto SDCARD_SPI_HOST = SPI3_HOST;
-constexpr auto SDCARD_PIN_CS = GPIO_NUM_5;
+#define SDCARD_SPI_HOST SPI3_HOST
+#define SDCARD_PIN_CS GPIO_NUM_5
 
 using tt::hal::sdcard::SpiSdCardDevice;
 
 std::shared_ptr<SdCardDevice> createSdCard() {
-    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
+    auto* configuration = new SpiSdCardDevice::Config(
         SDCARD_PIN_CS,
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         SdCardDevice::MountBehaviour::AtBoot,
-        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
+        std::make_shared<tt::Mutex>(),
         std::vector<gpio_num_t>(),
         SDCARD_SPI_HOST
     );
 
-    return std::make_shared<SpiSdCardDevice>(
-        std::move(configuration)
+    auto* sdcard = (SdCardDevice*) new SpiSdCardDevice(
+        std::unique_ptr<SpiSdCardDevice::Config>(configuration)
     );
+
+    return std::shared_ptr<SdCardDevice>(sdcard);
 }
 

Boards/CYD-4848S040C/CMakeLists.txt

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

Boards/CYD-4848S040C/Source/CYD4848S040C.cpp

@@ -1,25 +1,20 @@
 #include "CYD4848S040C.h"
-#include "devices/St7701Display.h"
-#include "devices/SdCard.h"
+#include "hal/CydDisplay.h"
+#include "hal/CydSdCard.h"
 
 #include <PwmBacklight.h>
 
 using namespace tt::hal;
 
-static bool initBoot() {
+bool initBoot() {
     return driver::pwmbacklight::init(GPIO_NUM_38, 1000);
 }
 
-static DeviceVector createDevices() {
-    return {
-        std::reinterpret_pointer_cast<Device>(std::make_shared<St7701Display>()),
-        createSdCard()
-    };
-}
-
 const Configuration cyd_4848s040c_config = {
     .initBoot = initBoot,
-    .createDevices = createDevices,
+    .createDisplay = createDisplay,
+    .sdcard = createSdCard(),
+    .power = nullptr,
     .i2c = {
         //Touch
         i2c::Configuration {

Boards/CYD-4848S040C/Source/devices/St7701Display.h

@@ -1,38 +0,0 @@
-#pragma once
-
-#include <Tactility/Mutex.h>
-
-#include <EspLcdDisplay.h>
-#include <lvgl.h>
-
-class St7701Display final : public EspLcdDisplay {
-
-    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable touchDevice;
-
-    bool createIoHandle(esp_lcd_panel_io_handle_t& outHandle) override;
-
-    bool createPanelHandle(esp_lcd_panel_io_handle_t ioHandle, esp_lcd_panel_handle_t& panelHandle) override;
-
-    lvgl_port_display_cfg_t getLvglPortDisplayConfig(esp_lcd_panel_io_handle_t ioHandle, esp_lcd_panel_handle_t panelHandle) override;
-
-    bool isRgbPanel() const override { return true; }
-
-    lvgl_port_display_rgb_cfg_t getLvglPortDisplayRgbConfig(esp_lcd_panel_io_handle_t ioHandle, esp_lcd_panel_handle_t panelHandle) override;
-
-public:
-
-    St7701Display() : EspLcdDisplay(std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive)) {}
-
-    std::string getName() const override { return "ST7701S"; }
-
-    std::string getDescription() const override { return "ST7701S RGB display"; }
-
-    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable getTouchDevice() override;
-
-    void setBacklightDuty(uint8_t backlightDuty) override;
-
-    bool supportsBacklightDuty() const override { return true; }
-
-    // TODO: Find out why it crashes
-    bool supportsDisplayDriver() const override { return false; }
-};

Boards/CYD-4848S040C/Source/hal/CydDisplay.cpp

@@ -1,17 +1,19 @@
-#include "St7701Display.h"
+#include "CydDisplay.h"
+#include "PwmBacklight.h"
 
 #include <Gt911Touch.h>
-#include <PwmBacklight.h>
 #include <Tactility/Log.h>
 
 #include <driver/gpio.h>
 #include <esp_err.h>
 #include <esp_lcd_panel_rgb.h>
 #include <esp_lcd_panel_ops.h>
+#include <esp_lcd_panel_io.h>
 #include <esp_lcd_panel_io_additions.h>
 #include <esp_lcd_st7701.h>
+#include <esp_lvgl_port.h>
 
-constexpr auto TAG = "St7701Display";
+#define TAG "cyd_display"
 
 static const st7701_lcd_init_cmd_t st7701_lcd_init_cmds[] = {
     //  {cmd, { data }, data_size, delay_ms}
@@ -56,7 +58,9 @@ static const st7701_lcd_init_cmd_t st7701_lcd_init_cmds[] = {
     {0x29, (uint8_t[]) {0x00}, 0, 0}, //Display On
 };
 
-bool St7701Display::createIoHandle(esp_lcd_panel_io_handle_t& outHandle) {
+bool CydDisplay::start() {
+    TT_LOG_I(TAG, "Starting");
+
     spi_line_config_t line_config = {
         .cs_io_type = IO_TYPE_GPIO,
         .cs_gpio_num = GPIO_NUM_39,
@@ -64,13 +68,11 @@ bool St7701Display::createIoHandle(esp_lcd_panel_io_handle_t& outHandle) {
         .scl_gpio_num = GPIO_NUM_48,
         .sda_io_type = IO_TYPE_GPIO,
         .sda_gpio_num = GPIO_NUM_47,
-        .io_expander = nullptr,
+        .io_expander = NULL,
     };
     esp_lcd_panel_io_3wire_spi_config_t panel_io_config = ST7701_PANEL_IO_3WIRE_SPI_CONFIG(line_config, 0);
-    return esp_lcd_new_panel_io_3wire_spi(&panel_io_config, &outHandle) == ESP_OK;
-}
+    ESP_ERROR_CHECK(esp_lcd_new_panel_io_3wire_spi(&panel_io_config, &ioHandle));
 
-bool St7701Display::createPanelHandle(esp_lcd_panel_io_handle_t ioHandle, esp_lcd_panel_handle_t& panelHandle) {
     const esp_lcd_rgb_panel_config_t rgb_config = {
         .clk_src = LCD_CLK_SRC_DEFAULT,
         .timings = {
@@ -177,11 +179,7 @@ bool St7701Display::createPanelHandle(esp_lcd_panel_io_handle_t ioHandle, esp_lc
         TT_LOG_E(TAG, "Failed to turn display on");
     }
 
-    return true;
-}
-
-lvgl_port_display_cfg_t St7701Display::getLvglPortDisplayConfig(esp_lcd_panel_io_handle_t ioHandle, esp_lcd_panel_handle_t panelHandle) {
-    return {
+    const lvgl_port_display_cfg_t disp_cfg = {
         .io_handle = ioHandle,
         .panel_handle = panelHandle,
         .control_handle = nullptr,
@@ -206,31 +204,50 @@ lvgl_port_display_cfg_t St7701Display::getLvglPortDisplayConfig(esp_lcd_panel_io
             .direct_mode = false
         }
     };
-}
 
-lvgl_port_display_rgb_cfg_t St7701Display::getLvglPortDisplayRgbConfig(esp_lcd_panel_io_handle_t ioHandle, esp_lcd_panel_handle_t panelHandle) {
-    return {
+    const lvgl_port_display_rgb_cfg_t rgb_cfg = {
         .flags = {
             .bb_mode = true,
             .avoid_tearing = false
         }
     };
+
+    displayHandle = lvgl_port_add_disp_rgb(&disp_cfg, &rgb_cfg);
+    TT_LOG_I(TAG, "Finished");
+    return displayHandle != nullptr;
 }
 
-std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable St7701Display::getTouchDevice() {
-    if (touchDevice == nullptr) {
-        auto configuration = std::make_unique<Gt911Touch::Configuration>(
-           I2C_NUM_0,
-           480,
-           480
-       );
+bool CydDisplay::stop() {
+    assert(displayHandle != nullptr);
 
-        touchDevice = std::make_shared<Gt911Touch>(std::move(configuration));
+    lvgl_port_remove_disp(displayHandle);
+
+    if (esp_lcd_panel_del(panelHandle) != ESP_OK) {
+        return false;
     }
 
-    return touchDevice;
+    if (esp_lcd_panel_io_del(ioHandle) != ESP_OK) {
+        return false;
+    }
+
+    displayHandle = nullptr;
+    return true;
 }
 
-void St7701Display::setBacklightDuty(uint8_t backlightDuty) {
+std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable CydDisplay::createTouch() {
+    auto configuration = std::make_unique<Gt911Touch::Configuration>(
+        I2C_NUM_0,
+        480,
+        480
+    );
+
+    return std::make_shared<Gt911Touch>(std::move(configuration));
+}
+
+void CydDisplay::setBacklightDuty(uint8_t backlightDuty) {
     driver::pwmbacklight::setBacklightDuty(backlightDuty);
 }
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
+    return std::make_shared<CydDisplay>();
+}

Boards/CYD-4848S040C/Source/hal/CydDisplay.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include "Tactility/hal/display/DisplayDevice.h"
+#include <esp_lcd_types.h>
+#include <lvgl.h>
+
+class CydDisplay : public tt::hal::display::DisplayDevice {
+
+private:
+
+    esp_lcd_panel_io_handle_t ioHandle = nullptr;
+    esp_lcd_panel_handle_t panelHandle = nullptr;
+    lv_display_t* displayHandle = nullptr;
+
+public:
+
+    std::string getName() const final { return "ST7701S"; }
+    std::string getDescription() const final { return "RGB Display"; }
+
+    bool start() override;
+
+    bool stop() override;
+
+    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() override;
+
+    void setBacklightDuty(uint8_t backlightDuty) override;
+    bool supportsBacklightDuty() const override { return true; }
+
+    lv_display_t* _Nullable getLvglDisplay() const override { return displayHandle; }
+};
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/CYD-4848S040C/Source/hal/CydSdCard.cpp

@@ -1,4 +1,4 @@
-#include "SdCard.h"
+#include "CydSdCard.h"
 
 #include <Tactility/hal/sdcard/SpiSdCardDevice.h>
 #include <Tactility/lvgl/LvglSync.h>

Boards/CYD-8048S043C/Source/CYD8048S043C.cpp

@@ -1,27 +1,21 @@
 #include "CYD8048S043C.h" // Don't remove, or we get a linker error ("undefined reference to `cyd_8048s043c_config'" - GCC bug?)
 #include "PwmBacklight.h"
-#include "devices/Display.h"
-#include "devices/SdCard.h"
+#include "hal/CydDisplay.h"
+#include "hal/CydSdCard.h"
 
 using namespace tt::hal;
 
-static bool initBoot() {
-    // Display backlight
+bool initBoot() {
     return driver::pwmbacklight::init(GPIO_NUM_2, 200);
 }
 
-static DeviceVector createDevices() {
-    return {
-        createDisplay(),
-        createSdCard()
-    };
-}
-
 const Configuration cyd_8048s043c_config = {
     .initBoot = initBoot,
-    .createDevices = createDevices,
+    .createDisplay = createDisplay,
+    .sdcard = createSdCard(),
+    .power = nullptr,
     .i2c = {
-        // Touch
+        //Touch
         i2c::Configuration {
             .name = "Internal",
             .port = I2C_NUM_0,
@@ -39,7 +33,7 @@ const Configuration cyd_8048s043c_config = {
                 .clk_flags = 0
             }
         },
-        // P4 header, JST SH 1.0, GND / 3.3V / IO17 / IO18
+        //P4 header, JST SH 1.0, GND / 3.3V / IO17 / IO18
         i2c::Configuration {
             .name = "External",
             .port = I2C_NUM_1,
@@ -59,7 +53,7 @@ const Configuration cyd_8048s043c_config = {
         }
     },
     .spi {
-        // SD Card
+        //SD Card
         spi::Configuration {
             .device = SPI2_HOST,
             .dma = SPI_DMA_CH_AUTO,
@@ -85,7 +79,7 @@ const Configuration cyd_8048s043c_config = {
         }
     },
     .uart {
-        // P4 header, JST SH 1.0, GND / 3.3V / IO17 / IO18
+        //P4 header, JST SH 1.0, GND / 3.3V / IO17 / IO18
         uart::Configuration {
             .name = "UART1",
             .port = UART_NUM_1,

Boards/CYD-8048S043C/Source/hal/CydDisplay.cpp

@@ -1,4 +1,4 @@
-#include "Display.h"
+#include "CydDisplay.h"
 
 #include <Gt911Touch.h>
 #include <PwmBacklight.h>

Boards/CYD-8048S043C/Source/hal/CydSdCard.cpp

@@ -1,4 +1,4 @@
-#include "SdCard.h"
+#include "CydSdCard.h"
 
 #include <Tactility/hal/sdcard/SpiSdCardDevice.h>
 #include <Tactility/lvgl/LvglSync.h>

Boards/CYD-E32R28T/CMakeLists.txt

@@ -1,7 +0,0 @@
-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
-)

Boards/CYD-E32R28T/Source/E32R28T.cpp

@@ -1,73 +0,0 @@
-#include "E32R28T.h"
-#include "devices/SdCard.h"
-#include "devices/Display.h"
-#include <Tactility/lvgl/LvglSync.h>
-#include <PwmBacklight.h>
-
-#define CYD_SPI_TRANSFER_SIZE_LIMIT (240 * 320 / 4 * 2)
-
-static bool initBoot() {
-    return driver::pwmbacklight::init(CYD_BACKLIGHT_PIN);
-}
-
-static tt::hal::DeviceVector createDevices() {
-    return {
-        createDisplay(),
-        createSdCard()
-    };
-}
-
-const tt::hal::Configuration cyd_e32r28t_config = {
-    .initBoot = initBoot,
-    .createDevices = createDevices,
-    .i2c = {},
-    .spi = {
-        tt::hal::spi::Configuration {
-            .device = SPI2_HOST,
-            .dma = SPI_DMA_CH_AUTO,
-            .config = {
-                .mosi_io_num = GPIO_NUM_13,
-                .miso_io_num = GPIO_NUM_12,
-                .sclk_io_num = GPIO_NUM_14,
-                .quadwp_io_num = GPIO_NUM_NC,
-                .quadhd_io_num = GPIO_NUM_NC,
-                .data4_io_num = GPIO_NUM_NC,
-                .data5_io_num = GPIO_NUM_NC,
-                .data6_io_num = GPIO_NUM_NC,
-                .data7_io_num = GPIO_NUM_NC,
-                .data_io_default_level = false,
-                .max_transfer_sz = CYD_SPI_TRANSFER_SIZE_LIMIT,
-                .flags = 0,
-                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
-                .intr_flags = 0
-            },
-            .initMode = tt::hal::spi::InitMode::ByTactility,
-            .isMutable = false,
-            .lock = tt::lvgl::getSyncLock()
-        },
-        tt::hal::spi::Configuration {
-            .device = SPI3_HOST,
-            .dma = SPI_DMA_CH_AUTO,
-            .config = {
-                .mosi_io_num = GPIO_NUM_23,
-                .miso_io_num = GPIO_NUM_19,
-                .sclk_io_num = GPIO_NUM_18,
-                .quadwp_io_num = GPIO_NUM_NC,
-                .quadhd_io_num = GPIO_NUM_NC,
-                .data4_io_num = GPIO_NUM_NC,
-                .data5_io_num = GPIO_NUM_NC,
-                .data6_io_num = GPIO_NUM_NC,
-                .data7_io_num = GPIO_NUM_NC,
-                .data_io_default_level = false,
-                .max_transfer_sz = CYD_SPI_TRANSFER_SIZE_LIMIT,
-                .flags = 0,
-                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
-                .intr_flags = 0
-            },
-            .initMode = tt::hal::spi::InitMode::ByTactility,
-            .isMutable = false,
-            .lock = tt::lvgl::getSyncLock()
-        },
-
-    }
-};

Boards/CYD-E32R28T/Source/E32R28T.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-// Resistive touch version of the waveshare 2.8" yellow board
-extern const tt::hal::Configuration cyd_e32r28t_config;

Boards/CYD-E32R28T/Source/devices/Display.cpp

@@ -1,41 +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>(
-        CYD_TOUCH_MOSI_PIN,
-        CYD_TOUCH_MISO_PIN,
-        CYD_TOUCH_SCK_PIN,
-        CYD_TOUCH_CS_PIN,
-        CYD_DISPLAY_HORIZONTAL_RESOLUTION,
-        CYD_DISPLAY_VERTICAL_RESOLUTION,
-        false,
-        true,
-        false
-    );
-
-    return std::make_shared<Xpt2046SoftSpi>(std::move(config));
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-    auto configuration = std::make_unique<Ili934xDisplay::Configuration>(
-        CYD_DISPLAY_SPI_HOST,
-        CYD_DISPLAY_PIN_CS,
-        CYD_DISPLAY_PIN_DC,
-        CYD_DISPLAY_HORIZONTAL_RESOLUTION,
-        CYD_DISPLAY_VERTICAL_RESOLUTION,
-        createTouch(),
-        false,
-        true,
-        false,
-        false,
-        0,
-        LCD_RGB_ELEMENT_ORDER_BGR
-    );
-    configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
-    return std::make_shared<Ili934xDisplay>(std::move(configuration));
-}

Boards/CYD-E32R28T/Source/devices/Display.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/display/DisplayDevice.h>
-#include <memory>
-
-// Display
-#define CYD_DISPLAY_SPI_HOST SPI2_HOST
-#define CYD_DISPLAY_PIN_CS GPIO_NUM_15
-#define CYD_DISPLAY_PIN_DC GPIO_NUM_2
-#define CYD_DISPLAY_HORIZONTAL_RESOLUTION 240
-#define CYD_DISPLAY_VERTICAL_RESOLUTION 320
-#define CYD_DISPLAY_DRAW_BUFFER_HEIGHT (CYD_DISPLAY_VERTICAL_RESOLUTION / 10)
-#define CYD_DISPLAY_DRAW_BUFFER_SIZE (CYD_DISPLAY_HORIZONTAL_RESOLUTION * CYD_DISPLAY_DRAW_BUFFER_HEIGHT)
-
-// Touch (Software SPI)
-#define CYD_TOUCH_MISO_PIN GPIO_NUM_39
-#define CYD_TOUCH_MOSI_PIN GPIO_NUM_32
-#define CYD_TOUCH_SCK_PIN GPIO_NUM_25
-#define CYD_TOUCH_CS_PIN GPIO_NUM_33
-#define CYD_TOUCH_IRQ_PIN GPIO_NUM_36
-
-// Backlight
-#define CYD_BACKLIGHT_PIN GPIO_NUM_21
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/CYD-E32R28T/Source/devices/SdCard.cpp

@@ -1,21 +0,0 @@
-#include "SdCard.h"
-#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
-
-using tt::hal::sdcard::SpiSdCardDevice;
-
-std::shared_ptr<SdCardDevice> createSdCard() {
-    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
-        GPIO_NUM_5,
-        GPIO_NUM_NC,
-        GPIO_NUM_NC,
-        GPIO_NUM_NC,
-        SdCardDevice::MountBehaviour::AtBoot,
-        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
-        std::vector<gpio_num_t>(),
-        SPI3_HOST
-    );
-
-    return std::make_shared<SpiSdCardDevice>(
-        std::move(configuration)
-    );
-}

Boards/CYD-E32R28T/Source/devices/SdCard.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/sdcard/SdCardDevice.h>
-
-using tt::hal::sdcard::SdCardDevice;
-
-std::shared_ptr<SdCardDevice> createSdCard();

Boards/CYD-JC2432W328C/Source/JC2432W328C.cpp

@@ -1,16 +1,18 @@
 #include "JC2432W328C.h"
-#include "devices/Display.h"
-#include "devices/SdCard.h"
+#include "hal/YellowDisplay.h"
+#include "hal/YellowDisplayConstants.h"
+#include "hal/YellowSdCard.h"
 
-#include <PwmBacklight.h>
-#include <Tactility/hal/Configuration.h>
 #include <Tactility/lvgl/LvglSync.h>
+#include <PwmBacklight.h>
+
+#include <Tactility/hal/Configuration.h>
 
 using namespace tt::hal;
 
 #define CYD_SPI_TRANSFER_SIZE_LIMIT (JC2432W328C_LCD_DRAW_BUFFER_SIZE * LV_COLOR_DEPTH / 8)
 
-static bool initBoot() {
+bool initBoot() {
     //Set the RGB Led Pins to output and turn them off
     ESP_ERROR_CHECK(gpio_set_direction(GPIO_NUM_4, GPIO_MODE_OUTPUT)); //Red
     ESP_ERROR_CHECK(gpio_set_direction(GPIO_NUM_16, GPIO_MODE_OUTPUT)); //Green
@@ -24,16 +26,11 @@ static bool initBoot() {
     return driver::pwmbacklight::init(JC2432W328C_LCD_PIN_BACKLIGHT);
 }
 
-static DeviceVector createDevices() {
-    return {
-        createDisplay(),
-        createSdCard()
-    };
-}
-
 const Configuration cyd_jc2432w328c_config = {
     .initBoot = initBoot,
-    .createDevices = createDevices,
+    .createDisplay = createDisplay,
+    .sdcard = createYellowSdCard(),
+    .power = nullptr,
     .i2c = {
         //Touch
         i2c::Configuration {

Boards/CYD-JC2432W328C/Source/devices/SdCard.cpp

@@ -1,27 +0,0 @@
-#include "SdCard.h"
-
-#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
-#include <Tactility/lvgl/LvglSync.h>
-
-constexpr auto SDCARD_SPI_HOST = SPI3_HOST;
-constexpr auto SDCARD_PIN_CS = GPIO_NUM_5;
-
-using tt::hal::sdcard::SpiSdCardDevice;
-
-std::shared_ptr<SdCardDevice> createSdCard() {
-    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
-        SDCARD_PIN_CS,
-        GPIO_NUM_NC,
-        GPIO_NUM_NC,
-        GPIO_NUM_NC,
-        SdCardDevice::MountBehaviour::AtBoot,
-        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
-        std::vector<gpio_num_t>(),
-        SDCARD_SPI_HOST
-    );
-
-    return std::make_shared<SpiSdCardDevice>(
-        std::move(configuration)
-    );
-}
-

Boards/CYD-JC2432W328C/Source/hal/YellowDisplay.cpp

@@ -1,8 +1,9 @@
-#include "Display.h"
+#include "YellowDisplay.h"
+#include "Cst816Touch.h"
+#include "YellowDisplayConstants.h"
 
-#include <Cst816Touch.h>
-#include <PwmBacklight.h>
 #include <St7789Display.h>
+#include <PwmBacklight.h>
 
 static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
     auto configuration = std::make_unique<Cst816sTouch::Configuration>(
@@ -33,6 +34,5 @@ std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
 
     configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
 
-    auto display = std::make_shared<St7789Display>(std::move(configuration));
-    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
+    return std::make_shared<St7789Display>(std::move(configuration));
 }

Boards/CYD-JC2432W328C/Source/hal/YellowDisplay.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include "Tactility/hal/display/DisplayDevice.h"
+#include <memory>
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/CYD-JC2432W328C/Source/hal/YellowDisplayConstants.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#include "Tactility/hal/display/DisplayDevice.h"
-#include <memory>
-
 // Display backlight (PWM)
 #define JC2432W328C_LCD_PIN_BACKLIGHT GPIO_NUM_27
 
@@ -15,4 +12,3 @@
 #define JC2432W328C_LCD_PIN_CS GPIO_NUM_15
 #define JC2432W328C_LCD_PIN_DC GPIO_NUM_2
 
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/CYD-JC2432W328C/Source/hal/YellowSdCard.cpp

@@ -0,0 +1,31 @@
+#include "YellowSdCard.h"
+
+#define TAG "jc2432w328c_sdcard"
+
+#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
+#include <Tactility/lvgl/LvglSync.h>
+
+#define SDCARD_SPI_HOST SPI3_HOST
+#define SDCARD_PIN_CS GPIO_NUM_5
+
+using tt::hal::sdcard::SpiSdCardDevice;
+
+std::shared_ptr<SdCardDevice> createYellowSdCard() {
+    auto* configuration = new SpiSdCardDevice::Config(
+        SDCARD_PIN_CS,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        SdCardDevice::MountBehaviour::AtBoot,
+        std::make_shared<tt::Mutex>(),
+        std::vector<gpio_num_t>(),
+        SDCARD_SPI_HOST
+    );
+
+    auto* sdcard = (SdCardDevice*) new SpiSdCardDevice(
+        std::unique_ptr<SpiSdCardDevice::Config>(configuration)
+    );
+
+    return std::shared_ptr<SdCardDevice>(sdcard);
+}
+

Boards/CYD-JC2432W328C/Source/hal/YellowSdCard.h

@@ -4,5 +4,5 @@
 
 using tt::hal::sdcard::SdCardDevice;
 
-std::shared_ptr<SdCardDevice> createSdCard();
+std::shared_ptr<SdCardDevice> createYellowSdCard();
 

Boards/CYD-JC8048W550C/Source/JC8048W550C.cpp

@@ -1,24 +1,19 @@
 #include "JC8048W550C.h" // Don't remove, or we get a linker error ("undefined reference to `cyd_jc8048w550c_config'" - GCC bug?)
 #include "PwmBacklight.h"
-#include "devices/Display.h"
-#include "devices/SdCard.h"
+#include "hal/CydDisplay.h"
+#include "hal/CydSdCard.h"
 
 using namespace tt::hal;
 
-static bool initBoot() {
+bool initBoot() {
     return driver::pwmbacklight::init(GPIO_NUM_2);
 }
 
-static DeviceVector createDevices() {
-    return {
-        createDisplay(),
-        createSdCard()
-    };
-}
-
 const Configuration cyd_jc8048w550c_config = {
     .initBoot = initBoot,
-    .createDevices = createDevices,
+    .createDisplay = createDisplay,
+    .sdcard = createSdCard(),
+    .power = nullptr,
     .i2c = {
         //Touch
         i2c::Configuration {

Boards/CYD-JC8048W550C/Source/devices/SdCard.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/sdcard/SdCardDevice.h>
-
-using tt::hal::sdcard::SdCardDevice;
-
-std::shared_ptr<SdCardDevice> createSdCard();

Boards/CYD-JC8048W550C/Source/hal/CydDisplay.cpp

@@ -1,8 +1,9 @@
-#include "Display.h"
+#include "RgbDisplay.h"
+
+#include "CydDisplay.h"
 
-#include <Gt911Touch.h>
 #include <PwmBacklight.h>
-#include <RgbDisplay.h>
+#include <Gt911Touch.h>
 #include <Tactility/Log.h>
 
 std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() {

Boards/CYD-JC8048W550C/Source/hal/CydSdCard.cpp

@@ -1,4 +1,4 @@
-#include "SdCard.h"
+#include "CydSdCard.h"
 
 #include <Tactility/hal/sdcard/SpiSdCardDevice.h>
 #include <Tactility/lvgl/LvglSync.h>
@@ -12,7 +12,7 @@ std::shared_ptr<SdCardDevice> createSdCard() {
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         SdCardDevice::MountBehaviour::AtBoot,
-        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
+        std::make_shared<tt::Mutex>(),
         std::vector<gpio_num_t>(),
         SPI2_HOST
     );

Boards/ElecrowCrowpanelAdvance28/CMakeLists.txt

@@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
 idf_component_register(
     SRCS ${SOURCE_FILES}
     INCLUDE_DIRS "Source"
-    REQUIRES Tactility FT5x06 ST7789 PwmBacklight driver
+    REQUIRES Tactility esp_lvgl_port FT5x06 ST7789 PwmBacklight driver
 )

Boards/ElecrowCrowpanelAdvance28/Source/CrowPanelAdvance28.cpp

@@ -1,7 +1,8 @@
 #include "PwmBacklight.h"
 #include "Tactility/lvgl/LvglSync.h"
-#include "devices/Display.h"
-#include "devices/SdCard.h"
+#include "hal/CrowPanelDisplay.h"
+#include "hal/CrowPanelDisplayConstants.h"
+#include "hal/CrowPanelSdCard.h"
 
 #include <Tactility/hal/Configuration.h>
 
@@ -9,20 +10,14 @@
 
 using namespace tt::hal;
 
-static bool initBoot() {
+bool initBoot() {
     return driver::pwmbacklight::init(GPIO_NUM_38);
 }
 
-static DeviceVector createDevices() {
-    return {
-        createDisplay(),
-        createSdCard()
-    };
-}
-
 extern const Configuration crowpanel_advance_28 = {
     .initBoot = initBoot,
-    .createDevices = createDevices,
+    .createDisplay = createDisplay,
+    .sdcard = createSdCard(),
     .i2c = {
         // There is only 1 (internal for touch, and also serves as "I2C-OUT" port)
         // Note: You could repurpose 1 or more UART interfaces as I2C interfaces

Boards/ElecrowCrowpanelAdvance28/Source/hal/CrowPanelDisplay.cpp

@@ -1,17 +1,20 @@
-#include "Display.h"
+#include "CrowPanelDisplay.h"
+#include "CrowPanelDisplayConstants.h"
 
 #include <Ft5x06Touch.h>
 #include <PwmBacklight.h>
 #include <St7789Display.h>
 
+#define TAG "crowpanel_display"
+
 static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
     // Note for future changes: Reset pin is 48 and interrupt pin is 47
     auto configuration = std::make_unique<Ft5x06Touch::Configuration>(
         I2C_NUM_0,
         240,
         320,
-        false,
-        false,
+        true,
+        true,
         false
     );
 
@@ -25,17 +28,16 @@ std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
         CROWPANEL_LCD_SPI_HOST,
         CROWPANEL_LCD_PIN_CS,
         CROWPANEL_LCD_PIN_DC,
-        240,
         320,
+        240,
         touch,
-        false,
-        false,
+        true,
+        true,
         false,
         true
     );
 
     configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
 
-    auto display = std::make_shared<St7789Display>(std::move(configuration));
-    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
+    return std::make_shared<St7789Display>(std::move(configuration));
 }

Boards/ElecrowCrowpanelAdvance28/Source/hal/CrowPanelDisplay.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#include "Tactility/hal/display/DisplayDevice.h"
+#include <esp_lcd_types.h>
+#include <lvgl.h>
+
+class CrowPanelDisplay : public tt::hal::display::DisplayDevice {
+
+private:
+
+    esp_lcd_panel_io_handle_t ioHandle = nullptr;
+    esp_lcd_panel_handle_t panelHandle = nullptr;
+    lv_display_t* displayHandle = nullptr;
+    bool poweredOn = false;
+
+public:
+
+    std::string getName() const final { return "ST7789"; }
+    std::string getDescription() const final { return "SPI display"; }
+
+    bool start() override;
+
+    bool stop() override;
+
+    void setPowerOn(bool turnOn) override;
+    bool isPoweredOn() const override { return poweredOn; };
+    bool supportsPowerControl() const override { return true; }
+
+    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() override;
+
+    void setBacklightDuty(uint8_t backlightDuty) override;
+    bool supportsBacklightDuty() const override { return true; }
+
+    void setGammaCurve(uint8_t index) override;
+    uint8_t getGammaCurveCount() const override { return 4; };
+
+    lv_display_t* _Nullable getLvglDisplay() const override { return displayHandle; }
+};
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/ElecrowCrowpanelAdvance28/Source/hal/CrowPanelDisplayConstants.h

@@ -1,12 +1,8 @@
 #pragma once
 
-#include <Tactility/hal/display/DisplayDevice.h>
-
 #define CROWPANEL_LCD_SPI_HOST SPI2_HOST
 #define CROWPANEL_LCD_PIN_CS GPIO_NUM_40
 #define CROWPANEL_LCD_PIN_DC GPIO_NUM_41 // RS
 #define CROWPANEL_LCD_HORIZONTAL_RESOLUTION 320
 #define CROWPANEL_LCD_VERTICAL_RESOLUTION 240
 #define CROWPANEL_LCD_SPI_TRANSFER_HEIGHT (CROWPANEL_LCD_VERTICAL_RESOLUTION / 10)
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/ElecrowCrowpanelAdvance28/Source/hal/CrowPanelSdCard.cpp

@@ -1,25 +1,29 @@
-#include "SdCard.h"
+#include "CrowPanelSdCard.h"
 
 #include <Tactility/lvgl/LvglSync.h>
 #include <Tactility/hal/sdcard/SpiSdCardDevice.h>
 
+#include <esp_vfs_fat.h>
+
 using tt::hal::sdcard::SpiSdCardDevice;
 
-constexpr auto CROWPANEL_SDCARD_PIN_CS = GPIO_NUM_7;
+#define CROWPANEL_SDCARD_PIN_CS GPIO_NUM_7
 
 std::shared_ptr<SdCardDevice> createSdCard() {
-    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
+    auto* configuration = new SpiSdCardDevice::Config(
         CROWPANEL_SDCARD_PIN_CS,
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         SdCardDevice::MountBehaviour::AtBoot,
         tt::lvgl::getSyncLock(),
-        std::vector<gpio_num_t>(),
+        {},
         SPI3_HOST
     );
 
-    return std::make_shared<SpiSdCardDevice>(
-        std::move(configuration)
+    auto* sdcard = (SdCardDevice*) new SpiSdCardDevice(
+        std::unique_ptr<SpiSdCardDevice::Config>(configuration)
     );
+
+    return std::shared_ptr<SdCardDevice>(sdcard);
 }

Boards/ElecrowCrowpanelAdvance35/Source/CrowPanelAdvance35.cpp

@@ -1,7 +1,8 @@
 #include "PwmBacklight.h"
 #include "Tactility/lvgl/LvglSync.h"
-#include "devices/Display.h"
-#include "devices/SdCard.h"
+#include "hal/CrowPanelDisplay.h"
+#include "hal/CrowPanelDisplayConstants.h"
+#include "hal/CrowPanelSdCard.h"
 
 #include <Tactility/hal/Configuration.h>
 
@@ -9,20 +10,14 @@
 
 using namespace tt::hal;
 
-static bool initBoot() {
+bool initBoot() {
     return driver::pwmbacklight::init(GPIO_NUM_38);
 }
 
-static DeviceVector createDevices() {
-    return {
-        createDisplay(),
-        createSdCard()
-    };
-}
-
 extern const Configuration crowpanel_advance_35 = {
     .initBoot = initBoot,
-    .createDevices = createDevices,
+    .createDisplay = createDisplay,
+    .sdcard = createSdCard(),
     .i2c = {
         // There is only 1 (internal for touch, and also serves as "I2C-OUT" port)
         // Note: You could repurpose 1 or more UART interfaces as I2C interfaces

Boards/ElecrowCrowpanelAdvance35/Source/hal/CrowPanelDisplay.cpp

@@ -1,9 +1,12 @@
-#include "Display.h"
+#include "CrowPanelDisplay.h"
+#include "CrowPanelDisplayConstants.h"
 
 #include <Gt911Touch.h>
 #include <PwmBacklight.h>
 #include <Ili9488Display.h>
 
+#define TAG "crowpanel_display"
+
 static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
     // Note for future changes: Reset pin is 48 and interrupt pin is 47
     auto configuration = std::make_unique<Gt911Touch::Configuration>(
@@ -33,6 +36,5 @@ std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
 
     configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
 
-    auto display = std::make_shared<Ili9488Display>(std::move(configuration));
-    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
+    return std::make_shared<Ili9488Display>(std::move(configuration));
 }

Boards/ElecrowCrowpanelAdvance35/Source/hal/CrowPanelDisplay.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#include "Tactility/hal/display/DisplayDevice.h"
+#include <esp_lcd_types.h>
+#include <lvgl.h>
+
+class CrowPanelDisplay : public tt::hal::display::DisplayDevice {
+
+private:
+
+    esp_lcd_panel_io_handle_t ioHandle = nullptr;
+    esp_lcd_panel_handle_t panelHandle = nullptr;
+    lv_display_t* displayHandle = nullptr;
+    bool poweredOn = false;
+
+public:
+
+    std::string getName() const final { return "ST7789"; }
+    std::string getDescription() const final { return "SPI display"; }
+
+    bool start() override;
+
+    bool stop() override;
+
+    void setPowerOn(bool turnOn) override;
+    bool isPoweredOn() const override { return poweredOn; };
+    bool supportsPowerControl() const override { return true; }
+
+    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() override;
+
+    void setBacklightDuty(uint8_t backlightDuty) override;
+    bool supportsBacklightDuty() const override { return true; }
+
+    void setGammaCurve(uint8_t index) override;
+    uint8_t getGammaCurveCount() const override { return 4; };
+
+    lv_display_t* _Nullable getLvglDisplay() const override { return displayHandle; }
+};
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/ElecrowCrowpanelAdvance35/Source/hal/CrowPanelDisplayConstants.h

@@ -1,12 +1,8 @@
 #pragma once
 
-#include <Tactility/hal/display/DisplayDevice.h>
-
 #define CROWPANEL_LCD_SPI_HOST SPI2_HOST
 #define CROWPANEL_LCD_PIN_CS GPIO_NUM_40
 #define CROWPANEL_LCD_PIN_DC GPIO_NUM_41 // RS
 #define CROWPANEL_LCD_HORIZONTAL_RESOLUTION 320
 #define CROWPANEL_LCD_VERTICAL_RESOLUTION 480
 #define CROWPANEL_LCD_SPI_TRANSFER_HEIGHT (CROWPANEL_LCD_VERTICAL_RESOLUTION / 10)
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/ElecrowCrowpanelAdvance35/Source/hal/CrowPanelSdCard.cpp

@@ -1,25 +1,29 @@
-#include "SdCard.h"
+#include "CrowPanelSdCard.h"
 
 #include <Tactility/lvgl/LvglSync.h>
 #include <Tactility/hal/sdcard/SpiSdCardDevice.h>
 
+#include <esp_vfs_fat.h>
+
 using tt::hal::sdcard::SpiSdCardDevice;
 
-constexpr auto CROWPANEL_SDCARD_PIN_CS = GPIO_NUM_7;
+#define CROWPANEL_SDCARD_PIN_CS GPIO_NUM_7
 
 std::shared_ptr<SdCardDevice> createSdCard() {
-    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
+    auto* configuration = new SpiSdCardDevice::Config(
         CROWPANEL_SDCARD_PIN_CS,
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         SdCardDevice::MountBehaviour::AtBoot,
         tt::lvgl::getSyncLock(),
-        std::vector<gpio_num_t>(),
+        {},
         SPI3_HOST
     );
 
-    return std::make_shared<SpiSdCardDevice>(
-        std::move(configuration)
+    auto* sdcard = (SdCardDevice*) new SpiSdCardDevice(
+        std::unique_ptr<SpiSdCardDevice::Config>(configuration)
     );
+
+    return std::shared_ptr<SdCardDevice>(sdcard);
 }

Boards/ElecrowCrowpanelAdvance50/Source/CrowPanelAdvance50.cpp

@@ -1,12 +1,12 @@
-#include "devices/Display.h"
-#include "devices/SdCard.h"
+#include "hal/CrowPanelDisplay.h"
+#include "hal/CrowPanelSdCard.h"
 
 #include <Tactility/hal/Configuration.h>
 #include <TCA9534.h>
 
 using namespace tt::hal;
 
-static bool initBoot() {
+bool initBoot() {
     TCA9534_IO_EXP io_expander = {
         .I2C_ADDR = 0x18,
         .i2c_master_port = I2C_NUM_0,
@@ -21,16 +21,10 @@ static bool initBoot() {
     return true;
 }
 
-static DeviceVector createDevices() {
-    return {
-        createDisplay(),
-        createSdCard()
-    };
-}
-
 extern const Configuration crowpanel_advance_50 = {
     .initBoot = initBoot,
-    .createDevices = createDevices,
+    .createDisplay = createDisplay,
+    .sdcard = createSdCard(),
     .i2c = {
         // There is only 1 (internal for touch, and also serves as "I2C-OUT" port)
         // Note: You could repurpose 1 or more UART interfaces as I2C interfaces

Boards/ElecrowCrowpanelAdvance50/Source/devices/Display.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/display/DisplayDevice.h>
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/ElecrowCrowpanelAdvance50/Source/devices/SdCard.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/sdcard/SdCardDevice.h>
-
-using tt::hal::sdcard::SdCardDevice;
-
-std::shared_ptr<SdCardDevice> createSdCard();

Boards/ElecrowCrowpanelAdvance50/Source/hal/CrowPanelDisplay.cpp

@@ -1,4 +1,4 @@
-#include "Display.h"
+#include "CrowPanelDisplay.h"
 
 #include <Gt911Touch.h>
 #include <RgbDisplay.h>

Boards/ElecrowCrowpanelAdvance50/Source/hal/CrowPanelDisplay.h

@@ -2,4 +2,4 @@
 
 #include "Tactility/hal/display/DisplayDevice.h"
 
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/ElecrowCrowpanelAdvance50/Source/hal/CrowPanelSdCard.cpp

@@ -1,12 +1,14 @@
-#include "SdCard.h"
+#include "CrowPanelSdCard.h"
 
 #include <Tactility/hal/sdcard/SpiSdCardDevice.h>
 #include <Tactility/lvgl/LvglSync.h>
 
+#include <esp_vfs_fat.h>
+
 using tt::hal::sdcard::SpiSdCardDevice;
 
 std::shared_ptr<SdCardDevice> createSdCard() {
-    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
+    auto* configuration = new SpiSdCardDevice::Config(
         // See https://github.com/Elecrow-RD/CrowPanel-Advance-HMI-ESP32-AI-Display/blob/master/5.0/factory_code/factory_code.ino
         GPIO_NUM_0, // It's actually not connected, but in the demo pin 0 is used
         GPIO_NUM_NC,
@@ -15,7 +17,9 @@ std::shared_ptr<SdCardDevice> createSdCard() {
         SdCardDevice::MountBehaviour::AtBoot
     );
 
-    return std::make_shared<SpiSdCardDevice>(
-        std::move(configuration)
+    auto* sdcard = (SdCardDevice*) new SpiSdCardDevice(
+        std::unique_ptr<SpiSdCardDevice::Config>(configuration)
     );
+
+    return std::shared_ptr<SdCardDevice>(sdcard);
 }

Boards/ElecrowCrowpanelBasic28/Source/CrowPanelBasic28.cpp

@@ -1,30 +1,25 @@
 #include "PwmBacklight.h"
-#include "devices/Display.h"
-#include "devices/SdCard.h"
+#include "Tactility/lvgl/LvglSync.h"
+#include "hal/CrowPanelDisplay.h"
+#include "hal/CrowPanelDisplayConstants.h"
+#include "hal/CrowPanelSdCard.h"
 
 #include <Xpt2046Power.h>
 #include <Tactility/hal/Configuration.h>
-#include <Tactility/lvgl/LvglSync.h>
 
 #define CROWPANEL_SPI_TRANSFER_SIZE_LIMIT (CROWPANEL_LCD_HORIZONTAL_RESOLUTION * CROWPANEL_LCD_SPI_TRANSFER_HEIGHT * (LV_COLOR_DEPTH / 8))
 
 using namespace tt::hal;
 
-static bool initBoot() {
+bool initBoot() {
     return driver::pwmbacklight::init(GPIO_NUM_27);
 }
 
-static DeviceVector createDevices() {
-    return {
-        std::make_shared<Xpt2046Power>(),
-        createDisplay(),
-        createSdCard(),
-    };
-}
-
 extern const Configuration crowpanel_basic_28 = {
     .initBoot = initBoot,
-    .createDevices = createDevices,
+    .createDisplay = createDisplay,
+    .sdcard = createSdCard(),
+    .power = getOrCreatePower,
     .i2c = {
         // There is only 1 (internal for touch, and also serves as "I2C-OUT" port)
         // Note: You could repurpose 1 or more UART interfaces as I2C interfaces

Boards/ElecrowCrowpanelBasic28/Source/hal/CrowPanelDisplay.cpp

@@ -1,4 +1,5 @@
-#include "Display.h"
+#include "CrowPanelDisplay.h"
+#include "CrowPanelDisplayConstants.h"
 
 #include <Ili934xDisplay.h>
 #include <Xpt2046Touch.h>
@@ -34,6 +35,5 @@ std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
     configuration->mirrorX = true;
     configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
 
-    auto display = std::make_shared<Ili934xDisplay>(std::move(configuration));
-    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
+    return std::make_shared<Ili934xDisplay>(std::move(configuration));
 }

Boards/ElecrowCrowpanelBasic28/Source/hal/CrowPanelDisplay.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#include "Tactility/hal/display/DisplayDevice.h"
+#include <esp_lcd_types.h>
+#include <lvgl.h>
+
+class CrowPanelDisplay : public tt::hal::display::DisplayDevice {
+
+private:
+
+    esp_lcd_panel_io_handle_t ioHandle = nullptr;
+    esp_lcd_panel_handle_t panelHandle = nullptr;
+    lv_display_t* displayHandle = nullptr;
+    bool poweredOn = false;
+
+public:
+
+    std::string getName() const final { return "ST7789"; }
+    std::string getDescription() const final { return "SPI display"; }
+
+    bool start() override;
+
+    bool stop() override;
+
+    void setPowerOn(bool turnOn) override;
+    bool isPoweredOn() const override { return poweredOn; };
+    bool supportsPowerControl() const override { return true; }
+
+    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() override;
+
+    void setBacklightDuty(uint8_t backlightDuty) override;
+    bool supportsBacklightDuty() const override { return true; }
+
+    void setGammaCurve(uint8_t index) override;
+    uint8_t getGammaCurveCount() const override { return 4; };
+
+    lv_display_t* _Nullable getLvglDisplay() const override { return displayHandle; }
+};
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/ElecrowCrowpanelBasic28/Source/hal/CrowPanelDisplayConstants.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <Tactility/hal/display/DisplayDevice.h>
-
 #define CROWPANEL_LCD_SPI_HOST SPI2_HOST
 #define CROWPANEL_LCD_PIN_CS GPIO_NUM_15
 #define CROWPANEL_TOUCH_PIN_CS GPIO_NUM_33
@@ -9,5 +7,3 @@
 #define CROWPANEL_LCD_HORIZONTAL_RESOLUTION 320
 #define CROWPANEL_LCD_VERTICAL_RESOLUTION 240
 #define CROWPANEL_LCD_SPI_TRANSFER_HEIGHT (CROWPANEL_LCD_VERTICAL_RESOLUTION / 10)
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/ElecrowCrowpanelBasic28/Source/hal/CrowPanelSdCard.cpp

@@ -1,23 +1,27 @@
-#include "SdCard.h"
+#include "CrowPanelSdCard.h"
 
 #include <Tactility/lvgl/LvglSync.h>
 #include <Tactility/hal/sdcard/SpiSdCardDevice.h>
 
+#include <esp_vfs_fat.h>
+
 using tt::hal::sdcard::SpiSdCardDevice;
 
 std::shared_ptr<SdCardDevice> createSdCard() {
-    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
+    auto* configuration = new SpiSdCardDevice::Config(
         GPIO_NUM_5,
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         SdCardDevice::MountBehaviour::AtBoot,
         tt::lvgl::getSyncLock(),
-        std::vector<gpio_num_t>(),
+        {},
         SPI3_HOST
     );
 
-    return std::make_shared<SpiSdCardDevice>(
-        std::move(configuration)
+    auto* sdcard = (SdCardDevice*) new SpiSdCardDevice(
+        std::unique_ptr<SpiSdCardDevice::Config>(configuration)
     );
+
+    return std::shared_ptr<SdCardDevice>(sdcard);
 }

Boards/ElecrowCrowpanelBasic35/Source/CrowPanelBasic35.cpp

@@ -1,30 +1,25 @@
 #include "PwmBacklight.h"
 #include "Tactility/lvgl/LvglSync.h"
-#include "devices/Display.h"
-#include "devices/SdCard.h"
+#include "hal/CrowPanelDisplay.h"
+#include "hal/CrowPanelDisplayConstants.h"
+#include "hal/CrowPanelSdCard.h"
 
 #include <Xpt2046Power.h>
 #include <Tactility/hal/Configuration.h>
 
-constexpr auto CROWPANEL_SPI_TRANSFER_SIZE_LIMIT = (CROWPANEL_LCD_HORIZONTAL_RESOLUTION * CROWPANEL_LCD_SPI_TRANSFER_HEIGHT * (LV_COLOR_DEPTH / 8));
+#define CROWPANEL_SPI_TRANSFER_SIZE_LIMIT (CROWPANEL_LCD_HORIZONTAL_RESOLUTION * CROWPANEL_LCD_SPI_TRANSFER_HEIGHT * (LV_COLOR_DEPTH / 8))
 
 using namespace tt::hal;
 
-static bool initBoot() {
+bool initBoot() {
     return driver::pwmbacklight::init(GPIO_NUM_27);
 }
 
-static DeviceVector createDevices() {
-    return {
-        std::make_shared<Xpt2046Power>(),
-        createDisplay(),
-        createSdCard(),
-    };
-}
-
 extern const Configuration crowpanel_basic_35 = {
     .initBoot = initBoot,
-    .createDevices = createDevices,
+    .createDisplay = createDisplay,
+    .sdcard = createSdCard(),
+    .power = getOrCreatePower,
     .i2c = {
         // There is only 1 (internal for touch, and also serves as "I2C-OUT" port)
         // Note: You could repurpose 1 or more UART interfaces as I2C interfaces

Boards/ElecrowCrowpanelBasic35/Source/hal/CrowPanelDisplay.cpp

@@ -1,17 +1,19 @@
-#include "Display.h"
+#include "CrowPanelDisplay.h"
+#include "CrowPanelDisplayConstants.h"
 
 #include <Ili9488Display.h>
-#include <PwmBacklight.h>
 #include <Xpt2046Touch.h>
 
+#include <PwmBacklight.h>
+
 std::shared_ptr<Xpt2046Touch> createTouch() {
     auto configuration = std::make_unique<Xpt2046Touch::Configuration>(
         CROWPANEL_LCD_SPI_HOST,
         CROWPANEL_TOUCH_PIN_CS,
         320,
         480,
-        false,
-        false,
+        true,
+        true,
         true
     );
 
@@ -21,20 +23,24 @@ std::shared_ptr<Xpt2046Touch> createTouch() {
 std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
     auto touch = createTouch();
 
+    /**
+     * This display is mirrored on X, but that doesn't seem to work with the driver.
+     * Instead, we swap XY, which does work. That results in a landscape image.
+     */
     auto configuration = std::make_unique<Ili9488Display::Configuration>(
         CROWPANEL_LCD_SPI_HOST,
         CROWPANEL_LCD_PIN_CS,
         CROWPANEL_LCD_PIN_DC,
-        320,
         480,
+        320,
         touch,
-        false,
+        true,
         false,
         false
     );
 
+    configuration->mirrorX = true;
     configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
 
-    auto display = std::make_shared<Ili9488Display>(std::move(configuration));
-    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
+    return std::make_shared<Ili9488Display>(std::move(configuration));
 }

Boards/ElecrowCrowpanelBasic35/Source/hal/CrowPanelDisplay.h

@@ -0,0 +1,40 @@
+#pragma once
+
+#include "Tactility/hal/display/DisplayDevice.h"
+#include <esp_lcd_types.h>
+#include <lvgl.h>
+
+class CrowPanelDisplay : public tt::hal::display::DisplayDevice {
+
+private:
+
+    esp_lcd_panel_io_handle_t ioHandle = nullptr;
+    esp_lcd_panel_handle_t panelHandle = nullptr;
+    lv_display_t* displayHandle = nullptr;
+    bool poweredOn = false;
+
+public:
+
+    std::string getName() const final { return "ST7789"; }
+    std::string getDescription() const final { return "SPI display"; }
+
+    bool start() override;
+
+    bool stop() override;
+
+    void setPowerOn(bool turnOn) override;
+    bool isPoweredOn() const override { return poweredOn; };
+    bool supportsPowerControl() const override { return true; }
+
+    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() override;
+
+    void setBacklightDuty(uint8_t backlightDuty) override;
+    bool supportsBacklightDuty() const override { return true; }
+
+    void setGammaCurve(uint8_t index) override;
+    uint8_t getGammaCurveCount() const override { return 4; };
+
+    lv_display_t* _Nullable getLvglDisplay() const override { return displayHandle; }
+};
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/ElecrowCrowpanelBasic35/Source/hal/CrowPanelDisplayConstants.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <Tactility/hal/display/DisplayDevice.h>
-
 #define CROWPANEL_LCD_SPI_HOST SPI2_HOST
 #define CROWPANEL_LCD_PIN_CS GPIO_NUM_15
 #define CROWPANEL_TOUCH_PIN_CS GPIO_NUM_12
@@ -9,5 +7,3 @@
 #define CROWPANEL_LCD_HORIZONTAL_RESOLUTION 320
 #define CROWPANEL_LCD_VERTICAL_RESOLUTION 240
 #define CROWPANEL_LCD_SPI_TRANSFER_HEIGHT (CROWPANEL_LCD_VERTICAL_RESOLUTION / 10)
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/ElecrowCrowpanelBasic35/Source/hal/CrowPanelSdCard.cpp

@@ -1,23 +1,27 @@
-#include "SdCard.h"
+#include "CrowPanelSdCard.h"
 
 #include <Tactility/lvgl/LvglSync.h>
 #include <Tactility/hal/sdcard/SpiSdCardDevice.h>
 
+#include <esp_vfs_fat.h>
+
 using tt::hal::sdcard::SpiSdCardDevice;
 
 std::shared_ptr<SdCardDevice> createSdCard() {
-    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
+    auto* configuration = new SpiSdCardDevice::Config(
         GPIO_NUM_5,
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         GPIO_NUM_NC,
         SdCardDevice::MountBehaviour::AtBoot,
         tt::lvgl::getSyncLock(),
-        std::vector<gpio_num_t>(),
+        {},
         SPI3_HOST
     );
 
-    return std::make_shared<SpiSdCardDevice>(
-        std::move(configuration)
+    auto* sdcard = (SdCardDevice*) new SpiSdCardDevice(
+        std::unique_ptr<SpiSdCardDevice::Config>(configuration)
     );
+
+    return std::shared_ptr<SdCardDevice>(sdcard);
 }

Boards/ElecrowCrowpanelBasic50/Source/CrowPanelBasic50.cpp

@@ -1,26 +1,19 @@
-#include "devices/Display.h"
-#include "devices/SdCard.h"
+#include "hal/CrowPanelDisplay.h"
+#include "hal/CrowPanelSdCard.h"
 
 #include <PwmBacklight.h>
 #include <Tactility/hal/Configuration.h>
 
 using namespace tt::hal;
 
-static bool initBoot() {
-    // Note: I tried 100 Hz to 100 kHz and couldn't get the flickering to stop
+bool initBoot() {
     return driver::pwmbacklight::init(GPIO_NUM_2);
 }
 
-static DeviceVector createDevices() {
-    return {
-        createDisplay(),
-        createSdCard(),
-    };
-}
-
 extern const Configuration crowpanel_basic_50 = {
     .initBoot = initBoot,
-    .createDevices = createDevices,
+    .createDisplay = createDisplay,
+    .sdcard = createSdCard(),
     .i2c = {
         // There is only 1 (internal for touch, and also serves as "I2C-OUT" port)
         // Note: You could repurpose 1 or more UART interfaces as I2C interfaces

Boards/ElecrowCrowpanelBasic50/Source/devices/SdCard.h

@@ -1,7 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/sdcard/SdCardDevice.h>
-
-using tt::hal::sdcard::SdCardDevice;
-
-std::shared_ptr<SdCardDevice> createSdCard();

Boards/ElecrowCrowpanelBasic50/Source/hal/CrowPanelDisplay.cpp

@@ -1,4 +1,4 @@
-#include "Display.h"
+#include "CrowPanelDisplay.h"
 
 #include <Gt911Touch.h>
 #include <PwmBacklight.h>
@@ -101,6 +101,5 @@ std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
         driver::pwmbacklight::setBacklightDuty
     );
 
-    auto display = std::make_shared<RgbDisplay>(std::move(configuration));
-    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
+    return std::make_shared<RgbDisplay>(std::move(configuration));
 }

Boards/ElecrowCrowpanelBasic50/Source/hal/CrowPanelDisplay.h

@@ -2,4 +2,4 @@
 
 #include "Tactility/hal/display/DisplayDevice.h"
 
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/ElecrowCrowpanelBasic50/Source/hal/CrowPanelSdCard.cpp

@@ -0,0 +1,24 @@
+#include "CrowPanelSdCard.h"
+
+#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
+#include <Tactility/lvgl/LvglSync.h>
+
+#include <esp_vfs_fat.h>
+
+using tt::hal::sdcard::SpiSdCardDevice;
+
+std::shared_ptr<SdCardDevice> createSdCard() {
+    auto* configuration = new SpiSdCardDevice::Config(
+        GPIO_NUM_10,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        SdCardDevice::MountBehaviour::AtBoot
+    );
+
+    auto* sdcard = (SdCardDevice*) new SpiSdCardDevice(
+        std::unique_ptr<SpiSdCardDevice::Config>(configuration)
+    );
+
+    return std::shared_ptr<SdCardDevice>(sdcard);
+}