New waveshare boards + GC9A01 Display driver (#333)

2025-09-14 20:12:56 +10:00
parent 095c8146c3
commit 7027da00b8
26 changed files with 746 additions and 0 deletions
@@ -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 CST816S PwmBacklight driver
+)
@@ -0,0 +1,94 @@
+#include "devices/Display.h"
+#include "devices/SdCard.h"
+
+#include <PwmBacklight.h>
+#include <Tactility/hal/Configuration.h>
+#include <Tactility/lvgl/LvglSync.h>
+
+using namespace tt::hal;
+
+static DeviceVector createDevices() {
+    return {
+        createDisplay(),
+        createSdCard()
+    };
+}
+
+static bool initBoot() {
+    return driver::pwmbacklight::init(GPIO_NUM_20, 256);
+}
+
+extern const Configuration waveshare_s3_lcd_13 = {
+    .initBoot = initBoot,
+    .createDevices = createDevices,
+    .i2c = {
+        //IMU
+        i2c::Configuration {
+            .name = "Main",
+            .port = I2C_NUM_0,
+            .initMode = i2c::InitMode::ByTactility,
+            .isMutable = false,
+            .config = (i2c_config_t) {
+                .mode = I2C_MODE_MASTER,
+                .sda_io_num = GPIO_NUM_47,
+                .scl_io_num = GPIO_NUM_48,
+                .sda_pullup_en = true,
+                .scl_pullup_en = true,
+                .master = {
+                    .clk_speed = 400000
+                },
+                .clk_flags = 0
+            }
+        }
+    },
+    .spi {
+        // Display
+        spi::Configuration {
+            .device = SPI2_HOST,
+            .dma = SPI_DMA_DISABLED,
+            .config = {
+                .mosi_io_num = GPIO_NUM_41,
+                .miso_io_num = GPIO_NUM_NC,
+                .sclk_io_num = GPIO_NUM_40,
+                .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 = ((240 * (240 / 10)) * LV_COLOR_DEPTH / 8),
+                .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
+        },
+        // SD card
+         spi::Configuration {
+            .device = SPI3_HOST,
+            .dma = SPI_DMA_CH_AUTO,
+            .config = {
+                .mosi_io_num = GPIO_NUM_18,
+                .miso_io_num = GPIO_NUM_16,
+                .sclk_io_num = GPIO_NUM_21,
+                .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 = 32768,
+                .flags = 0,
+                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
+                .intr_flags = 0
+            },
+            .initMode = spi::InitMode::ByTactility,
+            .isMutable = false,
+            .lock = nullptr // No custom lock needed
+        }
+    }
+};
@@ -0,0 +1,5 @@
+#pragma once
+
+#include <Tactility/hal/Configuration.h>
+
+extern const tt::hal::Configuration waveshare_s3_lcd_13;
@@ -0,0 +1,27 @@
+#include "Display.h"
+
+#include <PwmBacklight.h>
+#include <St7789Display.h>
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
+
+    auto configuration = std::make_unique<St7789Display::Configuration>(
+        SPI2_HOST,
+        GPIO_NUM_39,
+        GPIO_NUM_38,
+        240,
+        240,
+        nullptr,
+        false,
+        false,
+        false,
+        true
+    );
+
+
+    configuration->resetPin = GPIO_NUM_42;
+    configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
+
+    auto display = std::make_shared<St7789Display>(std::move(configuration));
+    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
+}
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "Tactility/hal/display/DisplayDevice.h"
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -0,0 +1,23 @@
+#include "SdCard.h"
+
+#include <Tactility/lvgl/LvglSync.h>
+#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
+
+using tt::hal::sdcard::SpiSdCardDevice;
+
+std::shared_ptr<SdCardDevice> createSdCard() {
+    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
+        GPIO_NUM_17,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        SdCardDevice::MountBehaviour::AtBoot,
+        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
+        std::vector<gpio_num_t>(),
+        SPI3_HOST
+    );
+
+    return std::make_shared<SpiSdCardDevice>(
+        std::move(configuration)
+    );
+}
@@ -0,0 +1,7 @@
+#pragma once
+
+#include "Tactility/hal/sdcard/SdCardDevice.h"
+
+using tt::hal::sdcard::SdCardDevice;
+
+std::shared_ptr<SdCardDevice> createSdCard();
@@ -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 GC9A01 CST816S PwmBacklight driver
+)
@@ -0,0 +1,97 @@
+#include "devices/Display.h"
+#include "devices/SdCard.h"
+
+#include <PwmBacklight.h>
+#include <Tactility/hal/Configuration.h>
+#include <Tactility/lvgl/LvglSync.h>
+
+using namespace tt::hal;
+
+constexpr auto* TAG = "Waveshare";
+
+static DeviceVector createDevices() {
+    return {
+        createDisplay(),
+        createSdCard()
+    };
+}
+
+static bool initBoot() {
+    return driver::pwmbacklight::init(GPIO_NUM_2, 256);
+}
+
+extern const Configuration waveshare_s3_touch_lcd_128 = {
+    .initBoot = initBoot,
+    .createDevices = createDevices,
+    .i2c = {
+        i2c::Configuration {
+            .name = "Main",
+            .port = I2C_NUM_0,
+            .initMode = i2c::InitMode::ByTactility,
+            .isMutable = false,
+            .config = (i2c_config_t) {
+                .mode = I2C_MODE_MASTER,
+                .sda_io_num = GPIO_NUM_6,
+                .scl_io_num = GPIO_NUM_7,
+                .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_DISABLED,
+            .config = {
+                .mosi_io_num = GPIO_NUM_11,
+                .miso_io_num = GPIO_NUM_12,
+                .sclk_io_num = GPIO_NUM_10,
+                .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 = ((240 * (240 / 10)) * LV_COLOR_DEPTH / 8),
+                .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
+        },
+        // SD card available via external sd card module and uses VSYS (5V) / GND / IO15 / IO16 / IO17 / IO18 pins.
+        // Common micro sd card module you'd find on aliexpress with voltage regulator onboard. Others may work.
+        // JST SH 1.0 Header, GND / VSYS (5V) / RESET / BOOT / GND / 3.3V / IO15 / IO16 / IO17 / IO18 / IO21 / IO33
+         spi::Configuration {
+            .device = SPI3_HOST,
+            .dma = SPI_DMA_CH_AUTO,
+            .config = {
+                .mosi_io_num = GPIO_NUM_16,
+                .miso_io_num = GPIO_NUM_15,
+                .sclk_io_num = GPIO_NUM_17,
+                .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 = 32768,
+                .flags = 0,
+                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
+                .intr_flags = 0
+            },
+            .initMode = spi::InitMode::ByTactility,
+            .isMutable = false,
+            .lock = nullptr // No custom lock needed
+        }
+    }
+};
@@ -0,0 +1,5 @@
+#pragma once
+
+#include <Tactility/hal/Configuration.h>
+
+extern const tt::hal::Configuration waveshare_s3_touch_lcd_128;
@@ -0,0 +1,45 @@
+#include "Display.h"
+
+#include <Cst816Touch.h>
+#include <PwmBacklight.h>
+#include <Gc9a01Display.h>
+
+std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() {
+    auto configuration = std::make_unique<Cst816sTouch::Configuration>(
+        I2C_NUM_0,
+        240,
+        240,
+        false,
+        true,
+        false,
+        GPIO_NUM_13,
+        GPIO_NUM_5
+    );
+
+    return std::make_shared<Cst816sTouch>(std::move(configuration));
+}
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
+    auto touch = createTouch();
+
+    auto configuration = std::make_unique<Gc9a01Display::Configuration>(
+        SPI2_HOST,
+        GPIO_NUM_9,
+        GPIO_NUM_8,
+        240,
+        240,
+        touch,
+        false,
+        false,
+        true,
+        true,
+        0,
+        LCD_RGB_ELEMENT_ORDER_BGR
+    );
+
+    configuration->resetPin = GPIO_NUM_14;
+    configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
+
+    auto display = std::make_shared<Gc9a01Display>(std::move(configuration));
+    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
+}
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "Tactility/hal/display/DisplayDevice.h"
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
@@ -0,0 +1,23 @@
+#include "SdCard.h"
+
+#include <Tactility/lvgl/LvglSync.h>
+#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
+
+using tt::hal::sdcard::SpiSdCardDevice;
+
+std::shared_ptr<SdCardDevice> createSdCard() {
+    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
+        GPIO_NUM_18,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        SdCardDevice::MountBehaviour::AtBoot,
+        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
+        std::vector<gpio_num_t>(),
+        SPI3_HOST
+    );
+
+    return std::make_shared<SpiSdCardDevice>(
+        std::move(configuration)
+    );
+}
@@ -0,0 +1,7 @@
+#pragma once
+
+#include "Tactility/hal/sdcard/SdCardDevice.h"
+
+using tt::hal::sdcard::SdCardDevice;
+
+std::shared_ptr<SdCardDevice> createSdCard();