CYD-E28R28T Implementation

.github/workflows/build-firmware.yml

@@ -18,6 +18,15 @@ jobs:
         with:
           board_id: cyd-2432s024c
           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-2432s028r:
     runs-on: ubuntu-latest
     steps:
@@ -179,4 +188,4 @@ jobs:
         uses: ./.github/actions/build-firmware
         with:
           board_id: waveshare-s3-touch-43
-          arch: esp32s3
+          arch: esp32s3

.gitignore

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

App/Kconfig

@@ -13,6 +13,8 @@ menu "Tactility App"
             bool "Custom"
         config TT_BOARD_CYD_2432S024C
             bool "CYD 2432S024C"
+        config TT_BOARD_CYD_E32R28T
+            bool "CYD E32R28T"    
         config TT_BOARD_CYD_2432S028R
             bool "CYD 2432S028R"
         config TT_BOARD_CYD_2432S032C

App/Source/Boards.h

@@ -14,6 +14,9 @@
 #elif defined(CONFIG_TT_BOARD_CYD_2432S024C)
 #include "CYD2432S024C.h"
 #define TT_BOARD_HARDWARE &cyd_2432s024c_config
+#elif defined(CONFIG_TT_BOARD_CYD_E32R28T)
+#include "E32R28T.h"
+#define TT_BOARD_HARDWARE &cyd_e32r28t_config
 #elif defined(CONFIG_TT_BOARD_CYD_2432S028R)
 #include "CYD2432S028R.h"
 #define TT_BOARD_HARDWARE &cyd_2432s028r_config

Boards/CYD-E32R28T/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 XPT2046 PwmBacklight driver vfs fatfs
+)

Boards/CYD-E32R28T/Source/E32R28T.cpp

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

Boards/CYD-E32R28T/Source/E32R28T.h

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

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

@@ -0,0 +1,51 @@
+#include "YellowDisplay.h"
+#include "YellowDisplayConstants.h"
+#include "Xpt2046Touch.h"
+#include <Ili934xDisplay.h>
+#include <PwmBacklight.h>
+#include <Tactility/hal/touch/TouchDevice.h>
+#include <esp_log.h>
+#include <memory>
+
+static const char* TAG = "YellowDisplay";
+
+// Global to hold reference if needed (is this needed?)
+static std::shared_ptr<Xpt2046Touch> touch;
+
+static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
+    ESP_LOGI(TAG, "Creating SPI touch");
+
+    // Create configuration object
+    auto config = std::make_unique<Xpt2046Touch::Configuration>(
+        CYD_DISPLAY_SPI_HOST,   // SPI bus handle
+        CYD_TOUCH_CS_PIN,       // Chip select
+        CYD_DISPLAY_HORIZONTAL_RESOLUTION, // xMax
+        CYD_DISPLAY_VERTICAL_RESOLUTION,   // yMax
+        false,  // swapXY
+        true,   // mirrorX
+        false   // mirrorY
+    );
+
+    // Allocate driver
+    touch = std::make_shared<Xpt2046Touch>(std::move(config));
+
+    // No explicit start() required for Xpt2046Touch
+    return std::static_pointer_cast<tt::hal::touch::TouchDevice>(touch);
+}
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
+    auto touch_device = createTouch();
+    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,
+        touch_device
+    );
+    configuration->mirrorX = true;
+    configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
+    configuration->rgbElementOrder = LCD_RGB_ELEMENT_ORDER_BGR;
+
+    return std::make_shared<Ili934xDisplay>(std::move(configuration));
+}

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

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

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

@@ -0,0 +1,25 @@
+#pragma once
+
+// 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
+
+// SD Card
+#define CYD_SDCARD_SPI_HOST SPI3_HOST
+#define CYD_SDCARD_PIN_CS GPIO_NUM_5
+
+
+// Backlight
+#define CYD_BACKLIGHT_PIN GPIO_NUM_21

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

@@ -0,0 +1,22 @@
+#include "YellowSdCard.h"
+#include "YellowDisplayConstants.h"
+#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
+
+using tt::hal::sdcard::SpiSdCardDevice;
+
+std::shared_ptr<SdCardDevice> createYellowSdCard() {
+    auto* configuration = new SpiSdCardDevice::Config(
+        CYD_SDCARD_PIN_CS,
+        GPIO_NUM_NC, // No card detect pin specified
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        SdCardDevice::MountBehaviour::AtBoot,
+        std::make_shared<tt::Mutex>(),
+        std::vector<gpio_num_t>(),
+        CYD_SDCARD_SPI_HOST
+    );
+
+    return std::shared_ptr<SdCardDevice>(
+        new SpiSdCardDevice(std::unique_ptr<SpiSdCardDevice::Config>(configuration))
+    );
+}

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

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

