Update version to 0.6.0 (#400 )

Align board project names with board ids (#399 )
To avoid keeping track of a list that maps board project names to board ids. Because of this change, we don't have to manually edit `boards.cmake` anymore when adding a new board.
2025-10-29 19:25:59 +01:00 · 2025-10-28 09:07:54 +01:00 · 2025-10-28 00:39:31 +01:00 · 2025-10-27 19:59:53 +01:00 · 2025-10-26 23:26:28 +01:00 · 2025-10-26 13:50:17 +01:00
729 changed files with 15625 additions and 9086 deletions
@@ -36,14 +36,16 @@ runs:
        WLR_LIBINPUT_NO_DEVICES: 1
        WAYLAND_DISPLAY: wayland-1
        GTK_USE_PORTAL: 0
-    - name: "Configure Project"
-      uses: threeal/cmake-action@v1.3.0
+    - name: Setup cmake
+      uses: jwlawson/actions-setup-cmake@v2
+      with:
+        cmake-version: '3.31.x'
    - name: "Prepare Project"
      shell: bash
      run: cmake -S ./ -B buildsim
    - name: "Build Tests"
      shell: bash
-      run: cmake --build buildsim --target AppSim
+      run: cmake --build buildsim --target FirmwareSim
    - name: 'Release'
      shell: bash
      run: Buildscripts/release-simulator.sh buildsim release/Simulator-${{ inputs.os_name }}-${{ inputs.platform_name }}
@@ -9,183 +9,46 @@ on:
 permissions: read-all

 jobs:
-  cyd-2432s024c:
+  build:
+    strategy:
+      matrix:
+        board: [
+          { id: cyd-2432s024c, arch: esp32 },
+          { id: cyd-2432s028r, arch: esp32 },
+          { id: cyd-2432s028rv3, arch: esp32 },
+          { id: cyd-e32r28t, arch: esp32 },
+          { id: cyd-e32r32p, arch: esp32 },
+          { id: cyd-2432s032c, arch: esp32 },
+          { id: cyd-jc2432w328c, arch: esp32 },
+          { id: cyd-8048s043c, arch: esp32s3 },
+          { id: cyd-jc8048w550c, arch: esp32s3 },
+          { id: cyd-4848s040c, arch: esp32s3 },
+          { id: elecrow-crowpanel-advance-28, arch: esp32s3 },
+          { id: elecrow-crowpanel-advance-35, arch: esp32s3 },
+          { id: elecrow-crowpanel-advance-50, arch: esp32s3 },
+          { id: elecrow-crowpanel-basic-28, arch: esp32 },
+          { id: elecrow-crowpanel-basic-35, arch: esp32 },
+          { id: elecrow-crowpanel-basic-50, arch: esp32s3 },
+          { id: lilygo-tdeck, arch: esp32s3 },
+          { id: lilygo-tdongle-s3, arch: esp32s3 },
+          { id: lilygo-tlora-pager, arch: esp32s3 },
+          { id: m5stack-cardputer, arch: esp32s3 },
+          { id: m5stack-cardputer-adv, arch: esp32s3 },
+          { id: m5stack-core2, arch: esp32 },
+          { id: m5stack-cores3, arch: esp32s3 },
+          { id: m5stack-stickc-plus, arch: esp32 },
+          { id: m5stack-stickc-plus2, arch: esp32 },
+          { id: unphone, arch: esp32s3 },
+          { id: waveshare-s3-touch-lcd-43, arch: esp32s3 },
+          { id: waveshare-s3-touch-lcd-147, arch: esp32s3 },
+          { id: waveshare-s3-touch-lcd-128, arch: esp32s3 },
+          { id: waveshare-s3-lcd-13, arch: esp32s3 }
+        ]
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
      - name: "Build"
        uses: ./.github/actions/build-firmware
        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:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: cyd-2432s032c
-          arch: esp32
-  cyd-jc2432w328c:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: cyd-jc2432w328c
-          arch: esp32
-  cyd-8048s043c:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: cyd-8048s043c
-          arch: esp32s3
-  cyd-jc8048w550c:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: cyd-jc8048w550c
-          arch: esp32s3
-  cyd-4848s040c:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: cyd-4848s040c
-          arch: esp32s3
-  elecrow-crowpanel-advance-28:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: elecrow-crowpanel-advance-28
-          arch: esp32s3
-  elecrow-crowpanel-advance-35:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: elecrow-crowpanel-advance-35
-          arch: esp32s3
-  elecrow-crowpanel-advance-50:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: elecrow-crowpanel-advance-50
-          arch: esp32s3
-  elecrow-crowpanel-basic-28:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: elecrow-crowpanel-basic-28
-          arch: esp32
-  elecrow-crowpanel-basic-35:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: elecrow-crowpanel-basic-35
-          arch: esp32
-  elecrow-crowpanel-basic-50:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: elecrow-crowpanel-basic-50
-          arch: esp32s3
-  lilygo-tdeck:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        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-core2:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: m5stack-core2
-          arch: esp32
-  m5stack-cores3:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: m5stack-cores3
-          arch: esp32s3
-  unphone:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: unphone
-          arch: esp32s3
-  waveshare-s3-touch-43:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-firmware
-        with:
-          board_id: waveshare-s3-touch-43
-          arch: esp32s3
+          board_id: ${{ matrix.board.id }}
+          arch: ${{ matrix.board.arch }}
@@ -9,21 +9,18 @@ on:
 permissions: read-all

 jobs:
-  esp32:
+  build:
+    strategy:
+      matrix:
+        board: [
+          { id: cyd-2432s028r, arch: esp32 },
+          { id: lilygo-tdeck, arch: esp32s3 },
+        ]
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
      - name: "Build"
        uses: ./.github/actions/build-sdk
        with:
-          board_id: cyd-2432s024c
-          arch: esp32
-  esp32s3:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-sdk
-        with:
-          board_id: lilygo-tdeck
-          arch: esp32s3
+          board_id: ${{ matrix.board.id }}
+          arch: ${{ matrix.board.arch }}
@@ -7,7 +7,7 @@ on:
  pull_request:
    types: [ opened, synchronize, reopened ]
 jobs:
-  Build-Simulator-Linux:
+  Linux:
    runs-on: ubuntu-24.04
    steps:
      - uses: actions/checkout@v4
@@ -17,7 +17,7 @@ jobs:
          os_name: linux
          platform_name: amd64
          publish: true
-  Build-Simulator-macOS:
+  macOS:
    runs-on: macos-latest
    steps:
      - uses: actions/checkout@v4
@@ -6,7 +6,7 @@ on:
  pull_request:
    types: [opened, synchronize, reopened]
 jobs:
-  Run:
+  run:
    runs-on: ubuntu-latest
    steps:
      - name: "Checkout repo"
@@ -10,3 +10,9 @@
 [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
+[submodule "Libraries/cJSON/cJSON"]
+	path = Libraries/cJSON/cJSON
+	url = https://github.com/DaveGamble/cJSON.git
@@ -1,80 +0,0 @@
-#pragma once
-#include <Tactility/hal/Configuration.h>
-
-#ifdef ESP_PLATFORM
-#include <sdkconfig.h>
-
-// Supported hardware:
-#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
-#elif (defined(CONFIG_TT_BOARD_ELECROW_CROWPANEL_ADVANCE_28))
-#define TT_BOARD_HARDWARE &crowpanel_advance_28
-#include "CrowPanelAdvance28.h"
-#elif (defined(CONFIG_TT_BOARD_ELECROW_CROWPANEL_ADVANCE_35))
-#define TT_BOARD_HARDWARE &crowpanel_advance_35
-#include "CrowPanelAdvance35.h"
-#elif (defined(CONFIG_TT_BOARD_ELECROW_CROWPANEL_ADVANCE_50))
-#define TT_BOARD_HARDWARE &crowpanel_advance_50
-#include "CrowPanelAdvance50.h"
-#elif (defined(CONFIG_TT_BOARD_ELECROW_CROWPANEL_BASIC_28))
-#define TT_BOARD_HARDWARE &crowpanel_basic_28
-#include "CrowPanelBasic28.h"
-#elif (defined(CONFIG_TT_BOARD_ELECROW_CROWPANEL_BASIC_35))
-#define TT_BOARD_HARDWARE &crowpanel_basic_35
-#include "CrowPanelBasic35.h"
-#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_CORE2)
-#include "M5stackCore2.h"
-#define TT_BOARD_HARDWARE &m5stack_core2
-#elif defined(CONFIG_TT_BOARD_M5STACK_CORES3)
-#include "M5stackCoreS3.h"
-#define TT_BOARD_HARDWARE &m5stack_cores3
-#elif defined(CONFIG_TT_BOARD_UNPHONE)
-#include "UnPhone.h"
-#define TT_BOARD_HARDWARE &unPhone
-#elif defined(CONFIG_TT_BOARD_CYD_JC2432W328C)
-#include "JC2432W328C.h"
-#define TT_BOARD_HARDWARE &cyd_jc2432w328c_config
-#elif defined(CONFIG_TT_BOARD_CYD_8048S043C)
-#include "CYD8048S043C.h"
-#define TT_BOARD_HARDWARE &cyd_8048s043c_config
-#elif defined(CONFIG_TT_BOARD_CYD_JC8048W550C)
-#include "JC8048W550C.h"
-#define TT_BOARD_HARDWARE &cyd_jc8048w550c_config
-#elif defined(CONFIG_TT_BOARD_CYD_4848S040C)
-#include "CYD4848S040C.h"
-#define TT_BOARD_HARDWARE &cyd_4848s040c_config
-#elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_TOUCH_43)
-#include "WaveshareS3Touch43.h"
-#define TT_BOARD_HARDWARE &waveshare_s3_touch_43
-#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.
-#endif
-
-#else // else simulator
-
-#include "Simulator.h"
-
-extern tt::hal::Configuration hardware;
-#define TT_BOARD_HARDWARE &hardware
-
-#endif // ESP_PLATFORM
@@ -1,23 +0,0 @@
-#include <Tactility/app/AppManifest.h>
-#include <Tactility/lvgl/Toolbar.h>
-#include <lvgl.h>
-
-using namespace tt::app;
-
-class HelloWorldApp : public App {
-
-    void onShow(AppContext& context, lv_obj_t* parent) override {
-        lv_obj_t* toolbar = tt::lvgl::toolbar_create(parent, context);
-        lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
-
-        lv_obj_t* label = lv_label_create(parent);
-        lv_label_set_text(label, "Hello, world!");
-        lv_obj_align(label, LV_ALIGN_CENTER, 0, 0);
-    }
-};
-
-extern const AppManifest hello_world_app = {
-    .id = "HelloWorld",
-    .name = "Hello World",
-    .createApp = create<HelloWorldApp>
-};
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-// Capacitive touch version of the 2.4" yellow board
-extern const tt::hal::Configuration cyd_2432s024c_config;
@@ -1,36 +0,0 @@
-#include "Display.h"
-#include "Cst816Touch.h"
-
-#include <Ili934xDisplay.h>
-#include <PwmBacklight.h>
-
-static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
-    // Note: GPIO 25 for reset and GPIO 21 for interrupt?
-    auto configuration = std::make_unique<Cst816sTouch::Configuration>(
-        I2C_NUM_0,
-        240,
-        320
-    );
-
-    return std::make_shared<Cst816sTouch>(std::move(configuration));
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-
-    auto touch = createTouch();
-
-    auto configuration = std::make_unique<Ili934xDisplay::Configuration>(
-        TWODOTFOUR_LCD_SPI_HOST,
-        TWODOTFOUR_LCD_PIN_CS,
-        TWODOTFOUR_LCD_PIN_DC,
-        TWODOTFOUR_LCD_HORIZONTAL_RESOLUTION,
-        TWODOTFOUR_LCD_VERTICAL_RESOLUTION,
-        touch
-    );
-
-    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);
-}
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "Tactility/hal/display/DisplayDevice.h"
-#include <memory>
-
-#define TWODOTFOUR_LCD_PIN_BACKLIGHT GPIO_NUM_27
-
-// Display
-#define TWODOTFOUR_LCD_SPI_HOST SPI2_HOST
-#define TWODOTFOUR_LCD_HORIZONTAL_RESOLUTION 240
-#define TWODOTFOUR_LCD_VERTICAL_RESOLUTION 320
-#define TWODOTFOUR_LCD_DRAW_BUFFER_HEIGHT (TWODOTFOUR_LCD_VERTICAL_RESOLUTION / 10)
-#define TWODOTFOUR_LCD_DRAW_BUFFER_SIZE (TWODOTFOUR_LCD_HORIZONTAL_RESOLUTION * TWODOTFOUR_LCD_DRAW_BUFFER_HEIGHT)
-#define TWODOTFOUR_LCD_PIN_CS GPIO_NUM_15
-#define TWODOTFOUR_LCD_PIN_DC GPIO_NUM_2
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -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;
@@ -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);
-}
@@ -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();
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-// Capacitive touch version of the 2.4" yellow board
-extern const tt::hal::Configuration cyd_2432S032c_config;
@@ -1,40 +0,0 @@
-#include "Display.h"
-
-#include <Gt911Touch.h>
-#include <Ili934xDisplay.h>
-#include <PwmBacklight.h>
-
-static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
-    auto configuration = std::make_unique<Gt911Touch::Configuration>(
-        I2C_NUM_0,
-        240,
-        320
-    );
-
-    return std::make_shared<Gt911Touch>(std::move(configuration));
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-
-    auto touch = createTouch();
-
-    auto configuration = std::make_unique<Ili934xDisplay::Configuration>(
-        SPI2_HOST,
-        GPIO_NUM_15,
-        GPIO_NUM_2,
-        240,
-        320,
-        touch,
-        true,
-        true,
-        true,
-        true,
-        0,
-        LCD_RGB_ELEMENT_ORDER_RGB
-    );
-
-    configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
-
-    auto display = std::make_shared<Ili934xDisplay>(std::move(configuration));
-    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
-}
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-// Capacitive touch version of the 4" square yellow board
-extern const tt::hal::Configuration cyd_4848s040c_config;
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-// Capacitive touch version of the 4.3" yellow board
-extern const tt::hal::Configuration cyd_8048s043c_config;
@@ -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;
@@ -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));
-}
@@ -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();
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-// Capacitive touch version of the 2.8" yellow board
-extern const tt::hal::Configuration cyd_jc2432w328c_config;
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "Tactility/hal/display/DisplayDevice.h"
-#include <memory>
-
-// Display backlight (PWM)
-#define JC2432W328C_LCD_PIN_BACKLIGHT GPIO_NUM_27
-
-// Display
-#define JC2432W328C_LCD_SPI_HOST SPI2_HOST
-#define JC2432W328C_LCD_HORIZONTAL_RESOLUTION 240
-#define JC2432W328C_LCD_VERTICAL_RESOLUTION 320
-#define JC2432W328C_LCD_DRAW_BUFFER_HEIGHT (JC2432W328C_LCD_VERTICAL_RESOLUTION / 10)
-#define JC2432W328C_LCD_DRAW_BUFFER_SIZE (JC2432W328C_LCD_HORIZONTAL_RESOLUTION * JC2432W328C_LCD_DRAW_BUFFER_HEIGHT)
-#define JC2432W328C_LCD_PIN_CS GPIO_NUM_15
-#define JC2432W328C_LCD_PIN_DC GPIO_NUM_2
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-// Capacitive touch version of the 5" black board
-extern const tt::hal::Configuration cyd_jc8048w550c_config;
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration crowpanel_advance_28;
@@ -1,41 +0,0 @@
-#include "Display.h"
-
-#include <Ft5x06Touch.h>
-#include <PwmBacklight.h>
-#include <St7789Display.h>
-
-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,
-        false
-    );
-
-    return std::make_shared<Ft5x06Touch>(std::move(configuration));
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-    auto touch = createTouch();
-
-    auto configuration = std::make_unique<St7789Display::Configuration>(
-        CROWPANEL_LCD_SPI_HOST,
-        CROWPANEL_LCD_PIN_CS,
-        CROWPANEL_LCD_PIN_DC,
-        240,
-        320,
-        touch,
-        false,
-        false,
-        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);
-}
@@ -1,12 +0,0 @@
-#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();
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration crowpanel_advance_35;
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration crowpanel_advance_50;
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration crowpanel_basic_28;
@@ -1,39 +0,0 @@
-#include "Display.h"
-
-#include <Ili934xDisplay.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,
-        240,
-        320,
-        false,
-        true,
-        false
-    );
-
-    return std::make_shared<Xpt2046Touch>(std::move(configuration));
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-    auto touch = createTouch();
-
-    auto configuration = std::make_unique<Ili934xDisplay::Configuration>(
-        CROWPANEL_LCD_SPI_HOST,
-        CROWPANEL_LCD_PIN_CS,
-        CROWPANEL_LCD_PIN_DC,
-        240,
-        320,
-        touch
-    );
-
-    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);
-}
@@ -1,13 +0,0 @@
-#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
-#define CROWPANEL_LCD_PIN_DC GPIO_NUM_2 // 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();
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration crowpanel_basic_35;
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration crowpanel_basic_50;
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration lilygo_tlora_pager;
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration lilygo_tdeck;
@@ -1,48 +0,0 @@
-#include "Display.h"
-
-#include <Gt911Touch.h>
-#include <PwmBacklight.h>
-#include <St7789Display.h>
-
-#define TDECK_LCD_SPI_HOST SPI2_HOST
-#define TDECK_LCD_PIN_CS GPIO_NUM_12
-#define TDECK_LCD_PIN_DC GPIO_NUM_11 // RS
-#define TDECK_LCD_HORIZONTAL_RESOLUTION 320
-#define TDECK_LCD_VERTICAL_RESOLUTION 240
-#define TDECK_LCD_SPI_TRANSFER_HEIGHT (TDECK_LCD_VERTICAL_RESOLUTION / 10)
-
-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>(
-        I2C_NUM_0,
-        240,
-        320,
-        true,
-        true,
-        false
-    );
-
-    return std::make_shared<Gt911Touch>(std::move(configuration));
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-    auto touch = createTouch();
-
-    auto configuration = std::make_unique<St7789Display::Configuration>(
-        TDECK_LCD_SPI_HOST,
-        TDECK_LCD_PIN_CS,
-        TDECK_LCD_PIN_DC,
-        320,
-        240,
-        touch,
-        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);
-}
@@ -1,51 +0,0 @@
-#include "axp192/axp192.h"
-
-#include <Tactility/Log.h>
-#include <Tactility/hal/i2c/I2c.h>
-#include <Tactility/CoreDefines.h>
-
-#include <driver/i2c.h>
-#include <driver/spi_master.h>
-
-constexpr auto* TAG = "Core2";
-
-axp192_t axpDevice;
-
-static int32_t axpI2cRead(TT_UNUSED void* handle, uint8_t address, uint8_t reg, uint8_t* buffer, uint16_t size) {
-    if (tt::hal::i2c::masterReadRegister(I2C_NUM_0, address, reg, buffer, size, 50 / portTICK_PERIOD_MS)) {
-        return AXP192_OK;
-    } else {
-        return 1;
-    }
-}
-
-static int32_t axpI2cWrite(TT_UNUSED void* handle, uint8_t address, uint8_t reg, const uint8_t* buffer, uint16_t size) {
-    if (tt::hal::i2c::masterWriteRegister(I2C_NUM_0, address, reg, buffer, size, 50 / portTICK_PERIOD_MS)) {
-        return AXP192_OK;
-    } else {
-        return 1;
-    }
-}
-
-void initAxp() {
-    axpDevice.read = axpI2cRead;
-    axpDevice.write = axpI2cWrite;
-
-    axp192_ioctl(&axpDevice, AXP192_LDO2_SET_VOLTAGE, 3300); // LCD + SD
-    axp192_ioctl(&axpDevice, AXP192_LDO3_SET_VOLTAGE, 0); // VIB_MOTOR STOP
-    axp192_ioctl(&axpDevice, AXP192_DCDC3_SET_VOLTAGE, 3300);
-
-    axp192_ioctl(&axpDevice, AXP192_LDO2_ENABLE);
-    axp192_ioctl(&axpDevice, AXP192_LDO3_DISABLE);
-    axp192_ioctl(&axpDevice, AXP192_DCDC3_ENABLE);
-
-    axp192_write(&axpDevice, AXP192_PWM1_DUTY_CYCLE_2, 255); // PWM 255 (LED OFF)
-    axp192_write(&axpDevice, AXP192_GPIO1_CONTROL, 0x02); // GPIO1 PWM
-    // TODO: We could charge at 390mA according to the M5Unified code, but the AXP driver in M5Unified limits to 132mA, so it's unclear what the AXP supports.
-}
-
-bool initBoot() {
-    TT_LOG_I(TAG, "initBoot");
-    initAxp();
-    return true;
-}
@@ -1,3 +0,0 @@
-#pragma once
-
-bool initBoot();
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration m5stack_core2;
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "Tactility/hal/power/PowerDevice.h"
-#include <memory>
-
-using tt::hal::power::PowerDevice;
-
-class Core2Power : public PowerDevice {
-
-public:
-
-    Core2Power() = default;
-    ~Core2Power() override = default;
-
-    std::string getName() const final { return "AXP192 Power"; }
-    std::string getDescription() const final { return "Power management via I2C"; }
-
-    bool supportsMetric(MetricType type) const override;
-    bool getMetric(MetricType type, MetricData& data) override;
-
-    bool supportsChargeControl() const override { return true; }
-    bool isAllowedToCharge() const override;
-    void setAllowedToCharge(bool canCharge) override;
-};
-
-std::shared_ptr<PowerDevice> createPower();
@@ -1,36 +0,0 @@
-#include "Display.h"
-
-#include <Ft6x36Touch.h>
-#include <Ili934xDisplay.h>
-
-std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
-    auto configuration = std::make_unique<Ft6x36Touch::Configuration>(
-        I2C_NUM_0,
-        GPIO_NUM_39,
-        CORE2_LCD_HORIZONTAL_RESOLUTION,
-        CORE2_LCD_VERTICAL_RESOLUTION
-    );
-
-    auto touch = std::make_shared<Ft6x36Touch>(std::move(configuration));
-    return std::reinterpret_pointer_cast<tt::hal::touch::TouchDevice>(touch);
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-    auto touch = createTouch();
-
-    auto configuration = std::make_unique<Ili934xDisplay::Configuration>(
-        CORE2_LCD_SPI_HOST,
-        CORE2_LCD_PIN_CS,
-        CORE2_LCD_PIN_DC,
-        CORE2_LCD_HORIZONTAL_RESOLUTION,
-        CORE2_LCD_VERTICAL_RESOLUTION,
-        touch,
-        false,
-        false,
-        false,
-        true
-    );
-
-    auto display = std::make_shared<Ili934xDisplay>(std::move(configuration));
-    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
-}
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "Tactility/hal/display/DisplayDevice.h"
-#include <memory>
-
-#define CORE2_LCD_SPI_HOST SPI2_HOST
-#define CORE2_LCD_PIN_CS GPIO_NUM_5
-#define CORE2_LCD_PIN_DC GPIO_NUM_15
-#define CORE2_LCD_HORIZONTAL_RESOLUTION 320
-#define CORE2_LCD_VERTICAL_RESOLUTION 240
-#define CORE2_LCD_DRAW_BUFFER_HEIGHT (CORE2_LCD_VERTICAL_RESOLUTION / 10)
-#define CORE2_LCD_DRAW_BUFFER_SIZE (CORE2_LCD_HORIZONTAL_RESOLUTION * CORE2_LCD_DRAW_BUFFER_HEIGHT)
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration m5stack_cores3;
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/display/DisplayDevice.h>
-
-// Display
-#define CORES3_LCD_SPI_HOST SPI3_HOST
-#define CORES3_LCD_PIN_CS GPIO_NUM_3
-#define CORES3_LCD_PIN_DC GPIO_NUM_35
-#define CORES3_LCD_HORIZONTAL_RESOLUTION 320
-#define CORES3_LCD_VERTICAL_RESOLUTION 240
-#define CORES3_LCD_DRAW_BUFFER_HEIGHT (CORES3_LCD_VERTICAL_RESOLUTION / 10)
-#define CORES3_LCD_DRAW_BUFFER_SIZE (CORES3_LCD_HORIZONTAL_RESOLUTION * CORES3_LCD_DRAW_BUFFER_HEIGHT)
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration unPhone;
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration waveshare_s3_touch_43;
@@ -1,14 +1,22 @@
-#include "CYD2432S024C.h"
 #include "devices/Display.h"
 #include "devices/SdCard.h"

