Update version to 0.6.0 (#400)

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.

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

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

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

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

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

@@ -36,14 +36,16 @@ runs:
         WLR_LIBINPUT_NO_DEVICES: 1
         WAYLAND_DISPLAY: wayland-1
         GTK_USE_PORTAL: 0
-    - name: "Configure Project"
+    - name: Setup cmake
-      uses: threeal/cmake-action@v1.3.0
+      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 }}

.github/workflows/build-firmware.yml

@@ -4,161 +4,51 @@ on:
     branches:
       - main
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [ opened, synchronize, reopened ]
 
 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
+          board_id: ${{ matrix.board.id }}
-          arch: esp32
+          arch: ${{ matrix.board.arch }}
-  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
-  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

.github/workflows/build-sdk.yml

@@ -4,26 +4,23 @@ on:
     branches:
       - main
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [ opened, synchronize, reopened ]
 
 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
+          board_id: ${{ matrix.board.id }}
-          arch: esp32
+          arch: ${{ matrix.board.arch }}
-  esp32s3:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: "Build"
-        uses: ./.github/actions/build-sdk
-        with:
-          board_id: lilygo-tdeck
-          arch: esp32s3

.github/workflows/build-simulator.yml

@@ -5,9 +5,9 @@ on:
     branches:
       - main
   pull_request:
-    types: [opened, synchronize, reopened]
+    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

.github/workflows/tests.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:
-  Run:
+  run:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout repo"

.gitignore

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

.gitmodules

@@ -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

App/Source/Boards.h

@@ -1,70 +0,0 @@
-#pragma once
-
-#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_CYD_2432S024C)
-#include "CYD2432S024C.h"
-#define TT_BOARD_HARDWARE &cyd_2432s024c_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

App/Source/HelloWorld/HelloWorld.cpp

@@ -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>
-};

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

@@ -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;

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

@@ -1,36 +0,0 @@
-#include "YellowDisplay.h"
-#include "Cst816Touch.h"
-#include "YellowDisplayConstants.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;
-
-    return std::make_shared<Ili934xDisplay>(std::move(configuration));
-}

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

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

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

@@ -1,13 +0,0 @@
-#pragma once
-
-#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
-

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

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

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

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

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

@@ -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;

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

@@ -1,39 +0,0 @@
-#include "CydDisplay.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;
-
-    return std::make_shared<Ili934xDisplay>(std::move(configuration));
-}

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

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

Boards/CYD-4848S040C/CMakeLists.txt

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

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

@@ -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;

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

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

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

@@ -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;

Boards/CYD-JC2432W328C/Source/JC2432W328C.h

@@ -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;

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

@@ -1,38 +0,0 @@
-#include "YellowDisplay.h"
-#include "Cst816Touch.h"
-#include "YellowDisplayConstants.h"
-
-#include <St7789Display.h>
-#include <PwmBacklight.h>
-
-static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
-    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<St7789Display::Configuration>(
-        JC2432W328C_LCD_SPI_HOST,
-        JC2432W328C_LCD_PIN_CS,
-        JC2432W328C_LCD_PIN_DC,
-        JC2432W328C_LCD_HORIZONTAL_RESOLUTION,
-        JC2432W328C_LCD_VERTICAL_RESOLUTION,
-        touch,
-        false,
-        false,
-        false,
-        false,
-        JC2432W328C_LCD_DRAW_BUFFER_SIZE
-    );
-
-    configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
-
-    return std::make_shared<St7789Display>(std::move(configuration));
-}

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

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

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

@@ -1,14 +0,0 @@
-#pragma once
-
-// 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
-

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

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

Boards/CYD-JC8048W550C/Source/JC8048W550C.h

@@ -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;

Boards/ElecrowCrowpanelAdvance28/Source/CrowPanelAdvance28.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration crowpanel_advance_28;

Boards/ElecrowCrowpanelAdvance28/Source/hal/CrowPanelDisplay.cpp

