diff --git a/README.md b/README.md index a53634a..3ae0728 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,33 @@ # CYD LD2420 雷达仪表盘 -ESP32 Cheap Yellow Display（ESP32-2432S028R）+ HLK-LD2420 24GHz 毫米波雷达 + LVGL 仪表盘。 +ESP32 Cheap Yellow Display + HLK-LD2420 24GHz 毫米波雷达 + LVGL 仪表盘。 +默认 **2.8" ESP32-2432S028R**；可选 **3.5" ESP32-3248S035C**（`cyd_35r`）。板型差异见 [`../CYD_PROJECT_GUIDE.md`](../CYD_PROJECT_GUIDE.md)。 ## 硬件 -| 项目 | 说明 | -|------|------| -| 板子 | CYD ESP32-2432S028R（2.8" ILI9341） | -| 传感器 | HLK-LD2420 | -| OT1 | **GPIO22**（模块串口 TX → ESP RX，固件 ≥ v1.5.3） | -| RX | **GPIO27**（模块串口 RX → ESP TX） | -| 供电 | 3.3V / GND（与 CYD 共地） | +| 项目 | 2.8"（默认） | 3.5" C（`cyd_35r`） | +|------|--------------|---------------------| +| 板子 | ESP32-2432S028R（ILI9341 + XPT2046） | ESP32-3248S035C（ST7796 + GT911） | +| 横屏 UI | 320×240 | 480×320 | +| 背光 | GPIO21 | **GPIO27** | +| LD2420 OT1 | **GPIO22**（→ ESP RX） | **GPIO22**（同左） | +| LD2420 RX | **GPIO27**（← ESP TX） | **GPIO4**（← ESP TX；27 是背光） | +| 供电 | 3.3V / GND（共地） | 同左 | 接线（固件 ≥ v1.5.3）： ``` +# 2.8" LD2420 3V3 → CYD 3.3V LD2420 GND → CYD GND LD2420 OT1 → GPIO22 LD2420 RX → GPIO27 + +# 3.5C（勿接 27/21：背光 / GT911 INT） +LD2420 3V3 → CYD 3.3V +LD2420 GND → CYD GND +LD2420 OT1 → GPIO22 +LD2420 RX → GPIO4 ``` > 旧固件（< v1.5.3）串口 TX 在 OT2，且默认波特率多为 **256000**。本工程会依次探测 115200 / 256000。 @@ -36,21 +45,30 @@ LD2420 RX → GPIO27 依赖 [PlatformIO](https://platformio.org/)。 ```bash -pio run -e cyd_28r -t upload +pio run -e cyd_28r -t upload # 2.8" +pio run -e cyd_35r -t upload # 3.5C pio device monitor -b 115200 ``` ### 预编译固件（随时刷，不必编译） -已归档到 [`firmware/cyd_28r/`](firmware/cyd_28r/)（含 bootloader / partitions / app）： +| 目录 | 板型 | +|------|------| +| [`firmware/cyd_28r/`](firmware/cyd_28r/) | 2.8" ILI9341 | +| [`firmware/cyd_35r/`](firmware/cyd_35r/) | 3.5C ST7796 + GT911 | ```powershell -cd firmware\cyd_28r +cd firmware\cyd_28r # 或 cyd_35r .\flash.ps1 # 或 .\flash.ps1 -Port COM3 ``` -说明见 [`firmware/README.md`](firmware/README.md)。源码更新后重新打包：`.\firmware\export_from_build.ps1`。 +说明见 [`firmware/README.md`](firmware/README.md)。源码更新后重新打包： + +```powershell +.\firmware\export_from_build.ps1 # 2.8 +.\firmware\export_from_build.ps1 -Env cyd_35r # 3.5 +``` ### 环境选择 @@ -59,6 +77,7 @@ cd firmware\cyd_28r | `cyd_28r` | 标准 ILI9341 CYD（默认） | | `cyd_28r_inv` | 颜色反相 / 发白 | | `cyd_28_st7789` | USB-C 双口 / ST7789 变体 | +| `cyd_35r` | 3.5" 3248S035C（ST7796 + GT911，BL=27） | ## 项目结构 @@ -86,6 +105,7 @@ README.md # 本文档 | 日期 | 说明 | |------|------| +| 2026-10-25 | 按 `CYD_PROJECT_GUIDE.md` 修正 3.5：BL=27、LD2420 TX→GPIO4、GT911 INT 复位后 INPUT；归档 `firmware/cyd_35r/` | | 2026-10-18 | 初版：CYD + LD2420 LVGL 仪表盘；OT1→GPIO22、RX→GPIO27；显示固件版本 | | 2026-10-18 | 存在逻辑改为 ESPHome 出厂门限 + 10s 离开保持（动/静均保持 ON） | | 2026-10-18 | 归档预编译固件到 `firmware/cyd_28r/`，附一键刷写；初始化本地 Git | @@ -94,7 +114,7 @@ README.md # 本文档 ``` CYD LVGL LD2420 Radar Dashboard -LD2420 probe @ 115200 baud RX=22 TX=27 +LD2420 probe @ 115200 baud RX=22 TX=27 # 3.5 为 TX=4 FW=v1.6.1 mode=simple set gates 1..12 to=10s (OK) ``` diff --git a/firmware/README.md b/firmware/README.md index 0a5fd17..56d91ad 100644 --- a/firmware/README.md +++ b/firmware/README.md @@ -1,17 +1,19 @@ # 预编译固件（可随时刷写） -当前归档目录：[`cyd_28r/`](cyd_28r/) +| 目录 | 板子 | 接线 | +|------|------|------| +| [`cyd_28r/`](cyd_28r/) | ESP32-2432S028R（ILI9341） | OT1→22，RX→27 | +| [`cyd_35r/`](cyd_35r/) | ESP32-3248S035C（ST7796 + GT911） | OT1→22，RX→4；BL=27 | -对应板子：**CYD ESP32-2432S028R**（ILI9341），LD2420 OT1→GPIO22、RX→GPIO27。 -版本信息见 [`cyd_28r/VERSION.txt`](cyd_28r/VERSION.txt)。 +版本信息见各目录 `VERSION.txt`。 ## 直接刷写（无需重新编译） 1. USB 连接板子 -2. 在本目录执行： +2. 进入对应目录执行： ```powershell -cd firmware\cyd_28r +cd firmware\cyd_28r # 或 cyd_35r .\flash.ps1 # 或指定端口 .\flash.ps1 -Port COM3 @@ -40,7 +42,9 @@ esptool.py --chip esp32 --port COM3 --baud 921600 write_flash -z ^ 在仓库根目录： ```powershell -.\firmware\export_from_build.ps1 +.\firmware\export_from_build.ps1 # 2.8 → cyd_28r +.\firmware\export_from_build.ps1 -Env cyd_35r # 3.5 → cyd_35r # 仅复制、不编译： .\firmware\export_from_build.ps1 -SkipBuild +.\firmware\export_from_build.ps1 -Env cyd_35r -SkipBuild ``` diff --git a/firmware/cyd_35r/VERSION.txt b/firmware/cyd_35r/VERSION.txt new file mode 100644 index 0000000..22b04af --- /dev/null +++ b/firmware/cyd_35r/VERSION.txt @@ -0,0 +1,15 @@ +name: CYD ld2420test (cyd_35r) +git: 5691490 +date: 2026-10-25 +board: ESP32-3248S035 (ST7796 + GT911) +flash_size: 4MB +offsets: + 0x1000 bootloader.bin + 0x8000 partitions.bin + 0xe000 boot_app0.bin + 0x10000 firmware.bin +sha256: + bootloader.bin 3D234A7471F67B013686DABD4DEE7C1FA915C9928463616A94BC9297ACF1ABF8 + boot_app0.bin F94C5D786A7A8FAB06AC5D10E33BF37711A6697636DC037559EA19CC410A17F0 + firmware.bin AD799C4C450A00B9037F9F071D45B322DCB36797836580343794B4E56CC2484D + partitions.bin 0A8B5720E7B77FF11F1462458C3A509DEE79224E5279898F26D6A2E3AE0517B7 diff --git a/firmware/cyd_35r/boot_app0.bin b/firmware/cyd_35r/boot_app0.bin new file mode 100644 index 0000000..13562ca Binary files /dev/null and b/firmware/cyd_35r/boot_app0.bin differ diff --git a/firmware/cyd_35r/bootloader.bin b/firmware/cyd_35r/bootloader.bin new file mode 100644 index 0000000..d592359 Binary files /dev/null and b/firmware/cyd_35r/bootloader.bin differ diff --git a/firmware/cyd_35r/firmware.bin b/firmware/cyd_35r/firmware.bin new file mode 100644 index 0000000..dd27799 Binary files /dev/null and b/firmware/cyd_35r/firmware.bin differ diff --git a/firmware/cyd_35r/flash.bat b/firmware/cyd_35r/flash.bat new file mode 100644 index 0000000..bf983b3 --- /dev/null +++ b/firmware/cyd_35r/flash.bat @@ -0,0 +1,5 @@ +@echo off +setlocal +cd /d "%~dp0" +powershell -NoProfile -ExecutionPolicy Bypass -File "%~dp0flash.ps1" %* +exit /b %ERRORLEVEL% diff --git a/firmware/cyd_35r/flash.ps1 b/firmware/cyd_35r/flash.ps1 new file mode 100644 index 0000000..40cefb7 --- /dev/null +++ b/firmware/cyd_35r/flash.ps1 @@ -0,0 +1,84 @@ +# Flash archived CYD LD2420 radar firmware (no rebuild needed) +# Usage: +# .\flash.ps1 +# .\flash.ps1 -Port COM5 +# .\flash.ps1 -Port COM5 -Baud 460800 + +param( + [string]$Port = "", + [int]$Baud = 921600 +) + +$ErrorActionPreference = "Stop" +$here = Split-Path -Parent $MyInvocation.MyCommand.Path +Set-Location $here + +function Find-Esptool { + $pio = Get-Command pio -ErrorAction SilentlyContinue + if ($pio) { + $pkg = Join-Path $env:USERPROFILE ".platformio\packages\tool-esptoolpy\esptool.py" + if (Test-Path $pkg) { return @{ Kind = "py"; Path = $pkg } } + } + $py = Get-Command python -ErrorAction SilentlyContinue + if ($py) { + try { + & python -c "import esptool" 2>$null + if ($LASTEXITCODE -eq 0) { return @{ Kind = "mod"; Path = "esptool" } } + } catch {} + } + $esp = Get-Command esptool.py -ErrorAction SilentlyContinue + if ($esp) { return @{ Kind = "py"; Path = $esp.Source } } + return $null +} + +if (-not $Port) { + $ports = @() + try { + Add-Type -AssemblyName System.IO.Ports -ErrorAction SilentlyContinue | Out-Null + $ports = [System.IO.Ports.SerialPort]::GetPortNames() | Sort-Object + } catch {} + if (-not $ports -or $ports.Count -eq 0) { + $ports = Get-CimInstance Win32_SerialPort -ErrorAction SilentlyContinue | + Select-Object -ExpandProperty DeviceID | Sort-Object + } + if (-not $ports -or $ports.Count -eq 0) { + Write-Error "No serial ports found. Plug in the CYD USB cable, then retry with -Port COMx" + } + if ($ports.Count -eq 1) { + $Port = $ports[0] + } else { + Write-Host "Available ports: $($ports -join ', ')" + $Port = $ports[-1] + Write-Host "Using last port: $Port (override with -Port)" + } +} + +$tool = Find-Esptool +if (-not $tool) { + Write-Error "esptool not found. Install PlatformIO (`pio`) or: pip install esptool" +} + +$argsCommon = @( + "--chip", "esp32", + "--port", $Port, + "--baud", "$Baud", + "--before", "default_reset", + "--after", "hard_reset", + "write_flash", "-z", + "--flash_mode", "dio", + "--flash_freq", "40m", + "--flash_size", "4MB", + "0x1000", "bootloader.bin", + "0x8000", "partitions.bin", + "0xe000", "boot_app0.bin", + "0x10000", "firmware.bin" +) + +Write-Host "Flashing $here -> $Port @ $Baud" +if ($tool.Kind -eq "mod") { + & python -m esptool @argsCommon +} else { + & python $tool.Path @argsCommon +} +if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } +Write-Host "Done. Open serial monitor at 115200 if needed." diff --git a/firmware/cyd_35r/media/preview.html b/firmware/cyd_35r/media/preview.html new file mode 100644 index 0000000..2491b82 --- /dev/null +++ b/firmware/cyd_35r/media/preview.html @@ -0,0 +1,63 @@ + + + + +RADAR + + + +
+ +
+
RADARup 00:42 + DETECT
+
+
DIST
+
186cm
+
LD2420
+
PRESENCE
+
YES
OT1 / RX
+
+
+
TARGET
+
GPIO22 · GPIO27
motion gate ON
+
+ +
+
+
+ + +
+ + diff --git a/firmware/cyd_35r/meta.json b/firmware/cyd_35r/meta.json new file mode 100644 index 0000000..3e7fb54 --- /dev/null +++ b/firmware/cyd_35r/meta.json @@ -0,0 +1,15 @@ +{ + "boardId": "esp32-3248s035", + "name": "CYD LD2420 radar dashboard (3.5\")", + "summary": "Presence & distance from LD2420 mmWave radar", + "description": "OT1→GPIO22, RX→GPIO4. TFT_BL=27, GT911 capacitive. Distance gauge, presence LED, motion chart.", + "tags": [ + "radar", + "ld2420", + "presence", + "cyd35" + ], + "media": { + "preview": "media/preview.html" + } +} diff --git a/firmware/cyd_35r/partitions.bin b/firmware/cyd_35r/partitions.bin new file mode 100644 index 0000000..21800fa Binary files /dev/null and b/firmware/cyd_35r/partitions.bin differ diff --git a/firmware/export_from_build.ps1 b/firmware/export_from_build.ps1 index 422305f..34cc669 100644 --- a/firmware/export_from_build.ps1 +++ b/firmware/export_from_build.ps1 @@ -23,7 +23,7 @@ if (-not $SkipBuild) { $src = Join-Path $root (".pio\build\" + $Env) if ($Env -eq "cyd_35r") { $dstName = "cyd_35r" - $boardLine = "board: ESP32-3248S035 (ST7796)" + $boardLine = "board: ESP32-3248S035 (ST7796 + GT911)" $boardIdHint = "esp32-3248s035" } else { $dstName = "cyd_28r" @@ -67,21 +67,5 @@ foreach ($h in $hashes) { } $lines | Set-Content -Encoding utf8 (Join-Path $dst "VERSION.txt") -# Keep / refresh meta.json boardId for catalog filtering -$metaPath = Join-Path $dst "meta.json" -if (Test-Path $metaPath) { - try { - $meta = Get-Content $metaPath -Raw | ConvertFrom-Json - $meta.boardId = $boardIdHint - if ($Env -eq "cyd_35r" -and $meta.name -notmatch "3\.5") { - $meta.name = ($meta.name -replace "\s*$","") + " (3.5\")" - } - $meta | ConvertTo-Json -Depth 8 | Set-Content -Encoding utf8 $metaPath - } catch { - Write-Host "meta.json update skipped: $_" - } -} elseif ($Env -eq "cyd_35r") { - Write-Host "Note: add firmware/cyd_35r/meta.json with boardId=$boardIdHint for the web catalog" -} Write-Host "Exported -> $dst (env=$Env git=$git)" diff --git a/include/touch.h b/include/touch.h new file mode 100644 index 0000000..788ec0f --- /dev/null +++ b/include/touch.h @@ -0,0 +1,6 @@ +#pragma once + +#include + +void touch_init(); +void touch_read_cb(lv_indev_t *indev, lv_indev_data_t *data); diff --git a/platformio.ini b/platformio.ini index e18b2c3..e2ba1e8 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,6 +1,6 @@ -; CYD ESP32-2432S028R ?LVGL LD2420 毫米波雷达仪表盘 -; LD2420 OT1 -> GPIO22 (ESP RX), LD2420 RX -> GPIO27 (ESP TX) - +; CYD ESP32-2432S028R — LVGL LD2420 mmWave radar dashboard +; LD2420 OT1 -> GPIO22 (ESP RX); module RX -> GPIO27 (2.8 ESP TX) / GPIO4 (3.5 ESP TX) +; See ../CYD_PROJECT_GUIDE.md — 3.5 BL=27, GT911 INT=21 (not BL). [platformio] default_envs = cyd_28r @@ -45,12 +45,12 @@ build_flags = -D LV_CONF_INCLUDE_SIMPLE=1 -I include -; 标准 CYD 2.8" 电阻?(ILI9341) +; 标准 CYD 2.8" 电阻�?(ILI9341) [env:cyd_28r] build_flags = ${env.build_flags} -; 颜色反相版本（若画面色偏/发白可改用此环境? +; 颜色反相版本（若画面色偏/发白可改用此环境�? [env:cyd_28r_inv] build_flags = ${env.build_flags} @@ -65,18 +65,27 @@ build_flags = -D TFT_RGB_ORDER=TFT_BGR -D TFT_INVERSION_ON=1 -; Optional 3.5" CYD ESP32-3248S035 (ST7796 resistive). Default remains cyd_28r. +; Optional 3.5" CYD ESP32-3248S035C (ST7796 + GT911 capacitive). Default remains cyd_28r. ; Build: pio run -e cyd_35r +; Keep TOUCH_CS=-1 — GPIO33 is GT911 SDA, not resistive touch CS. +; TFT_BL=GPIO27 (not 21 — 21 is GT911 INT). LD2420 ESP TX -> GPIO4 (27=BL). [env:cyd_35r] +lib_deps = + lvgl/lvgl@9.2.2 + bodmer/TFT_eSPI@2.5.43 build_flags = ${env.build_flags} - -U ILI9341_2_DRIVER - -D ST7796_DRIVER=1 - -U TFT_WIDTH - -U TFT_HEIGHT - -D TFT_WIDTH=320 - -D TFT_HEIGHT=480 - -U TFT_BL - -D TFT_BL=27 - -D CYD_BOARD_3248S035=1 + -UILI9341_2_DRIVER + -DST7796_DRIVER=1 + -UTFT_WIDTH + -UTFT_HEIGHT + -DTFT_WIDTH=320 + -DTFT_HEIGHT=480 + -UTFT_BL + -DTFT_BL=27 + -DCYD_BOARD_3248S035=1 + -DSUPPORT_TRANSACTIONS + -DTFT_RGB_ORDER=TFT_BGR + -ULV_MEM_SIZE + -DLV_MEM_SIZE=32768 diff --git a/src/main.cpp b/src/main.cpp index 0d9fee8..1a0be5b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,34 +1,30 @@ /** - * CYD ESP32-2432S028R — LVGL LD2420 毫米波雷达仪表盘 + * CYD + LD2420 毫米波雷达仪表盘（2.8 默认 / 3.5C 可选） * * 接线 (固件 ≥ v1.5.3): - * LD2420 OT1 -> GPIO22 (模块串口 TX → ESP RX) - * LD2420 RX -> GPIO27 (模块串口 RX → ESP TX) + * LD2420 OT1 -> GPIO22 (模块串口 TX → ESP RX) 两板相同 + * LD2420 RX -> GPIO27 (2.8 ESP TX) / GPIO4 (3.5 ESP TX；27=背光) + * 3.5C (3248S035C): TFT_BL=27，GT911 INT=21 — 勿把 21/27 当传感器脚。 * VCC 3.3V / GND */ #include #include #include -#include #include #include +#include "touch.h" /* ---- pins ---- */ #define LD2420_RX_PIN 22 /* ESP RX <- OT1 */ -#define LD2420_TX_PIN 27 /* ESP TX -> RX */ #if defined(CYD_BOARD_3248S035) +#define LD2420_TX_PIN 4 /* ESP TX -> RX；3.5 上 27=BL、21=GT911 INT */ #define TFT_BL_PIN 27 #else +#define LD2420_TX_PIN 27 /* ESP TX -> RX */ #define TFT_BL_PIN 21 #endif -#define XPT2046_IRQ 36 -#define XPT2046_MOSI 32 -#define XPT2046_MISO 39 -#define XPT2046_CLK 25 -#define XPT2046_CS 33 - #if defined(CYD_BOARD_3248S035) #define SCREEN_WIDTH 480 #define SCREEN_HEIGHT 320 @@ -41,7 +37,11 @@ #define SENSOR_STALE_MS 5000 #define HISTORY_LEN 48 #define DIST_ARC_MAX 800 /* cm (~11 gates * 70cm) */ +#if defined(CYD_BOARD_3248S035) +#define DRAW_BUF_SIZE (SCREEN_WIDTH * SCREEN_HEIGHT / 20 * (LV_COLOR_DEPTH / 8)) +#else #define DRAW_BUF_SIZE (SCREEN_WIDTH * SCREEN_HEIGHT / 10 * (LV_COLOR_DEPTH / 8)) +#endif /* Layout grid — exclusive regions, no overlaps */ #if defined(CYD_BOARD_3248S035) @@ -113,8 +113,6 @@ static const lv_color_t COL_BAD = lv_color_hex(0xE05A5A); static const lv_color_t COL_ARC_BG = lv_color_hex(0x243247); static const lv_color_t COL_CHART_BG = lv_color_hex(0x0E1622); -SPIClass touchscreenSPI = SPIClass(VSPI); -XPT2046_Touchscreen touchscreen(XPT2046_CS, XPT2046_IRQ); HardwareSerial RadarSerial(2); static uint32_t draw_buf[DRAW_BUF_SIZE / 4]; @@ -181,32 +179,26 @@ static void reset_minmax(void) { } static void touchscreen_read(lv_indev_t *indev, lv_indev_data_t *data) { - LV_UNUSED(indev); static bool was_pressed = false; static uint32_t press_ms = 0; - if (touchscreen.tirqTouched() && touchscreen.touched()) { - TS_Point p = touchscreen.getPoint(); - data->point.x = map(p.y, 240, 3800, 1, SCREEN_WIDTH); - data->point.y = map(p.x, 200, 3700, SCREEN_HEIGHT, 1); - data->state = LV_INDEV_STATE_PRESSED; + touch_read_cb(indev, data); + + if (data->state == LV_INDEV_STATE_PRESSED) { if (!was_pressed) { was_pressed = true; press_ms = millis(); } - } else { - data->state = LV_INDEV_STATE_RELEASED; - if (was_pressed) { - was_pressed = false; - uint32_t held = millis() - press_ms; - if (held >= 700) { - reset_minmax(); - } else if (held < 400) { - set_backlight((bright_level + 1) & 0x03); - char buf[20]; - lv_snprintf(buf, sizeof(buf), "brightness %u/3", (unsigned)bright_level); - show_hint(buf, 900); - } + } else if (was_pressed) { + was_pressed = false; + uint32_t held = millis() - press_ms; + if (held >= 700) { + reset_minmax(); + } else if (held < 400) { + set_backlight((bright_level + 1) & 0x03); + char buf[20]; + lv_snprintf(buf, sizeof(buf), "brightness %u/3", (unsigned)bright_level); + show_hint(buf, 900); } } } @@ -893,11 +885,9 @@ void setup() { lv_init(); - touchscreenSPI.begin(XPT2046_CLK, XPT2046_MISO, XPT2046_MOSI, XPT2046_CS); - touchscreen.begin(touchscreenSPI); - touchscreen.setRotation(2); + touch_init(); - #if defined(CYD_BOARD_3248S035) +#if defined(CYD_BOARD_3248S035) lv_display_t *disp = lv_tft_espi_create(320, 480, draw_buf, sizeof(draw_buf)); #else lv_display_t *disp = lv_tft_espi_create(240, 320, draw_buf, sizeof(draw_buf)); @@ -907,6 +897,7 @@ void setup() { lv_indev_t *indev = lv_indev_create(); lv_indev_set_type(indev, LV_INDEV_TYPE_POINTER); lv_indev_set_read_cb(indev, touchscreen_read); + lv_indev_set_display(indev, disp); create_ui(); diff --git a/src/touch.cpp b/src/touch.cpp new file mode 100644 index 0000000..080101b --- /dev/null +++ b/src/touch.cpp @@ -0,0 +1,193 @@ +#include "touch.h" + +#include + +/** + * 2.8": XPT2046 resistive SoftSPI bus (CS33). + * 3.5C (3248S035C): GT911 capacitive on I2C Wire SDA33/SCL32/INT21/RST25. + * Backlight is GPIO27 — INT(21) is NOT the backlight. After address select, + * leave INT as INPUT (poll-only; some boards have broken INT wiring). + * Feed coords are always native panel 320x480 for LVGL ROTATION_270. + */ + +static int16_t clampi(int32_t v, int32_t lo, int32_t hi) { + if (v < lo) return (int16_t)lo; + if (v > hi) return (int16_t)hi; + return (int16_t)v; +} + +#if defined(CYD_BOARD_3248S035) + +#include + +/* Native panel size — not UI landscape SCREEN_* (480x320). */ +static constexpr int16_t PANEL_W = 320; +static constexpr int16_t PANEL_H = 480; + +#define CYD_GT911_SDA 33 +#define CYD_GT911_SCL 32 +#define CYD_GT911_INT 21 +#define CYD_GT911_RST 25 + +/* Minimal GT911 — no config rewrite (TAMC setResolution can hang Wire). */ +static uint8_t s_gt_addr = 0x5D; +static constexpr uint16_t GT_POINT_INFO = 0x814E; +static constexpr uint16_t GT_POINT_1 = 0x814F; + +static bool gt_write8(uint16_t reg, uint8_t val) { + Wire.beginTransmission(s_gt_addr); + Wire.write((uint8_t)(reg >> 8)); + Wire.write((uint8_t)(reg & 0xFF)); + Wire.write(val); + return Wire.endTransmission() == 0; +} + +static bool gt_read(uint16_t reg, uint8_t *buf, uint8_t len) { + Wire.beginTransmission(s_gt_addr); + Wire.write((uint8_t)(reg >> 8)); + Wire.write((uint8_t)(reg & 0xFF)); + if (Wire.endTransmission(false) != 0) { + return false; + } + const uint8_t n = Wire.requestFrom(s_gt_addr, len); + if (n != len) { + return false; + } + for (uint8_t i = 0; i < len; i++) { + buf[i] = Wire.read(); + } + return true; +} + +static bool gt_probe(uint8_t addr) { + Wire.beginTransmission(addr); + return Wire.endTransmission() == 0; +} + +/* TAMC-compatible address select: INT low => 0x5D, INT high => 0x14 */ +static void gt_hw_reset(bool addr_0x14) { + pinMode(CYD_GT911_INT, OUTPUT); + pinMode(CYD_GT911_RST, OUTPUT); + digitalWrite(CYD_GT911_INT, LOW); + digitalWrite(CYD_GT911_RST, LOW); + delay(10); + digitalWrite(CYD_GT911_INT, addr_0x14 ? HIGH : LOW); + delay(1); + digitalWrite(CYD_GT911_RST, HIGH); + delay(5); + digitalWrite(CYD_GT911_INT, LOW); + delay(50); + /* Backlight is GPIO27 — leave INT as input for polling / optional IRQ. */ + pinMode(CYD_GT911_INT, INPUT); +} + +static bool gt_find_addr() { + for (uint8_t a : {uint8_t(0x5D), uint8_t(0x14)}) { + if (gt_probe(a)) { + s_gt_addr = a; + return true; + } + } + return false; +} + +void touch_init() { + Serial.println("Touch: GT911 I2C capacitive (3.5C) minimal"); + Wire.begin(CYD_GT911_SDA, CYD_GT911_SCL); + Wire.setClock(100000); +#if defined(WIRE_HAS_TIMEOUT) || defined(ESP32) + Wire.setTimeOut(50); +#endif + + if (!gt_find_addr()) { + Serial.println("GT911 not found — hw reset 0x5D"); + gt_hw_reset(false); + if (!gt_find_addr()) { + Serial.println("GT911 not found — hw reset 0x14"); + gt_hw_reset(true); + gt_find_addr(); + } + } + + Serial.printf("GT911 probe 0x5D=%s 0x14=%s using=0x%02X\n", + gt_probe(0x5D) ? "OK" : "no", gt_probe(0x14) ? "OK" : "no", + s_gt_addr); + Serial.printf("GT911 SDA=%d SCL=%d INT=%d RST=%d\n", CYD_GT911_SDA, + CYD_GT911_SCL, CYD_GT911_INT, CYD_GT911_RST); +} + +void touch_read_cb(lv_indev_t * /*indev*/, lv_indev_data_t *data) { + uint8_t info = 0; + + if (!gt_read(GT_POINT_INFO, &info, 1)) { + data->state = LV_INDEV_STATE_RELEASED; + return; + } + + const uint8_t touches = info & 0x0F; + const bool buffered = (info & 0x80) != 0; + + if (!buffered || touches == 0) { + if (buffered) { + gt_write8(GT_POINT_INFO, 0); + } + data->state = LV_INDEV_STATE_RELEASED; + return; + } + + uint8_t pt[7]; + if (!gt_read(GT_POINT_1, pt, 7)) { + gt_write8(GT_POINT_INFO, 0); + data->state = LV_INDEV_STATE_RELEASED; + return; + } + gt_write8(GT_POINT_INFO, 0); + + const int16_t raw_x = (int16_t)(pt[1] | (pt[2] << 8)); + const int16_t raw_y = (int16_t)(pt[3] | (pt[4] << 8)); + + /* Native 320x480 → LVGL 270. UI ≈ (H-1-raw_y, raw_x). */ + const int16_t nx = clampi(raw_x, 0, PANEL_W - 1); + const int16_t ny = clampi(raw_y, 0, PANEL_H - 1); + data->point.x = (int16_t)((PANEL_W - 1) - nx); + data->point.y = (int16_t)((PANEL_H - 1) - ny); + data->state = LV_INDEV_STATE_PRESSED; +} + +#else + +#include +#include + +#define XPT2046_IRQ 36 +#define XPT2046_MOSI 32 +#define XPT2046_MISO 39 +#define XPT2046_CLK 25 +#define XPT2046_CS 33 + +/* 2.8 UI landscape feed (unchanged from prior main.cpp). */ +static constexpr int16_t UI_W = 320; +static constexpr int16_t UI_H = 240; + +static SPIClass touchscreenSPI = SPIClass(VSPI); +static XPT2046_Touchscreen touchscreen(XPT2046_CS, XPT2046_IRQ); + +void touch_init() { + touchscreenSPI.begin(XPT2046_CLK, XPT2046_MISO, XPT2046_MOSI, XPT2046_CS); + touchscreen.begin(touchscreenSPI); + touchscreen.setRotation(2); + Serial.println("Touch: XPT2046 resistive (2.8)"); +} + +void touch_read_cb(lv_indev_t * /*indev*/, lv_indev_data_t *data) { + if (touchscreen.tirqTouched() && touchscreen.touched()) { + TS_Point p = touchscreen.getPoint(); + data->point.x = map(p.y, 240, 3800, 1, UI_W); + data->point.y = map(p.x, 200, 3700, UI_H, 1); + data->state = LV_INDEV_STATE_PRESSED; + } else { + data->state = LV_INDEV_STATE_RELEASED; + } +} + +#endif