+#include <Tactility/hal/Configuration.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() {
-    return driver::pwmbacklight::init(TWODOTFOUR_LCD_PIN_BACKLIGHT);
+    // 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
+    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(LCD_PIN_BACKLIGHT);
 }

 static tt::hal::DeviceVector createDevices() {
@@ -18,7 +26,7 @@ static tt::hal::DeviceVector createDevices() {
    };
 }

-const tt::hal::Configuration cyd_2432s024c_config = {
+extern const tt::hal::Configuration hardwareConfiguration = {
    .initBoot = initBoot,
    .createDevices = createDevices,
    .i2c = {
@@ -72,7 +80,7 @@ const tt::hal::Configuration cyd_2432s024c_config = {
                .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,
+                .max_transfer_sz = LCD_SPI_TRANSFER_SIZE_LIMIT,
                .flags = 0,
                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
                .intr_flags = 0
@@ -0,0 +1,45 @@
+#include "Display.h"
+#include "Cst816Touch.h"
+
+#include <Ili934xDisplay.h>
+#include <PwmBacklight.h>
+
+static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
+    // Note: GPIO 25 for reset and GPIO 21 for interrupt?
+    auto configuration = std::make_unique<Cst816sTouch::Configuration>(
+        I2C_NUM_0,
+        240,
+        320
+    );
+
+    return std::make_shared<Cst816sTouch>(std::move(configuration));
+}
+
+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);
+}
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <Tactility/hal/display/DisplayDevice.h>
+#include <driver/gpio.h>
+#include <driver/spi_common.h>
+#include <memory>
+
+// Display
+constexpr auto LCD_PIN_BACKLIGHT = GPIO_NUM_27;
+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;
+constexpr auto LCD_SPI_TRANSFER_SIZE_LIMIT = LCD_BUFFER_SIZE * LV_COLOR_DEPTH / 8;
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -16,7 +16,7 @@ std::shared_ptr<SdCardDevice> createSdCard() {
        GPIO_NUM_NC,
        GPIO_NUM_NC,
        SdCardDevice::MountBehaviour::AtBoot,
-        std::make_shared<tt::Mutex>(),
+        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
        std::vector<gpio_num_t>(),
        SDCARD_SPI_HOST
    );
@@ -0,0 +1,129 @@
+#include "devices/Display.h"
+#include "devices/SdCard.h"
+
+#include <Tactility/hal/Configuration.h>
+#include <Tactility/lvgl/LvglSync.h>
+#include <PwmBacklight.h>
+
+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
+    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(LCD_PIN_BACKLIGHT);
+}
+
+static DeviceVector createDevices() {
+    return {
+        createDisplay(),
+        createSdCard()
+    };
+}
+
+extern const Configuration hardwareConfiguration = {
+    .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 = LCD_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,
+                }
+            }
+        }
+    }
+};
@@ -0,0 +1,49 @@
+#include "Display.h"
+#include "Xpt2046SoftSpi.h"
+#include <Ili934xDisplay.h>
+#include <PwmBacklight.h>
+
+static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
+    auto configuration = std::make_unique<Xpt2046SoftSpi::Configuration>(
+        TOUCH_MOSI_PIN,
+        TOUCH_MISO_PIN,
+        TOUCH_SCK_PIN,
+        TOUCH_CS_PIN,
+        LCD_HORIZONTAL_RESOLUTION,
+        LCD_VERTICAL_RESOLUTION,
+        false, // swapXY
+        true, // mirrorX
+        false // mirrorY
+    );
+
+    return std::make_shared<Xpt2046SoftSpi>(std::move(configuration));
+}
+
+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);
+}
@@ -0,0 +1,28 @@
+#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;
+constexpr auto LCD_SPI_TRANSFER_SIZE_LIMIT = LCD_BUFFER_SIZE * LV_COLOR_DEPTH / 8;
+
+// Display backlight (PWM)
+constexpr auto LCD_PIN_BACKLIGHT = GPIO_NUM_21;
+
+// 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;
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -11,7 +11,7 @@ std::shared_ptr<SdCardDevice> createSdCard() {
        GPIO_NUM_NC,
        GPIO_NUM_NC,
        SdCardDevice::MountBehaviour::AtBoot,
-        std::make_shared<tt::Mutex>(),
+        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
        std::vector<gpio_num_t>(),
        SPI3_HOST
    );