@@ -1,43 +0,0 @@
-#include "CrowPanelDisplay.h"
-#include "CrowPanelDisplayConstants.h"
-
-#include <Ft5x06Touch.h>
-#include <PwmBacklight.h>
-#include <St7789Display.h>
-
-#define TAG "crowpanel_display"
-
-static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
-    // Note for future changes: Reset pin is 48 and interrupt pin is 47
-    auto configuration = std::make_unique<Ft5x06Touch::Configuration>(
-        I2C_NUM_0,
-        240,
-        320,
-        true,
-        true,
-        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,
-        320,
-        240,
-        touch,
-        true,
-        true,
-        false,
-        true
-    );
-
-    configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
-
-    return std::make_shared<St7789Display>(std::move(configuration));
-}

Boards/ElecrowCrowpanelAdvance28/Source/hal/CrowPanelDisplay.h

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

Boards/ElecrowCrowpanelAdvance28/Source/hal/CrowPanelDisplayConstants.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#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)

Boards/ElecrowCrowpanelAdvance35/Source/CrowPanelAdvance35.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration crowpanel_advance_35;

Boards/ElecrowCrowpanelAdvance35/Source/hal/CrowPanelDisplay.h

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

Boards/ElecrowCrowpanelAdvance50/Source/CrowPanelAdvance50.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration crowpanel_advance_50;

Boards/ElecrowCrowpanelBasic28/Source/CrowPanelBasic28.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration crowpanel_basic_28;

Boards/ElecrowCrowpanelBasic28/Source/hal/CrowPanelDisplay.cpp

@@ -1,39 +0,0 @@
-#include "CrowPanelDisplay.h"
-#include "CrowPanelDisplayConstants.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;
-
-    return std::make_shared<Ili934xDisplay>(std::move(configuration));
-}

Boards/ElecrowCrowpanelBasic28/Source/hal/CrowPanelDisplay.h

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

Boards/ElecrowCrowpanelBasic28/Source/hal/CrowPanelDisplayConstants.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#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)

Boards/ElecrowCrowpanelBasic35/Source/CrowPanelBasic35.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration crowpanel_basic_35;

Boards/ElecrowCrowpanelBasic35/Source/hal/CrowPanelDisplay.h

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

Boards/ElecrowCrowpanelBasic50/Source/CrowPanelBasic50.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration crowpanel_basic_50;

Boards/ElecrowCrowpanelBasic50/Source/hal/CrowPanelSdCard.cpp

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

Boards/LilygoTdeck/Source/LilygoTdeck.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration lilygo_tdeck;

Boards/LilygoTdeck/Source/hal/TdeckDisplay.cpp

@@ -1,45 +0,0 @@
-#include "TdeckDisplay.h"
-#include "TdeckDisplayConstants.h"
-
-#include <Gt911Touch.h>
-#include <PwmBacklight.h>
-#include <St7789Display.h>
-
-#include <driver/spi_master.h>
-
-#define TAG "tdeck_display"
-
-static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
-    // Note for future changes: Reset pin is 48 and interrupt pin is 47
-    auto configuration = std::make_unique<Gt911Touch::Configuration>(
-        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;
-
-    return std::make_shared<St7789Display>(std::move(configuration));
-}

Boards/LilygoTdeck/Source/hal/TdeckDisplay.h

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

Boards/LilygoTdeck/Source/hal/TdeckDisplayConstants.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#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)

Boards/LilygoTdeck/Source/hal/TdeckKeyboard.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/keyboard/KeyboardDevice.h>
-#include <Tactility/TactilityCore.h>
-#include <esp_lcd_panel_io_interface.h>
-#include <esp_lcd_touch.h>
-
-class TdeckKeyboard : public tt::hal::keyboard::KeyboardDevice {
-
-private:
-
-    lv_indev_t* _Nullable deviceHandle = nullptr;
-
-public:
-
-    std::string getName() const final { return "T-Deck Keyboard"; }
-    std::string getDescription() const final { return "I2C keyboard"; }
-
-    bool start(lv_display_t* display) override;
-    bool stop() override;
-    bool isAttached() const override;
-    lv_indev_t* _Nullable getLvglIndev() override { return deviceHandle; }
-};
-
-std::shared_ptr<tt::hal::keyboard::KeyboardDevice> createKeyboard();