Buildscripts/board.cmake

@@ -23,8 +23,12 @@ function(INIT_TACTILITY_GLOBALS SDKCONFIG_FILE)
 
     if (board_id STREQUAL "cyd-2432s024c")
         set(TACTILITY_BOARD_PROJECT CYD-2432S024C)
+    elseif (board_id STREQUAL "cyd-2432s022c")
+        set(TACTILITY_BOARD_PROJECT CYD-2432S022C)
     elseif (board_id STREQUAL "cyd-2432s028r")
-        set(TACTILITY_BOARD_PROJECT CYD-2432S028R)
+        set(TACTILITY_BOARD_PROJECT CYD-2432S028R)    
+    elseif (board_id STREQUAL "cyd-e32r28t")
+        set(TACTILITY_BOARD_PROJECT CYD-E32R28T)   
     elseif (board_id STREQUAL "cyd-2432s032c")
         set(TACTILITY_BOARD_PROJECT CYD-2432S032C)
     elseif (board_id STREQUAL "cyd-4848s040c")

Drivers/EspLcdCompat/Source/EspLcdDisplay.h

@@ -8,7 +8,7 @@
 #include <esp_lvgl_port_disp.h>
 #include <Tactility/Check.h>
 
-class EspLcdDisplay : tt::hal::display::DisplayDevice {
+class EspLcdDisplay : public tt::hal::display::DisplayDevice {
 
     esp_lcd_panel_io_handle_t _Nullable ioHandle = nullptr;
     esp_lcd_panel_handle_t _Nullable panelHandle = nullptr;

sdkconfig.board.cyd-e32r28t

@@ -0,0 +1,56 @@
+# Software defaults
+CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=3072
+CONFIG_LV_FONT_MONTSERRAT_14=y
+CONFIG_LV_FONT_MONTSERRAT_18=y
+CONFIG_LV_USE_USER_DATA=y
+CONFIG_LV_USE_FS_STDIO=y
+CONFIG_LV_FS_STDIO_LETTER=65
+CONFIG_LV_FS_STDIO_PATH=""
+CONFIG_LV_FS_STDIO_CACHE_SIZE=4096
+CONFIG_LV_USE_LODEPNG=y
+CONFIG_LV_USE_BUILTIN_MALLOC=n
+CONFIG_LV_USE_CLIB_MALLOC=y
+CONFIG_LV_USE_MSGBOX=n
+CONFIG_LV_USE_SPINNER=n
+CONFIG_LV_USE_WIN=n
+CONFIG_LV_USE_SNAPSHOT=y
+CONFIG_FREERTOS_HZ=1000
+CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2
+CONFIG_FREERTOS_SMP=n
+CONFIG_FREERTOS_UNICORE=n
+CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=4096
+CONFIG_FREERTOS_USE_TRACE_FACILITY=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+CONFIG_FATFS_LFN_HEAP=y
+CONFIG_FATFS_VOLUME_COUNT=3
+
+# Hardware: Main
+CONFIG_TT_BOARD_CYD_E32R28T=y
+CONFIG_TT_BOARD_NAME="CYD E32R28T"
+CONFIG_TT_BOARD_ID="cyd-e32r28t"
+CONFIG_IDF_TARGET="esp32"
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_FLASHMODE_QIO=y
+
+# LVGL
+CONFIG_LV_DISP_DEF_REFR_PERIOD=10
+CONFIG_LV_DPI_DEF=130  # Adjusted for 2.8" 240x320 (~130 DPI)
+CONFIG_LVGL_BUFFER_WIDTH=240
+CONFIG_LVGL_BUFFER_HEIGHT=40
+CONFIG_LVGL_COLOR_DEPTH=16
+
+# Drivers
+CONFIG_DISPLAY_DRIVER_ILI9341=y
+CONFIG_TOUCH_DRIVER_XPT2046=y
+CONFIG_TOUCH_CALIBRATION=y
+CONFIG_SD_CARD_ENABLE=y
+
+# Fix for IRAM
+CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
+CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH=y
+CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y