@@ -0,0 +1,7 @@
+file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
+
+idf_component_register(
+    SRCS ${SOURCE_FILES}
+    INCLUDE_DIRS "Source"
+    REQUIRES Tactility esp_lvgl_port ST7789 XPT2046SoftSPI PwmBacklight driver vfs fatfs
+)
@@ -0,0 +1,129 @@
+#include "devices/Display.h"
+#include "devices/SdCard.h"
+
+#include <Tactility/hal/Configuration.h>
+#include <Tactility/lvgl/LvglSync.h>
+#include <PwmBacklight.h>
+
+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
+    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(LCD_PIN_BACKLIGHT);
+}
+
+static DeviceVector createDevices() {
+    return {
+        createDisplay(),
+        createSdCard()
+    };
+}
+
+extern const Configuration hardwareConfiguration = {
+    .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 = LCD_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,
+                }
+            }
+        }
+    }
+};
@@ -0,0 +1,49 @@
+#include "Display.h"
+#include "Xpt2046SoftSpi.h"
+#include <St7789Display.h>
+#include <PwmBacklight.h>
+
+constexpr auto* TAG = "CYD";
+
+static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
+    auto configuration = std::make_unique<Xpt2046SoftSpi::Configuration>(
+        TOUCH_MOSI_PIN,
+        TOUCH_MISO_PIN,
+        TOUCH_SCK_PIN,
+        TOUCH_CS_PIN,
+        LCD_HORIZONTAL_RESOLUTION,
+        LCD_VERTICAL_RESOLUTION,
+        false, // swapXY
+        true, // mirrorX
+        false // mirrorY
+    );
+
+    return std::make_shared<Xpt2046SoftSpi>(std::move(configuration));
+}
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
+    St7789Display::Configuration panel_configuration = {
+        .horizontalResolution = LCD_HORIZONTAL_RESOLUTION,
+        .verticalResolution = LCD_VERTICAL_RESOLUTION,
+        .gapX = 0,
+        .gapY = 0,
+        .swapXY = false,
+        .mirrorX = false,
+        .mirrorY = false,
+        .invertColor = false,
+        .bufferSize = LCD_BUFFER_SIZE,
+        .touch = createTouch(),
+        .backlightDutyFunction = driver::pwmbacklight::setBacklightDuty,
+        .resetPin = GPIO_NUM_NC
+    };
+
+    auto spi_configuration = std::make_shared<St7789Display::SpiConfiguration>(St7789Display::SpiConfiguration {
+        .spiHostDevice = LCD_SPI_HOST,
+        .csPin = LCD_PIN_CS,
+        .dcPin = LCD_PIN_DC,
+        .pixelClockFrequency = 62'500'000,
+        .transactionQueueDepth = 10
+    });
+
+    return std::make_shared<St7789Display>(panel_configuration, spi_configuration);
+}
@@ -0,0 +1,28 @@
+#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_BACKLIGHT = GPIO_NUM_21;
+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;
+constexpr auto LCD_SPI_TRANSFER_SIZE_LIMIT = LCD_BUFFER_SIZE * LV_COLOR_DEPTH / 8;
+
+// 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;
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -0,0 +1,21 @@
+#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));
+}
+
@@ -1,17 +1,27 @@
-#include "CYD2432S032C.h"
-#include "Tactility/lvgl/LvglSync.h"
 #include "devices/Display.h"
 #include "devices/SdCard.h"