Boards/LilygoTdeck/Source/hal/TdeckPower.cpp

@@ -1,130 +0,0 @@
-#include "TdeckPower.h"
-
-#include <Tactility/Log.h>
-
-#define TAG "power"
-
-/**
- * 2.0 ratio, but +.11 added as display voltage sag compensation.
- */
-#define ADC_MULTIPLIER 2.11
-
-#define ADC_REF_VOLTAGE 3.3f
-#define BATTERY_VOLTAGE_MIN 3.2f
-#define BATTERY_VOLTAGE_MAX 4.2f
-
-static adc_oneshot_unit_init_cfg_t adcConfig = {
-    .unit_id = ADC_UNIT_1,
-    .clk_src = ADC_RTC_CLK_SRC_DEFAULT,
-    .ulp_mode = ADC_ULP_MODE_DISABLE,
-};
-
-static adc_oneshot_chan_cfg_t adcChannelConfig = {
-    .atten = ADC_ATTEN_DB_12,
-    .bitwidth = ADC_BITWIDTH_DEFAULT,
-};
-
-static uint8_t estimateChargeLevelFromVoltage(uint32_t milliVolt) {
-    float volts = std::min((float)milliVolt / 1000.f, BATTERY_VOLTAGE_MAX);
-    float voltage_percentage = (volts - BATTERY_VOLTAGE_MIN) / (BATTERY_VOLTAGE_MAX - BATTERY_VOLTAGE_MIN);
-    float voltage_factor = std::min(1.0f, voltage_percentage);
-    auto charge_level = (uint8_t) (voltage_factor * 100.f);
-    TT_LOG_V(TAG, "mV = %lu, scaled = %.2f, factor = %.2f, result = %d", milliVolt, volts, voltage_factor, charge_level);
-    return charge_level;
-}
-
-TdeckPower::TdeckPower() {
-    if (adc_oneshot_new_unit(&adcConfig, &adcHandle) != ESP_OK) {
-        TT_LOG_E(TAG, "ADC config failed");
-        return;
-    }
-
-    if (adc_oneshot_config_channel(adcHandle, ADC_CHANNEL_3, &adcChannelConfig) != ESP_OK) {
-        TT_LOG_E(TAG, "ADC channel config failed");
-
-        adc_oneshot_del_unit(adcHandle);
-        return;
-    }
-}
-
-TdeckPower::~TdeckPower() {
-    if (adcHandle) {
-        adc_oneshot_del_unit(adcHandle);
-    }
-}
-
-bool TdeckPower::supportsMetric(MetricType type) const {
-    switch (type) {
-        using enum MetricType;
-        case BatteryVoltage:
-        case ChargeLevel:
-            return true;
-        default:
-            return false;
-    }
-
-    return false; // Safety guard for when new enum values are introduced
-}
-
-bool TdeckPower::getMetric(MetricType type, MetricData& data) {
-    switch (type) {
-        using enum MetricType;
-        case BatteryVoltage:
-            return readBatteryVoltageSampled(data.valueAsUint32);
-        case ChargeLevel:
-            if (readBatteryVoltageSampled(data.valueAsUint32)) {
-                data.valueAsUint32 = estimateChargeLevelFromVoltage(data.valueAsUint32);
-                return true;
-            } else {
-                return false;
-            }
-        default:
-            return false;
-    }
-
-    return false; // Safety guard for when new enum values are introduced
-}
-
-bool TdeckPower::readBatteryVoltageOnce(uint32_t& output) {
-    int raw;
-    if (adc_oneshot_read(adcHandle, ADC_CHANNEL_3, &raw) == ESP_OK) {
-        output = ADC_MULTIPLIER * ((1000.f * ADC_REF_VOLTAGE) / 4096.f) * (float)raw;
-        TT_LOG_V(TAG, "Raw = %d, voltage = %lu", raw, output);
-        return true;
-    } else {
-        TT_LOG_E(TAG, "Read failed");
-        return false;
-    }
-}
-
-#define MAX_VOLTAGE_SAMPLES 15
-
-bool TdeckPower::readBatteryVoltageSampled(uint32_t& output) {
-    size_t samples_read = 0;
-    uint32_t sample_accumulator = 0;
-    uint32_t sample_read_buffer;
-
-    for (size_t i = 0; i < MAX_VOLTAGE_SAMPLES; ++i) {
-        if (readBatteryVoltageOnce(sample_read_buffer)) {
-            sample_accumulator += sample_read_buffer;
-            samples_read++;
-        }
-    }
-
-    if (samples_read > 0) {
-        output = sample_accumulator / samples_read;
-        return true;
-    } else {
-        return false;
-    }
-}
-
-static std::shared_ptr<PowerDevice> power;
-
-std::shared_ptr<PowerDevice> tdeck_get_power() {
-    if (power == nullptr) {
-        power = std::make_shared<TdeckPower>();
-    }
-    return power;
-}
-

Boards/LilygoTdeck/Source/hal/TdeckPower.h

@@ -1,30 +0,0 @@
-#pragma once
-
-#include "Tactility/hal/power/PowerDevice.h"
-#include <esp_adc/adc_oneshot.h>
-#include <memory>
-
-using tt::hal::power::PowerDevice;
-
-class TdeckPower : public PowerDevice {
-
-    adc_oneshot_unit_handle_t adcHandle = nullptr;
-
-public:
-
-    TdeckPower();
-    ~TdeckPower();
-
-    std::string getName() const final { return "ADC Power Measurement"; }
-    std::string getDescription() const final { return "Power measurement interface via ADC pin"; }
-
-    bool supportsMetric(MetricType type) const override;
-    bool getMetric(MetricType type, MetricData& data) override;
-
-private:
-
-    bool readBatteryVoltageSampled(uint32_t& output);
-    bool readBatteryVoltageOnce(uint32_t& output);
-};
-
-std::shared_ptr<PowerDevice> tdeck_get_power();

Boards/LilygoTdeck/Source/hal/TdeckSdCard.cpp

@@ -1,33 +0,0 @@
-#include "TdeckSdCard.h"
-
-#include <Tactility/lvgl/LvglSync.h>
-#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
-
-#include <esp_vfs_fat.h>
-
-using tt::hal::sdcard::SpiSdCardDevice;
-
-#define TDECK_SDCARD_PIN_CS GPIO_NUM_39
-#define TDECK_LCD_PIN_CS GPIO_NUM_12
-#define TDECK_RADIO_PIN_CS GPIO_NUM_9
-
-std::shared_ptr<SdCardDevice> createTdeckSdCard() {
-    auto* configuration = new SpiSdCardDevice::Config(
-        TDECK_SDCARD_PIN_CS,
-        GPIO_NUM_NC,
-        GPIO_NUM_NC,
-        GPIO_NUM_NC,
-        SdCardDevice::MountBehaviour::AtBoot,
-        tt::lvgl::getSyncLock(),
-        {
-            TDECK_RADIO_PIN_CS,
-            TDECK_LCD_PIN_CS
-        }
-    );
-
-    auto* sdcard = (SdCardDevice*) new SpiSdCardDevice(
-        std::unique_ptr<SpiSdCardDevice::Config>(configuration)
-    );
-
-    return std::shared_ptr<SdCardDevice>(sdcard);
-}

Boards/M5stackCore2/Source/InitBoot.cpp

@@ -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>
-
-#define 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;
-}

Boards/M5stackCore2/Source/InitBoot.h

@@ -1,3 +0,0 @@
-#pragma once
-
-bool initBoot();

Boards/M5stackCore2/Source/M5stackCore2.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration m5stack_core2;