+#include <Tactility/hal/Configuration.h>
 #include <Tactility/kernel/SystemEvents.h>
+#include <Tactility/lvgl/LvglSync.h>

 #include <PwmBacklight.h>

 bool initBoot() {
-    if (!driver::pwmbacklight::init(GPIO_NUM_27)) {
+    if (!driver::pwmbacklight::init(LCD_PIN_BACKLIGHT)) {
        return false;
    }

+    // 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
+    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
+
    // 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) {
@@ -32,7 +42,7 @@ static tt::hal::DeviceVector createDevices() {
    };
 }

-const tt::hal::Configuration cyd_2432S032c_config = {
+extern const tt::hal::Configuration hardwareConfiguration = {
    .initBoot = initBoot,
    .createDevices = createDevices,
    .i2c = {
@@ -55,6 +65,7 @@ const tt::hal::Configuration cyd_2432S032c_config = {
        }
    },
    .spi {
+        // Display
        tt::hal::spi::Configuration {
            .device = SPI2_HOST,
            .dma = SPI_DMA_CH_AUTO,
@@ -69,7 +80,7 @@ const tt::hal::Configuration cyd_2432S032c_config = {
                .data6_io_num = GPIO_NUM_NC,
                .data7_io_num = GPIO_NUM_NC,
                .data_io_default_level = false,
-                .max_transfer_sz = 0,
+                .max_transfer_sz = LCD_SPI_TRANSFER_SIZE_LIMIT,
                .flags = 0,
                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
                .intr_flags = 0
@@ -78,6 +89,7 @@ const tt::hal::Configuration cyd_2432S032c_config = {
            .isMutable = false,
            .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
        },
+        // SD card
        tt::hal::spi::Configuration {
            .device = SPI3_HOST,
            .dma = SPI_DMA_CH_AUTO,
@@ -0,0 +1,44 @@
+#include "Display.h"
+
+#include <Gt911Touch.h>
+#include <Ili934xDisplay.h>
+#include <PwmBacklight.h>
+
+static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
+    auto configuration = std::make_unique<Gt911Touch::Configuration>(
+        I2C_NUM_0,
+        LCD_HORIZONTAL_RESOLUTION,
+        LCD_VERTICAL_RESOLUTION
+    );
+
+    return std::make_shared<Gt911Touch>(std::move(configuration));
+}
+
+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 = true,
+        .mirrorX = true,
+        .mirrorY = true,
+        .invertColor = true,
+        .swapBytes = true,
+        .bufferSize = LCD_BUFFER_SIZE,
+        .touch = createTouch(),
+        .backlightDutyFunction = driver::pwmbacklight::setBacklightDuty,
+        .resetPin = GPIO_NUM_NC,
+        .rgbElementOrder = LCD_RGB_ELEMENT_ORDER_RGB
+    };
+
+    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);
+}
@@ -0,0 +1,19 @@
+#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_BACKLIGHT = GPIO_NUM_27;
+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;
+constexpr auto LCD_SPI_TRANSFER_SIZE_LIMIT = LCD_BUFFER_SIZE * LV_COLOR_DEPTH / 8;
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -15,7 +15,7 @@ std::shared_ptr<SdCardDevice> createSdCard() {
        GPIO_NUM_NC,
        GPIO_NUM_NC,
        SdCardDevice::MountBehaviour::AtBoot,
-        std::make_shared<tt::Mutex>(),
+        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
        std::vector<gpio_num_t>(),
        SDCARD_SPI_HOST
    );
@@ -1,7 +1,9 @@
-#include "CYD4848S040C.h"
 #include "devices/St7701Display.h"
 #include "devices/SdCard.h"

+#include <Tactility/hal/Configuration.h>
+#include <Tactility/kernel/SystemEvents.h>
+#include <Tactility/lvgl/LvglSync.h>
 #include <PwmBacklight.h>

 using namespace tt::hal;
@@ -12,12 +14,12 @@ static bool initBoot() {

 static DeviceVector createDevices() {
    return {
-        std::reinterpret_pointer_cast<Device>(std::make_shared<St7701Display>()),
+        std::make_shared<St7701Display>(),
        createSdCard()
    };
 }

-const Configuration cyd_4848s040c_config = {
+extern const Configuration hardwareConfiguration = {
    .initBoot = initBoot,
    .createDevices = createDevices,
    .i2c = {
@@ -59,7 +61,7 @@ const Configuration cyd_4848s040c_config = {
        }
    },
    .spi {
-        //SD Card
+        // SD Card & display init
        spi::Configuration {
            .device = SPI2_HOST,
            .dma = SPI_DMA_CH_AUTO,
@@ -68,20 +70,20 @@ const Configuration cyd_4848s040c_config = {
                .miso_io_num = GPIO_NUM_41,
                .sclk_io_num = GPIO_NUM_48,
                .quadwp_io_num = -1,
-                .quadhd_io_num = -1,
+                .quadhd_io_num = GPIO_NUM_42,
                .data4_io_num = -1,
                .data5_io_num = -1,
                .data6_io_num = -1,
                .data7_io_num = -1,
                .data_io_default_level = false,
-                .max_transfer_sz = 8192,
+                .max_transfer_sz = 1024 * 128,
                .flags = 0,
                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
                .intr_flags = 0
            },
            .initMode = spi::InitMode::ByTactility,
            .isMutable = false,
-            .lock = nullptr
+            .lock = tt::lvgl::getSyncLock()
        }
    }
 };
@@ -11,7 +11,9 @@ std::shared_ptr<SdCardDevice> createSdCard() {
        GPIO_NUM_NC,
        GPIO_NUM_NC,
        GPIO_NUM_NC,
-        SdCardDevice::MountBehaviour::AtBoot
+        SdCardDevice::MountBehaviour::AtBoot,
+        tt::lvgl::getSyncLock(),
+        std::vector { GPIO_NUM_39 }
    );

    auto sdcard = std::make_shared<SpiSdCardDevice>(
@@ -1,8 +1,9 @@
-#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 <Tactility/hal/Configuration.h>
+
 using namespace tt::hal;

 static bool initBoot() {
@@ -17,7 +18,7 @@ static DeviceVector createDevices() {
    };
 }

-const Configuration cyd_8048s043c_config = {
+extern const Configuration hardwareConfiguration = {
    .initBoot = initBoot,
    .createDevices = createDevices,
    .i2c = {
@@ -1,13 +1,12 @@
-#include "E32R28T.h"
 #include "devices/SdCard.h"
 #include "devices/Display.h"
+
+#include <Tactility/hal/Configuration.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);
+    return driver::pwmbacklight::init(LCD_BACKLIGHT_PIN);
 }

 static tt::hal::DeviceVector createDevices() {
@@ -17,7 +16,7 @@ static tt::hal::DeviceVector createDevices() {
    };
 }

-const tt::hal::Configuration cyd_e32r28t_config = {
+extern const tt::hal::Configuration hardwareConfiguration = {
    .initBoot = initBoot,
    .createDevices = createDevices,
    .i2c = {},
@@ -36,7 +35,7 @@ const tt::hal::Configuration cyd_e32r28t_config = {
                .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,
+                .max_transfer_sz = LCD_SPI_TRANSFER_SIZE_LIMIT,
                .flags = 0,
                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
                .intr_flags = 0
@@ -59,7 +58,7 @@ const tt::hal::Configuration cyd_e32r28t_config = {
                .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,
+                .max_transfer_sz = 0,
                .flags = 0,
                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
                .intr_flags = 0
@@ -0,0 +1,51 @@
+#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);
+}
@@ -0,0 +1,28 @@
+#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);
+constexpr auto LCD_SPI_TRANSFER_SIZE_LIMIT = LCD_BUFFER_SIZE * LV_COLOR_DEPTH / 8;
+
+// 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();
@@ -10,7 +10,7 @@ std::shared_ptr<SdCardDevice> createSdCard() {
        GPIO_NUM_NC,
        GPIO_NUM_NC,
        SdCardDevice::MountBehaviour::AtBoot,
-        std::make_shared<tt::Mutex>(),
+        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
        std::vector<gpio_num_t>(),
        SPI3_HOST
    );
@@ -0,0 +1,7 @@
+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
+)
@@ -1,45 +1,50 @@
-#include "CYD2432S028R.h"
-#include "devices/Display.h"
 #include "devices/SdCard.h"
+#include "devices/Display.h"
+#include "devices/Power.h"
+
+#include <Tactility/hal/Configuration.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);
+    return driver::pwmbacklight::init(DISPLAY_BACKLIGHT_PIN);
 }

-static DeviceVector createDevices() {
+static tt::hal::DeviceVector createDevices() {
    return {
+        createPower(),
        createDisplay(),
        createSdCard()
    };
 }

-const Configuration cyd_2432s028r_config = {
+extern const Configuration hardwareConfiguration = {
    .initBoot = initBoot,
    .createDevices = createDevices,
-    .i2c = {},
-    .spi {
+    .i2c = {
+        tt::hal::i2c::Configuration {
+            .name = "External",
+            .port = I2C_NUM_0,
+            .initMode = tt::hal::i2c::InitMode::ByTactility,
+            .isMutable = true,
+            .config = (i2c_config_t) {
+                .mode = I2C_MODE_MASTER,
+                .sda_io_num = GPIO_NUM_32,
+                .scl_io_num = GPIO_NUM_25,
+                .sda_pullup_en = false,
+                .scl_pullup_en = false,
+                .master = {
+                    .clk_speed = 400000
+                },
+                .clk_flags = 0
+            }
+        },
+    },
    // Display
-        spi::Configuration {
+    .spi = {
+        tt::hal::spi::Configuration {
            .device = SPI2_HOST,
            .dma = SPI_DMA_CH_AUTO,
            .config = {
@@ -53,18 +58,17 @@ const Configuration cyd_2432s028r_config = {
                .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,
+                .max_transfer_sz = DISPLAY_SPI_TRANSFER_SIZE_LIMIT,
                .flags = 0,
                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
                .intr_flags = 0
            },
-            .initMode = spi::InitMode::ByTactility,
+            .initMode = tt::hal::spi::InitMode::ByTactility,
            .isMutable = false,
            .lock = tt::lvgl::getSyncLock()
        },
-        
        // SD Card
-        spi::Configuration {
+        tt::hal::spi::Configuration {
            .device = SPI3_HOST,
            .dma = SPI_DMA_CH_AUTO,
            .config = {
@@ -78,14 +82,15 @@ const Configuration cyd_2432s028r_config = {
                .data6_io_num = GPIO_NUM_NC,
                .data7_io_num = GPIO_NUM_NC,
                .data_io_default_level = false,
-                .max_transfer_sz = 0,
+                .max_transfer_sz = 8192,
                .flags = 0,
                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
                .intr_flags = 0
            },
-            .initMode = spi::InitMode::ByTactility,
+            .initMode = tt::hal::spi::InitMode::ByTactility,
            .isMutable = false,
-            .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
+            .lock = nullptr
        },
+
    }
 };
@@ -0,0 +1,51 @@
+#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,
+        .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);
+}
@@ -0,0 +1,27 @@
+#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;
+constexpr auto DISPLAY_SPI_TRANSFER_SIZE_LIMIT = DISPLAY_DRAW_BUFFER_SIZE * sizeof(lv_color_t);
+
+// 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();
@@ -0,0 +1,12 @@
+#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);
+}
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <memory>
+#include <Tactility/hal/power/PowerDevice.h>
+
+std::shared_ptr<tt::hal::power::PowerDevice> createPower();
@@ -0,0 +1,22 @@
+#include "SdCard.h"
+#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
+
+using tt::hal::sdcard::SpiSdCardDevice;
+using SdCardDevice = tt::hal::sdcard::SdCardDevice;
+
+std::shared_ptr<SdCardDevice> createSdCard() {
+    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
+        SD_CS_PIN,                         // CS pin (IO5 on the module)
+        GPIO_NUM_NC,                           // MOSI override: leave NC to use SPI host pins
+        GPIO_NUM_NC,                           // MISO override: leave NC
+        GPIO_NUM_NC,                           // SCLK override: leave NC
+        SdCardDevice::MountBehaviour::AtBoot,
+        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
+        std::vector<gpio_num_t>(),
+        SD_SPI_HOST                        // SPI host for SD card (SPI3_HOST)
+    );
+
+    return std::make_shared<SpiSdCardDevice>(
+        std::move(configuration)
+    );
+}
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <Tactility/hal/sdcard/SdCardDevice.h>
+#include "driver/gpio.h"
+#include "driver/spi_common.h"
+
+using tt::hal::sdcard::SdCardDevice;
+
+// SD card (microSD)
+constexpr auto SD_CS_PIN = GPIO_NUM_5;
+constexpr auto SD_SPI_HOST = SPI3_HOST;
+
+std::shared_ptr<SdCardDevice> createSdCard();
@@ -1,4 +1,3 @@
-#include "JC2432W328C.h"
 #include "devices/Display.h"
 #include "devices/SdCard.h"

@@ -8,8 +7,6 @@

 using namespace tt::hal;

-#define CYD_SPI_TRANSFER_SIZE_LIMIT (JC2432W328C_LCD_DRAW_BUFFER_SIZE * LV_COLOR_DEPTH / 8)
-
 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
@@ -21,7 +18,7 @@ static bool initBoot() {
    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(JC2432W328C_LCD_PIN_BACKLIGHT);
+    return driver::pwmbacklight::init(LCD_PIN_BACKLIGHT);
 }

 static DeviceVector createDevices() {
@@ -31,7 +28,7 @@ static DeviceVector createDevices() {
    };
 }

-const Configuration cyd_jc2432w328c_config = {
+extern const Configuration hardwareConfiguration = {
    .initBoot = initBoot,
    .createDevices = createDevices,
    .i2c = {
@@ -88,7 +85,7 @@ const Configuration cyd_jc2432w328c_config = {
                .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,
+                .max_transfer_sz = LCD_SPI_TRANSFER_SIZE_LIMIT,
                .flags = 0,
                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
                .intr_flags = 0
@@ -0,0 +1,42 @@
+#include "Display.h"
+
+#include <Cst816Touch.h>
+#include <PwmBacklight.h>
+#include <St7789Display.h>
+
+static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
+    auto configuration = std::make_unique<Cst816sTouch::Configuration>(
+        I2C_NUM_0,
+        LCD_HORIZONTAL_RESOLUTION,
+        LCD_VERTICAL_RESOLUTION
+    );
+
+    return std::make_shared<Cst816sTouch>(std::move(configuration));
+}
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
+    St7789Display::Configuration panel_configuration = {
+        .horizontalResolution = LCD_HORIZONTAL_RESOLUTION,
+        .verticalResolution = LCD_VERTICAL_RESOLUTION,
+        .gapX = 0,
+        .gapY = 0,
+        .swapXY = false,
+        .mirrorX = false,
+        .mirrorY = false,
+        .invertColor = false,
+        .bufferSize = LCD_BUFFER_SIZE,
+        .touch = createTouch(),
+        .backlightDutyFunction = driver::pwmbacklight::setBacklightDuty,
+        .resetPin = GPIO_NUM_NC
+    };
+
+    auto spi_configuration = std::make_shared<St7789Display::SpiConfiguration>(St7789Display::SpiConfiguration {
+        .spiHostDevice = LCD_SPI_HOST,
+        .csPin = LCD_PIN_CS,
+        .dcPin = LCD_PIN_DC,
+        .pixelClockFrequency = 62'500'000,
+        .transactionQueueDepth = 10
+    });
+
+    return std::make_shared<St7789Display>(panel_configuration, spi_configuration);
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ken Van Hoeylandt	4a343e58cc	Update version to 0.6.0 (#400 )	2025-10-29 19:25:59 +01:00
Ken Van Hoeylandt	61277e74b8	Align board project names with board ids (#399 ) To avoid keeping track of a list that maps board project names to board ids. Because of this change, we don't have to manually edit `boards.cmake` anymore when adding a new board.	2025-10-28 09:07:54 +01:00
Ken Van Hoeylandt	efd3c6041c	Cardputer adv and more (#395 ) - Fixed TCA8418 driver - Updated T-Lora Pager for TCA driver fixes - Fixed issues with T-Lora keyboard driver - Implemented Cardputer Adv - Cleanup of Cardputer (regular) - Fix sdkconfig for E32R28T and E32R32P - Disable Wi-Fi on boot (was accidentally pushed before)	2025-10-28 00:39:31 +01:00
NellowTCS	647678ff82	New board: CYD-E32R32P (#393 )	2025-10-27 19:59:53 +01:00
Ken Van Hoeylandt	8115ca4fd9	Merge develop into main (#392 ) - Refactor `Ili934xDisplay` to use `EspLcdSpiDisplay` as base class - Update `St7789Display` for changes to `EspLcdDisplayV2` related to ILI934x driver - Updated all board driver implementations for ILI934x driver changes - Simplified board configurations: - All boards now have a `Configuration.cpp` - All board config's headers are removed - Removed `Boards.h` - Fix for untar-ing large files - Increase main task stack size to avoid stackoverflow when downloading apps in App Hub - Reduce SPI frequency for ST7789 displays (according to spec)	2025-10-26 23:26:28 +01:00
Ken Van Hoeylandt	db6d3b4acb	Merge develop into main (#391 ) ## Improvements - Created new base driver classes: `EspLcdDisplayV2' and `EspLcdSpiDisplay` - Updated `St7789Display` to implement `EspLcdSpiDisplay` - Updated all boards with ST7789 display ## Fixes - Ensure that `tmp/` is created on startup (for all writeable filesystems) - Fix for `lv_list` padding on small screen devices - Fix for `PreferencesEsp` not processing result when writing string to NVS ## Other - Remove unused build scripts	2025-10-26 13:50:17 +01:00
Ken Van Hoeylandt	37420db000	Update GitHub actions to use matrices (#389 )	2025-10-25 22:34:30 +02:00
Ken Van Hoeylandt	b067978c16	Change cJSON submodule source (#388 )	2025-10-25 20:56:29 +02:00
Ken Van Hoeylandt	09f8031bff	Fix for open Wi-Fi (#387 ) Don't encrypt password if there's no password set	2025-10-25 18:57:43 +02:00
Giasone	1450ca319d	Add CYD-2432S028RV3 board support (#385 )	2025-10-25 18:16:55 +02:00
Ken Van Hoeylandt	c139300a58	Thread+locking improvements and more (#386 )	2025-10-25 18:08:46 +02:00
Ken Van Hoeylandt	d0d05c67ca	PR review fixes (#384 )	2025-10-25 13:47:43 +02:00
Ken Van Hoeylandt	f660550f86	App hub and more (#383 ) - Added `AppHub` app - Added `AppHubDetails` app - Added `cJSON` dependency - Renamed `AppSim` module to `FirmwareSim` - Added extra `tt::app::alertdialg::start()` - Renamed `addApp()`, `removeApp()`, `findAppById()` and `getApps()` to `addAppManifest()`, `removeAppManifest()`, `findAppManifestById()` and `getAppManifests()` - Added `tt::lvgl::toolbar_clear_actions()` - Added `tt::network::EspHttpClient` as a thread-safe wrapper around `esp_http_client` - Added `tt::network::http::download()` to download files - Added `tt::network::ntp::isSynced()` - When time is synced, the timestamp is stored in NVS flash. On boot, it is restored. This helps SSL connections when doing a quick reset: when WiFi reconnects, the user doesn't have to wait for NTP sync before SSL works. - Added `tt::json::Reader` as a `cJSON` wrapper - Added `int64_t` support for `Preferences` - Added `int64_t` support for `Bundle` - Added dependencies: `cJSON`, `esp-tls` - When time is synced via NTP, disable time sync. - Added docs to 'tt::file::` functions - Added `tt::string::join()` that works with `std::vector<const char*>` - Fixed `tt::file::getLastPathSegment()` for the scenario when a path was passed with only a single segment - Set `CONFIG_ESP_MAIN_TASK_STACK_SIZE=5120` (from about 3k) for all boards - Set `CONFIG_MBEDTLS_SSL_PROTO_TLS1_3=y` for all boards	2025-10-25 00:20:48 +02:00
Ken Van Hoeylandt	e9384e0c11	Merge develop into main (#381 ) Various fixes and improvements	2025-10-22 23:15:33 +02:00
Ken Van Hoeylandt	9c5a427a34	Merge develop into main (#377 ) - Extract web server from `DevelopmentService` into a separate class: `HttpServer` - Export more functions in `tt_init.cpp`	2025-10-16 18:59:23 +02:00
Ken Van Hoeylandt	d8346998ce	Merge develop into main (#368 ) New boards: - LilyGO T-Dongle S3 - M5Stack StickC Plus - M5Stack StickC Plus2 New drivers: - AXP192: power control via I2C - ButtonControl: GPIO button input as LVGL device Other changes: - Updated implementation of AXP192 driver for Core2 board - Fix launcher UX for vertical layout - Fix error when properties file had an empty line - Add `__floatsidf` to `tt_init.cpp`	2025-10-14 20:39:23 +02:00
Ken Van Hoeylandt	3a59540365	Export more functions with TactilityC (#367 )	2025-10-09 23:42:28 +02:00
Ken Van Hoeylandt	d25603166a	Merge develop into main (#365 ) ### TactilityC - Create UART HAL - Refactor locking APIs - Bind new C++ functionality - Bind new LVGL functionality ### Apps - Remove Serial Console as it has been ported as an external app	2025-10-08 23:16:45 +02:00
Ken Van Hoeylandt	17b4fc6a47	Created app settings and app details applications (#364 )	2025-10-07 22:13:01 +02:00
Ken Van Hoeylandt	45a8379426	Changed TactilityC/TactilitySDK license from MIT to Apache V2.0 license (#363 )	2025-10-05 23:07:09 +02:00
Ken Van Hoeylandt	1e4234d895	Refactored app registration (#362 ) `AppManifest` is renamed to `AppRegistration` because it was confusing with the actual app manifest (as in: the properties file). Instead of passing a pointer, we're now passing the struct by value. I also moved some files around in `TactilityC/`.	2025-10-05 21:02:34 +02:00
Ken Van Hoeylandt	2cb413c3d1	Merge develop into main (#361 )	2025-10-05 19:37:59 +02:00
Ken Van Hoeylandt	5777a1381b	Remove GPIO and Calculator app (#360 )	2025-10-05 19:00:05 +02:00
Ken Van Hoeylandt	15de4e20b8	TactilityC improvements (#359 ) - Expose HAL Configuration's `UiScale` - Updated docs - Fix for `tt_timer_alloc()` - Changed `enum class` to regular C `enum` - Renamed enums (add prefix) - Include `<stdbool.h>` where needed	2025-10-05 18:31:54 +02:00
Ken Van Hoeylandt	3802679de4	File locking and DevelopmentService improvements (#358 ) - Moved `file::getlock(path)` from `Tactility` to `TactilityCore` - Changed all existing `file::` functions to implement locking by default - Removed all manual locking where `file::` functions were used - When `DevelopmentService` receives a file, it doesn't try to allocate it all in memory. This fixes going out-of-memory on devices without PSRAM. - Fix for TactilityC include	2025-10-05 16:16:55 +02:00
Ken Van Hoeylandt	a05a6afaaf	Path fixes for simulator (#357 )	2025-10-03 22:12:55 +02:00
Ken Van Hoeylandt	efd9662cfc	Fixed path for system.properties (#356 )	2025-10-03 19:53:03 +02:00
Ken Van Hoeylandt	00347cbd29	TactilityC and Toolbar improvements (#355 )	2025-10-02 23:40:40 +02:00
Ken Van Hoeylandt	b214a3358e	Merge develop into main (#353 ) ## TactilityC - Add `tt_lvgl_lock()` and `tt_lvgl_unlock()` - Add `tt_thread_set_affinity()` - Add support for STL symbols ## Other - Add `Thread::setAffinity()` - `GuiService`: replace `#define` with `constexpr` - Remove log storage and log app for now - Split up ELF symbols into more groups	2025-10-01 23:07:47 +02:00
Ken Van Hoeylandt	c7621b5e4c	SDK improvements (#352 ) TactilityC additions for: - C randomization functions - Tactility app paths - Tactility locks	2025-09-29 22:45:14 +02:00
Ken Van Hoeylandt	6dc4f698c9	SDK release folder changed (#351 ) This new way matches the `tactility.py`'s `.tactility/` folder names.	2025-09-29 21:49:36 +02:00
Ken Van Hoeylandt	f97ca26b01	Changed SDK release folder naming (#350 )	2025-09-29 08:04:11 +02:00
Ken Van Hoeylandt	98bbea3e9c	Add lv_spinbox functions to TactilityC (#349 )	2025-09-27 19:49:27 +02:00
Ken Van Hoeylandt	f6cdabf3c0	Merge develop into main (#348 ) ## App state Improved app state management in `LoaderService` and `GuiService`: - Re-ordered some of the state transitions - Hardened `GuiService` for repeated events (that might trigger a re-render of an app that's already rendered) - Validate state transitions in `LoaderService` and crash if an app transitions from the wrong state to the next one. ## LoaderService - Removed `tt::loader::` functions and expose `LoaderService` interface publicly. - Implement `stopAll()` and `stopAll(id)` which stops all instances of an app, including any apps that were launched by it. - Rename `stop()` functions to `stopTop()` - Created `stopTop(id)` which only stops the top-most app when the app id matches. - Moved `loader::LoaderEvent` to `loader::LoaderService::Event` - Changed app instance `std::stack` to `std::vector` ## Improvements - `ElfApp`: error 22 now shows a hint that `main()` might be missing - Starting, installing and uninstalling apps now stops any running app (and its children) on the stack ## Bugfixes - `HttpdReq` out of memory issue now shows an error message and doesn't crash anymore (this would happen on devices without PSRAM with WiFi active, when an app was installed) - `GuiService::hideApp()` lock should not wait for timeout and now waits indefinitely - `Buildscript/release-sdk-current.sh` deletes the previous local release before building a new one ## Code correctness - App classes were made `final` - Apps that had a `void start()` now have a `LaunchId start()` - `tt::app::State`: renamed `Started` to `Created` and `Stopped` to `Destroyed` to properly reflect earlier name changes	2025-09-27 18:04:09 +02:00
Ken Van Hoeylandt	dcf28d0868	elf_loader refactored and added more symbols (#347 )	2025-09-27 09:18:51 +02:00
Ken Van Hoeylandt	9cc58099b4	Remove external apps (#346 )	2025-09-23 23:21:58 +02:00
Ken Van Hoeylandt	1216862aec	Fix for touch configuration of Waveshare Touch LCD 1.28"	2025-09-23 17:49:59 +02:00
Ken Van Hoeylandt	7ad0a3cb04	Create GPIO HAL (#344 )	2025-09-22 23:24:01 +02:00
Ken Van Hoeylandt	bab3eb19bc	Merge develop into main (#343 ) - Refactor `AppManifest`: add new fields and rename existing ones - Parse and validate the manifest from an app that is being installed. - Remove deprecated `scoped()` from `Lock` - Create `Tactility/Paths.h` - App loading at boot now properly parses the manifest files of external apps - Properly lock both source and destination locations during app install - Remove LVGL path variants from `AppPaths` and `ServicePaths` - Removed `xPath` base classes for apps and services. There's now `AppPaths` and `ServicePaths`. - Renamed app and service paths: "data" and "system" paths are now "user data" and "assets"	2025-09-22 08:03:21 +02:00
Ken Van Hoeylandt	a4d15b2a1e	Add esp_http_client and expose it to TactilityC (#341 )	2025-09-20 13:07:34 +02:00
Ken Van Hoeylandt	41ad569154	UI/UX improvements for small screen devices (#340 ) - Improved UI/UX of various WiFi apps to make it compatible with Cardputer. - Improved UI/UX of Serial Console to make it compatible with Cardputer. - Boot app now shows a smaller logo on Cardputer - CrashDiagnostics app: Use different text if no touch screen is present	2025-09-20 00:19:29 +02:00
Ken Van Hoeylandt	faab6d825f	Merge develop into main (#339 ) - Update ILI9341 driver to v2.0.1 - Lots of code cleanup for apps - Refactor app "type" into "category" and added flags to the manifest (for show/hide statusbar and for hidden apps) - Rename some ElfApp-related functionality and improved the way the static data was managed - Rename "filebrowser" to "files" - Added cstring functions to tt_init.cpp - Minor fix in Boot app - Updated external apps for SDK changes	2025-09-17 23:42:49 +02:00
Ken Van Hoeylandt	a2af95b92d	Merge develop into main (#338 ) ### Cardputer: - Fix keyboard issue with up/down button conflict when selecting switch - Fix backlight flickering ### UI improvements - Removed a 3 pixel border that went around the entire desktop environment - Improved system layout (GuiService) - Statusbar: improved layout (mainly margin/padding) - Toolbar: fixed margin/padding of all buttons, fixed alignment of all content - Improved layout/UI of many apps ### Other - Update LVGL to 9.3.0 official release (was dev version)	2025-09-16 23:12:07 +02:00
Ken Van Hoeylandt	53b711584f	Merge develop into main (#337 ) - Implement `UiScale` in `hal::Configuration`: small screens with no touch can now opt for a more optimized experience (e.g. Cardputer, Waveshare 1.47, Waveshare 1.3", etc.) - Fix for Cardputer UART configuration and added I2C configuration - Fix for software keyboard bug in Gui - Removed deprecated fields from `hal::Configuration` - Updated the simulator devices to use the new HAL config - add `bool tt::hal::hasDevice(Device::Type)` - Cleanup of `AppList` app code - Improve `Gpio` app for small screen devices - Added various ESP32 GCC wrappers to wrap LVGL functions (with manipulations for small screen devices) - Moved `Launcher` assets to `assets/` subfolder - Optimized `Toolbar` for small screen devices - Stop showing `system/` partition in `FileBrowser` because it's read-only and not very useful. Created `config::SHOW_SYSTEM_PARTITION` to override this behaviour. - Hide apps when their required hardware isn't available (I2C, UART, PowerDevice) - Fix for `CYD-2432S032C` DPI setting	2025-09-15 22:46:12 +02:00
Ken Van Hoeylandt	ce8ac61d42	Implement CardputerPower and improve EstimatedPower driver (#335 )	2025-09-14 15:42:10 +02:00
Ken Van Hoeylandt	d5c94c7a8a	Merge develop to main (#334 ) - `FileBrowser` app now supports deleting directories (recursively) - `DevelopmentService` and `tactility.py` now support the app `uninstall` action - Fix crash for `File` app: implement file locking in several places (SPI SD cards need it) - Remove I2C configuration from `M5stackCardputer.cpp` because we don't support the "Cardputer Adv" variant in that firmware.	2025-09-14 13:37:34 +02:00
Shadowtrance	7027da00b8	New waveshare boards + GC9A01 Display driver (#333 )	2025-09-14 12:12:56 +02:00
Ken Van Hoeylandt	095c8146c3	Fix for Cardputer partition size (#332 )	2025-09-14 02:32:58 +02:00
Ken Van Hoeylandt	62c613477a	Implement M5Stack Cardputer + minor Tactility improvements (#331 ) - Implement M5Stack Cardputer: display, SD card and keyboard - `St7789Display` now supports a "gap" configuration - `ElfApp` has improved errors	2025-09-14 02:25:10 +02:00
Ken Van Hoeylandt	d83b98e99b	Fix for I2C Scanner crash and updated CYD-2432S028R board (#330 ) - Fix for crash when I2C Scanner is started and no I2C devices were found in the board configuration - Add I2C and UART configurations to CYD-2432S028R board	2025-09-14 00:50:36 +02:00
Ken Van Hoeylandt	ade86c99b4	Update gitmodules with proper URL to fix minitar link (#329 )	2025-09-12 23:50:37 +02:00
Ken Van Hoeylandt	980b115f1d	Add board: Waveshare S3 Touch LCD 1.47 (#328 ) Touch isn't working yet. Fixed a SPI lock issue.	2025-09-12 23:45:37 +02:00
Ken Van Hoeylandt	84049658db	Merge develop into main (#327 ) ## New features - Implemented support for app packaging in firmware and `tactility.py`: load `.app` files instead of `.elf` files. Install apps remotely or via `FileBrowser`. - Ensure headless mode works: all services that require LVGL can deal with the absence of a display - Service `onStart()` is now allowed to fail (return `bool` result) - Added and improved various file-related helper functions ## Improvements - Completely revamped the SystemInfo app UI - Improved Calculator UI of internal and external variant - Fix Chat UI and removed the emoji buttons for now - Fix for toolbar bottom padding issue in all apps ## Fixes - Fix for allowing recursive locking for certain SPI SD cards & more	2025-09-12 16:24:22 +02:00
Ken Van Hoeylandt	068600f98c	Post release changes (#326 ) - Updated version to `0.6.0-dev` - Updated docs - Updated external app SDK version to `0.5.0`	2025-09-07 17:25:20 +02:00