Boards/M5stackCore2/Source/hal/Core2Display.cpp

@@ -1,32 +0,0 @@
-#include "Core2Display.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
-    );
-
-    return std::make_shared<Ft6x36Touch>(std::move(configuration));
-}
-
-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
-    );
-
-    return std::make_shared<Ili934xDisplay>(std::move(configuration));
-}

Boards/M5stackCore2/Source/hal/Core2Display.h

@@ -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();

Boards/M5stackCore2/Source/hal/Core2Power.h

@@ -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();

Boards/M5stackCoreS3/Source/CoreS3Constants.h

@@ -1,4 +0,0 @@
-#pragma once
-
-#define AXP2101_ADDRESS 0x34
-#define AW9523_ADDRESS 0x58

Boards/M5stackCoreS3/Source/InitBoot.h

@@ -1,3 +0,0 @@
-#pragma once
-
-bool initBoot();

Boards/M5stackCoreS3/Source/M5stackCoreS3.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration m5stack_cores3;

Boards/M5stackCoreS3/Source/hal/CoreS3Display.cpp

@@ -1,50 +0,0 @@
-#include "CoreS3Display.h"
-
-#include "CoreS3Constants.h"
-
-#include <Ft5x06Touch.h>
-#include <Ili934xDisplay.h>
-#include <Tactility/Log.h>
-#include <Tactility/hal/i2c/I2c.h>
-
-#define TAG "cores3"
-
-static void setBacklightDuty(uint8_t backlightDuty) {
-    const uint8_t voltage = 20 + ((8 * backlightDuty) / 255); // [0b00000, 0b11100] - under 20 is too dark
-    // TODO: Refactor to use Axp2102 driver subproject. Reference: https://github.com/m5stack/M5Unified/blob/b8cfec7fed046242da7f7b8024a4e92004a51ff7/src/utility/AXP2101_Class.cpp#L42
-    if (!tt::hal::i2c::masterWriteRegister(I2C_NUM_0, AXP2101_ADDRESS, 0x99, &voltage, 1, 1000)) { // Sets DLD01
-        TT_LOG_E(TAG, "Failed to set display backlight voltage");
-    }
-}
-
-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,
-        320,
-        240
-    );
-
-    return std::make_shared<Ft5x06Touch>(std::move(configuration));
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-    auto touch = createTouch();
-
-    auto configuration = std::make_unique<Ili934xDisplay::Configuration>(
-        SPI3_HOST,
-        GPIO_NUM_3,
-        GPIO_NUM_35,
-        320,
-        240,
-        touch,
-        false,
-        false,
-        false,
-        true
-    );
-
-    configuration->backlightDutyFunction = ::setBacklightDuty;
-
-    return std::make_shared<Ili934xDisplay>(std::move(configuration));
-}

Boards/M5stackCoreS3/Source/hal/CoreS3DisplayConstants.h

@@ -1,10 +0,0 @@
-#pragma once
-
-// 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)

Boards/Simulator/Source/hal/SdlDisplay.h

@@ -1,31 +0,0 @@
-#pragma once
-
-#include "SdlTouch.h"
-#include "Tactility/hal/display/DisplayDevice.h"
-#include <memory>
-
-/** Hack: variable comes from LvglTask.cpp */
-extern lv_disp_t* displayHandle;
-
-class SdlDisplay final : public tt::hal::display::DisplayDevice {
-
-public:
-
-    std::string getName() const final { return "SDL Display"; }
-    std::string getDescription() const final { return ""; }
-
-    bool start() override {
-        return displayHandle != nullptr;
-    }
-
-    bool stop() override { tt_crash("Not supported"); }
-
-    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() override { return std::make_shared<SdlTouch>(); }
-
-    lv_display_t* _Nullable getLvglDisplay() const override { return displayHandle; }
-};
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-    return std::make_shared<SdlDisplay>();
-}
-

Boards/Simulator/Source/hal/SdlTouch.h

@@ -1,24 +0,0 @@
-#pragma once
-
-#include "Tactility/hal/touch/TouchDevice.h"
-#include <Tactility/TactilityCore.h>
-
-class SdlTouch final : public tt::hal::touch::TouchDevice {
-private:
-    lv_indev_t* _Nullable handle = nullptr;
-
-public:
-
-    std::string getName() const final { return "SDL Pointer"; }
-    std::string getDescription() const final { return "SDL mouse/touch pointer device"; }
-
-    bool start(lv_display_t* display) override {
-        handle = lv_sdl_mouse_create();
-        return handle != nullptr;
-    }
-
-    bool stop() override { tt_crash("Not supported"); }
-
-    lv_indev_t* _Nullable getLvglIndev() override { return handle; }
-};
-

Boards/UnPhone/Source/UnPhone.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration unPhone;

Boards/UnPhone/Source/hal/UnPhoneDisplay.cpp

@@ -1,73 +0,0 @@
-#include "UnPhoneDisplay.h"
-#include "UnPhoneDisplayConstants.h"
-#include "UnPhoneTouch.h"
-#include "UnPhoneFeatures.h"
-
-#include <Tactility/Log.h>
-
-#include <esp_err.h>
-#include <hx8357/disp_spi.h>
-#include <hx8357/hx8357.h>
-
-#define TAG "unphone_display"
-#define BUFFER_SIZE (UNPHONE_LCD_HORIZONTAL_RESOLUTION * UNPHONE_LCD_DRAW_BUFFER_HEIGHT * LV_COLOR_DEPTH / 8)
-
-extern std::shared_ptr<UnPhoneFeatures> unPhoneFeatures;
-
-bool UnPhoneDisplay::start() {
-    TT_LOG_I(TAG, "Starting");
-
-    disp_spi_add_device(SPI2_HOST);
-
-    hx8357_reset(GPIO_NUM_46);
-    hx8357_init(UNPHONE_LCD_PIN_DC);
-    uint8_t madctl = (1U << MADCTL_BIT_INDEX_COLUMN_ADDRESS_ORDER);
-    hx8357_set_madctl(madctl);
-
-    displayHandle = lv_display_create(UNPHONE_LCD_HORIZONTAL_RESOLUTION, UNPHONE_LCD_VERTICAL_RESOLUTION);
-    lv_display_set_physical_resolution(displayHandle, UNPHONE_LCD_HORIZONTAL_RESOLUTION, UNPHONE_LCD_VERTICAL_RESOLUTION);
-    lv_display_set_color_format(displayHandle, LV_COLOR_FORMAT_NATIVE);
-
-    // TODO malloc to use SPIRAM
-    buffer = (uint8_t*)heap_caps_malloc(BUFFER_SIZE, MALLOC_CAP_DMA);
-    assert(buffer != nullptr);
-
-    lv_display_set_buffers(
-        displayHandle,
-        buffer,
-        nullptr,
-        BUFFER_SIZE,
-        LV_DISPLAY_RENDER_MODE_PARTIAL
-    );
-
-    lv_display_set_flush_cb(displayHandle, hx8357_flush);
-
-    if (displayHandle != nullptr) {
-        TT_LOG_I(TAG, "Finished");
-        unPhoneFeatures->setBacklightPower(true);
-        return true;
-    } else {
-        TT_LOG_I(TAG, "Failed");
-        return false;
-    }
-}
-
-bool UnPhoneDisplay::stop() {
-    assert(displayHandle != nullptr);
-
-    lv_display_delete(displayHandle);
-    displayHandle = nullptr;
-
-    heap_caps_free(buffer);
-    buffer = nullptr;
-
-    return true;
-}
-
-std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable UnPhoneDisplay::createTouch() {
-    return ::createTouch();
-}
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
-    return std::make_shared<UnPhoneDisplay>();
-}

Boards/UnPhone/Source/hal/UnPhoneDisplay.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#include "Tactility/hal/display/DisplayDevice.h"
-#include <esp_lcd_types.h>
-#include <lvgl.h>
-
-class UnPhoneDisplay : public tt::hal::display::DisplayDevice {
-
-private:
-
-    lv_display_t* displayHandle = nullptr;
-    uint8_t* buffer = nullptr;
-
-public:
-
-    std::string getName() const final { return "HX8357"; }
-    std::string getDescription() const final { return "SPI display"; }
-
-    bool start() override;
-
-    bool stop() override;
-
-    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() override;
-
-    lv_display_t* _Nullable getLvglDisplay() const override { return displayHandle; }
-};
-
-std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/UnPhone/Source/hal/UnPhoneDisplayConstants.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#define UNPHONE_LCD_SPI_HOST SPI2_HOST
-#define UNPHONE_LCD_PIN_CS GPIO_NUM_48
-#define UNPHONE_LCD_PIN_DC GPIO_NUM_47
-#define UNPHONE_LCD_PIN_RESET GPIO_NUM_46
-#define UNPHONE_LCD_SPI_FREQUENCY 27000000
-#define UNPHONE_LCD_HORIZONTAL_RESOLUTION 320
-#define UNPHONE_LCD_VERTICAL_RESOLUTION 480
-#define UNPHONE_LCD_DRAW_BUFFER_HEIGHT (UNPHONE_LCD_VERTICAL_RESOLUTION / 15)
-#define UNPHONE_LCD_SPI_TRANSFER_HEIGHT (UNPHONE_LCD_VERTICAL_RESOLUTION / 15)

Boards/UnPhone/Source/hal/UnPhoneSdCard.h

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

Boards/WaveshareS3Touch43/Source/WaveshareS3Touch43.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <Tactility/hal/Configuration.h>
-
-extern const tt::hal::Configuration waveshare_s3_touch_43;

Boards/cyd-2432s024c/Source/Configuration.cpp

@@ -1,22 +1,34 @@
-#include "CYD2432S024C.h"
+#include "devices/Display.h"
-#include "hal/YellowDisplay.h"
+#include "devices/SdCard.h"
-#include "hal/YellowDisplayConstants.h"
-#include "hal/YellowSdCard.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() {
+    // 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
 
-bool initBoot() {
+    // 0 on, 1 off
-    return driver::pwmbacklight::init(TWODOTFOUR_LCD_PIN_BACKLIGHT);
+    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);
 }
 
-const tt::hal::Configuration cyd_2432s024c_config = {
+static tt::hal::DeviceVector createDevices() {
+    return {
+        createDisplay(),
+        createSdCard()
+    };
+}
+
+extern const tt::hal::Configuration hardwareConfiguration = {
     .initBoot = initBoot,
-    .createDisplay = createDisplay,
+    .createDevices = createDevices,
-    .sdcard = createYellowSdCard(),
-    .power = nullptr,
     .i2c = {
         tt::hal::i2c::Configuration {
             .name = "First",
@@ -68,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

Boards/cyd-2432s024c/Source/devices/Display.cpp

@@ -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);
+}

Boards/cyd-2432s024c/Source/devices/Display.h

@@ -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();

Boards/cyd-2432s024c/Source/devices/SdCard.cpp

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

Boards/cyd-2432s028r/CMakeLists.txt

@@ -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 ILI934x XPT2046SoftSPI PwmBacklight driver vfs fatfs
+)

Boards/cyd-2432s028r/Source/Configuration.cpp

@@ -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,
+                }
+            }
+        }
+    }
+};

Boards/cyd-2432s028r/Source/devices/Display.cpp

@@ -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);
+}

Boards/cyd-2432s028r/Source/devices/Display.h

@@ -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();

Boards/cyd-2432s028r/Source/devices/SdCard.cpp

@@ -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));
+}
+

Boards/cyd-2432s028rv3/CMakeLists.txt

@@ -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
+)

Boards/cyd-2432s028rv3/Source/Configuration.cpp

@@ -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,
+                }
+            }
+        }
+    }
+};

Boards/cyd-2432s028rv3/Source/devices/Display.cpp

@@ -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);
+}

Boards/cyd-2432s028rv3/Source/devices/Display.h

@@ -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();

Boards/cyd-2432s028rv3/Source/devices/SdCard.cpp

@@ -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));
+}
+

Boards/cyd-2432s028rv3/Source/devices/SdCard.h

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

Boards/cyd-2432s032c/Source/Configuration.cpp

@@ -0,0 +1,117 @@
+#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(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) {
+        auto display = tt::hal::findFirstDevice<tt::hal::display::DisplayDevice>(tt::hal::Device::Type::Display);
+        assert(display != nullptr);
+        tt::lvgl::lock(portMAX_DELAY);
+        display->setGammaCurve(1U);
+        tt::lvgl::unlock();
+    });
+
+    return true;
+}
+
+static tt::hal::DeviceVector createDevices() {
+    return {
+        createDisplay(),
+        createSdCard()
+    };
+}
+
+extern const tt::hal::Configuration hardwareConfiguration = {
+    .initBoot = initBoot,
+    .createDevices = createDevices,
+    .i2c = {
+        tt::hal::i2c::Configuration {
+            .name = "Internal",
+            .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_33,
+                .scl_io_num = GPIO_NUM_32,
+                .sda_pullup_en = false,
+                .scl_pullup_en = false,
+                .master = {
+                    .clk_speed = 400000
+                },
+                .clk_flags = 0
+            }
+        }
+    },
+    .spi {
+        // Display
+        tt::hal::spi::Configuration {
+            .device = SPI2_HOST,
+            .dma = SPI_DMA_CH_AUTO,
+            .config = {
+                .mosi_io_num = GPIO_NUM_13,
+                .miso_io_num = GPIO_NUM_NC,
+                .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 = tt::hal::spi::InitMode::ByTactility,
+            .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,
+            .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 = tt::hal::spi::InitMode::ByTactility,
+            .isMutable = false,
+            .lock = nullptr
+        },
+    }
+};

Boards/cyd-2432s032c/Source/devices/Display.cpp

@@ -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);
+}

Boards/cyd-2432s032c/Source/devices/Display.h

@@ -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();

Boards/cyd-2432s032c/Source/devices/SdCard.cpp

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

Boards/cyd-2432s032c/Source/devices/SdCard.h

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

Boards/cyd-4848s040c/CMakeLists.txt

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

Boards/cyd-4848s040c/Source/Configuration.cpp

@@ -1,20 +1,27 @@
-#include "CYD4848S040C.h"
+#include "devices/St7701Display.h"
-#include "hal/CydDisplay.h"
+#include "devices/SdCard.h"
-#include "hal/CydSdCard.h"
 
+#include <Tactility/hal/Configuration.h>
+#include <Tactility/kernel/SystemEvents.h>
+#include <Tactility/lvgl/LvglSync.h>
 #include <PwmBacklight.h>
 
 using namespace tt::hal;
 
-bool initBoot() {
+static bool initBoot() {
     return driver::pwmbacklight::init(GPIO_NUM_38, 1000);
 }
 
-const Configuration cyd_4848s040c_config = {
+static DeviceVector createDevices() {
+    return {
+        std::make_shared<St7701Display>(),
+        createSdCard()
+    };
+}
+
+extern const Configuration hardwareConfiguration = {
     .initBoot = initBoot,
-    .createDisplay = createDisplay,
+    .createDevices = createDevices,
-    .sdcard = createSdCard(),
-    .power = nullptr,
     .i2c = {
         //Touch
         i2c::Configuration {
@@ -54,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,
@@ -63,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()
         }
     }
 };

Boards/cyd-4848s040c/Source/devices/SdCard.cpp

@@ -1,4 +1,4 @@
-#include "CydSdCard.h"
+#include "SdCard.h"
 
 #include <Tactility/hal/sdcard/SpiSdCardDevice.h>
 #include <Tactility/lvgl/LvglSync.h>
@@ -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>(

Boards/cyd-4848s040c/Source/devices/SdCard.h

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