Fix 3.5 KY-009: backlight GPIO27 and G on GPIO21.

Align cyd_35r with CYD_PROJECT_GUIDE (ST7796/GT911), export flashable firmware/cyd_35r. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-25 11:33:47 +08:00
parent 9f8d8279f0
commit 39fa51c48e
18 changed files with 443 additions and 78 deletions
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,13 +1,17 @@
 # 本仓库给 AI / 协作者

-完整开工约定（LVGL+触控、可刷固件、本地 git、目录结构、灯类参考）：
+完整约定：[`../CYD_PROJECT_GUIDE.md`](../CYD_PROJECT_GUIDE.md)

-**[`../CYD_PROJECT_GUIDE.md`](../CYD_PROJECT_GUIDE.md)**
+本工程：KY-009 RGB，双板型。

-本工程是 **KY-009 RGB** 参考实现：颜色切换 + PWM + `firmware/cyd` 可刷包。
+| | 2.8 (`cyd`) | 3.5C (`cyd_35r`) |
+|--|-------------|------------------|
+| BL | 21 | **27**（勿写 21） |
+| 触控 | XPT2046 SoftSPI | GT911 I2C 33/32 |
+| R/G/B | 22 / **27** / 4 | 22 / **21** / 4 |

-## 收工三件套（每次改动）
+## 收工三件套

-1. `pio run -e cyd -t upload`
-2. `.\firmware\export_from_build.ps1`
+1. `pio run -e cyd` 或 `-e cyd_35r` `-t upload`
+2. `.\firmware\export_from_build.ps1`（3.5 加 `-Env cyd_35r`）
 3. 本地 `git commit`
--- a/README.md
+++ b/README.md
@@ -1,45 +1,48 @@
 # KY-009 SMD LED（CYD）

-触控 + LVGL 参考 `hw269test` / `tftest`。一次只亮一路颜色，可切换 R/G/B + 调亮度。
+触控 + LVGL 参考 `tftest` / `hw269test`。一次只亮一路颜色，可切换 R/G/B + 调亮度。

-> **新开 CYD 测试工程请先读：** [`../CYD_PROJECT_GUIDE.md`](../CYD_PROJECT_GUIDE.md)（LVGL/触控、可刷固件、本地 git、目录结构）。本仓另见 [`AGENTS.md`](AGENTS.md)。
+> **约定：** [`../CYD_PROJECT_GUIDE.md`](../CYD_PROJECT_GUIDE.md) · 本仓 [`AGENTS.md`](AGENTS.md)

 ## 硬件

-| 项目 | 说明 |
-|------|------|
-| 板子 | CYD ESP32-2432S028R |
-| 模块 | KY-009 SMD RGB LED |
-| R | **GPIO22** |
-| G | **GPIO27** |
-| B | **GPIO4**（未接则蓝灯无输出） |
+| 项目 | **2.8" · 2432S028R** | **3.5" · 3248S035C** |
+|------|----------------------|----------------------|
+| 屏 / 触控 | ILI9341 + XPT2046 | ST7796 + GT911 |
+| 背光 | GPIO**21** | GPIO**27** |
+| KY-009 **R** | **GPIO22** | **GPIO22**（不变） |
+| KY-009 **G** | **GPIO27** | **GPIO21**（2.8 的 27→21） |
+| KY-009 **B** | GPIO4 | GPIO4 |
+| PlatformIO | `-e cyd` | `-e cyd_35r` |

-接线：`R→GPIO22`，`G→GPIO27`，`B→GPIO4`，`GND→GND`（共阴）；若共阳需改 duty 极性。
+接线（共阴）：`R→22`，`G→27(2.8) / 21(3.5)`，`B→4`，`GND→GND`。共阳需改 duty 极性。
+
+**禁止**在 3.5 上把 G 接到 27（那是背光）。

 ## 操作

- **R / G / B** 按钮：切换当前颜色（其它路关断）
+- **R / G / B**：切换当前颜色（其它路关断）
 - 滑条：当前颜色亮度 0–100%
- 底部按钮：总开关
+- 底部：总开关

 ## 构建 / 上传

 ```bash
-pio run -e cyd -t upload
+pio run -e cyd -t upload          # 2.8"
+pio run -e cyd_35r -t upload      # 3.5"
 ```

 ## 预编译固件

-随时可刷（无需编译）：
-
 ```powershell
-cd firmware\cyd
+cd firmware\cyd        # 2.8
+# 或 cd firmware\cyd_35r   # 3.5
 .\flash.ps1
-# 或 .\flash.ps1 -Port COM3
 ```

-重新从构建导出：
+重新导出：

 ```powershell
-.\firmware\export_from_build.ps1
+.\firmware\export_from_build.ps1              # 2.8
+.\firmware\export_from_build.ps1 -Env cyd_35r # 3.5
 ```
--- a/firmware/README.md
+++ b/firmware/README.md
@@ -1,14 +1,14 @@
 # 预编译固件

-目录：[`cyd/`](cyd/)
-
-板子：**CYD ESP32-2432S028R**（ILI9341）  
-功能：KY-009（R22 / G27 / B4）颜色切换 + PWM 亮度 + SoftSPI 触控 + LVGL
+| 目录 | 板子 |
+|------|------|
+| [`cyd/`](cyd/) | 2.8" ESP32-2432S028R（ILI9341）KY-009 R22/G27/B4 |
+| [`cyd_35r/`](cyd_35r/) | 3.5" ESP32-3248S035C（ST7796）KY-009 R22/G21/B4 |

 ## 刷写

 ```powershell
-cd firmware\cyd
+cd firmware\cyd        # 或 cyd_35r
 .\flash.ps1
 # 或 .\flash.ps1 -Port COM3
 ```
@@ -17,5 +17,6 @@ cd firmware\cyd

 ```powershell
 .\firmware\export_from_build.ps1
-.\firmware\export_from_build.ps1 -SkipBuild
+.\firmware\export_from_build.ps1 -Env cyd_35r
+.\firmware\export_from_build.ps1 -Env cyd_35r -SkipBuild
 ```
--- a/firmware/cyd_35r/VERSION.txt
+++ b/firmware/cyd_35r/VERSION.txt
@@ -0,0 +1,16 @@
+name: CYD smdky009ledtest (cyd_35r)
+git: 9f8d827
+date: 2026-10-25
+board: ESP32-3248S035 (ST7796)
+features: ST7796, GT911, BL27, KY009 R22/G21/B4
+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    0164D517555D2AE1C76A754564FE10B15BE72144230E611B0DA894108E6A199A
+  partitions.bin  148B959CBFF1C38AA8E1D5C0BA9D612C54997B945E56A63F41223EEF650653A1
--- a/firmware/cyd_35r/boot_app0.bin
+++ b/firmware/cyd_35r/boot_app0.bin
--- a/firmware/cyd_35r/bootloader.bin
+++ b/firmware/cyd_35r/bootloader.bin
--- a/firmware/cyd_35r/firmware.bin
+++ b/firmware/cyd_35r/firmware.bin
--- a/firmware/cyd_35r/flash.bat
+++ 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%
--- a/firmware/cyd_35r/flash.ps1
+++ b/firmware/cyd_35r/flash.ps1
@@ -0,0 +1,98 @@
+# Flash archived CYD KY-009 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 (-not $pio) {
+    $pioPath = Join-Path $env:USERPROFILE "AppData\Local\Programs\Python\Python312\Scripts\pio.exe"
+    if (Test-Path $pioPath) {
+      $env:Path = "$(Split-Path $pioPath);$env:Path"
+      $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"
+}
+
+$needed = @("bootloader.bin", "partitions.bin", "boot_app0.bin", "firmware.bin")
+foreach ($f in $needed) {
+  if (-not (Test-Path (Join-Path $here $f))) {
+    Write-Error "Missing $f â€?run ..\export_from_build.ps1 from repo root first"
+  }
+}
+
+$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."
--- a/firmware/cyd_35r/media/preview.html
+++ b/firmware/cyd_35r/media/preview.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" />
+<title>KY-009</title>
+<style>
+
+  *{box-sizing:border-box;margin:0;padding:0}
+  html,body{width:320px;height:240px;overflow:hidden;background:#000;margin:0}
+  .bezel{width:320px;height:240px;background:#1a1408}
+  .screen{width:320px;height:240px;background:#0A1016;color:#EAF0F6;font:12px/1.2 system-ui,sans-serif;position:relative;overflow:hidden}
+  .muted{color:#7A8B9C}.ok{color:#3DDC97}.bad{color:#E85D4C}.acc{color:#4FC3F7}.amber{color:#FFB74D}
+  .btn{border:0;border-radius:8px;background:#243140;color:#EAF0F6;font-weight:600}
+  .btn.acc{background:#1A4A6E}.btn.on{background:#1B5E4A}.btn.warn{background:#6B3A1E}
+
+
+  .t{position:absolute;left:0;right:0;top:4px;text-align:center;font-size:20px;font-weight:700}
+  .pin{position:absolute;left:0;right:0;top:32px;text-align:center}
+  .st{position:absolute;left:0;right:0;top:52px;text-align:center;font-size:18px;font-weight:700;color:#E85D4C}
+  .rgb{position:absolute;left:24px;right:24px;top:78px;display:flex;gap:8px}
+  .rgb .btn{flex:1;height:40px}
+  .rgb .r{background:#E85D4C}.rgb .g{background:#243140}.rgb .b{background:#243140}
+  .br{position:absolute;left:16px;top:134px}
+  .slider{position:absolute;left:110px;right:16px;top:138px;height:12px;border-radius:4px;background:#243140;overflow:hidden}
+  .slider>i{display:block;height:100%;width:60%;background:#E85D4C}
+  .act{position:absolute;left:24px;right:24px;bottom:10px;height:44px}
+
+
+/* CYD 3.5" full-bleed: non-uniform scale matches firmware UX()/UY(). */
+html,body{width:480px!important;height:320px!important;overflow:hidden!important;background:#000!important;margin:0!important;padding:0!important}
+.cyd35-scale{width:320px;height:240px;transform:scale(1.5,1.3333333333);transform-origin:0 0;overflow:hidden}
+</style>
+</head>
+<body>
+<div class="cyd35-scale">
+
+<div class="bezel"><div class="screen" id="s">
+
+  <div class="t">KY-009</div>
+  <div class="pin muted">R22 G27 B4</div>
+  <div class="st">RED ON</div>
+  <div class="rgb">
+    <button class="btn r" type="button">R</button>
+    <button class="btn g" type="button">G</button>
+    <button class="btn b" type="button">B</button>
+  </div>
+  <div class="br muted">Brightness 60%</div>
+  <div class="slider"><i></i></div>
+  <button class="btn on act" type="button">Turn OFF</button>
+
+</div></div>
+
+</div>
+</body>
+</html>
--- a/firmware/cyd_35r/meta.json
+++ b/firmware/cyd_35r/meta.json
@@ -0,0 +1,7 @@
+{
+  "boardId": "esp32-3248s035",
+  "name": "CYD KY-009 (3.5\")",
+  "summary": "KY-009 RGB: R=GPIO22 G=GPIO21 B=GPIO4 on 3.5C (BL=27, GT911)",
+  "description": "ST7796 + GT911 + LVGL. Color switch R/G/B + brightness. G is GPIO21 (not 27 — 27 is backlight).",
+  "tags": ["ky009", "rgb", "led", "pwm", "touch", "lvgl", "3.5", "3248s035"]
+}
--- a/firmware/cyd_35r/partitions.bin
+++ b/firmware/cyd_35r/partitions.bin
--- a/firmware/export_from_build.ps1
+++ b/firmware/export_from_build.ps1
@@ -49,11 +49,17 @@ $git = ""
 try { $git = (git -C $root rev-parse --short HEAD).Trim() } catch { $git = "unknown" }
 $date = Get-Date -Format "yyyy-MM-dd"
 $hashes = Get-ChildItem (Join-Path $dst "*.bin") | Get-FileHash -Algorithm SHA256
+$feat = if ($Env -eq "cyd_35r") {
+  "features: ST7796, GT911, BL27, KY009 R22/G21/B4"
+} else {
+  "features: ILI9341, SoftSPI, BL21, KY009 R22/G27/B4"
+}
 $lines = @(
  "name: CYD smdky009ledtest ($dstName)",
  "git: $git",
  "date: $date",
  $boardLine,
+  $feat,
  "flash_size: 4MB",
  "offsets:",
  "  0x1000  bootloader.bin",
@@ -67,21 +73,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)"
--- a/include/pins.h
+++ b/include/pins.h
@@ -1,6 +1,7 @@
 #pragma once

 // Board pins — 2.8" default; 3.5" when CYD_BOARD_3248S035 is set (env:cyd_35r)
+// See ../CYD_PROJECT_GUIDE.md §A

 #if defined(CYD_BOARD_3248S035)
 #define TFT_BL_PIN 27
@@ -8,19 +9,25 @@
 #define SCREEN_HEIGHT 480
 #define UI_HOR_RES    480
 #define UI_VER_RES    320
+/* 3.5C capacitive GT911 (ESP32-3248S035C). GPIO33 is I2C SDA, not TOUCH_CS.
+ * Backlight is GPIO27; INT is GPIO21 — they are NOT the same pin. */
+#define CYD_GT911_SDA  33
+#define CYD_GT911_SCL  32
+#define CYD_GT911_INT  21
+#define CYD_GT911_RST  25
 #else
 #define TFT_BL_PIN 21
 #define SCREEN_WIDTH  240
 #define SCREEN_HEIGHT 320
 #define UI_HOR_RES    320
 #define UI_VER_RES    240
-#endif
-
+/* 2.8" CYD: dedicated SoftSPI touch bus. */
 #define CYD_TOUCH_IRQ  36
 #define CYD_TOUCH_MOSI 32
 #define CYD_TOUCH_MISO 39
 #define CYD_TOUCH_CLK  25
 #define CYD_TOUCH_CS   33
+#endif

 /* Map 320x240 design coordinates onto the active UI resolution (identity on 2.8"). */
 #define UX(x) ((int)(((long)(x) * (UI_HOR_RES)) / 320))
@@ -28,7 +35,18 @@
 #define UW(w) UX(w)
 #define UH(h) UY(h)

+/* Partial frame buffer: 3.5 needs smaller ratio to fit DRAM. */
+#if defined(CYD_BOARD_3248S035)
+#define DRAW_BUF_DIV 20
+#else
+#define DRAW_BUF_DIV 10
+#endif

-#define KY009_R_PIN 22  // R -> GPIO22
-#define KY009_G_PIN 27  // G -> GPIO27
-#define KY009_B_PIN 4   // B -> GPIO4
+/* KY-009: 2.8 forever R22+G27; 3.5 forever R22+G21 (27 is BL). B stays 4. */
+#define KY009_R_PIN 22
+#if defined(CYD_BOARD_3248S035)
+#define KY009_G_PIN 21
+#else
+#define KY009_G_PIN 27
+#endif
+#define KY009_B_PIN 4
--- a/platformio.ini
+++ b/platformio.ini
@@ -1,5 +1,6 @@
-; CYD ESP32-2432S028 — KY-009 RGB LED (R=22, G=27, B=4) + SoftSPI 触控 + LVGL
-; 触控/屏配置参考 tftest / hw269test
+; KY-009 RGB + LVGL
+; 2.8" [env:cyd]     R22 G27 B4  BL21 SoftSPI
+; 3.5" [env:cyd_35r] R22 G21 B4  BL27 GT911  — see ../CYD_PROJECT_GUIDE.md
 [env:cyd]
 platform = espressif32
 board = esp32dev
@@ -55,19 +56,26 @@ build_flags =

 extra_scripts = pre:copy_lv_conf.py

-; Optional 3.5" CYD ESP32-3248S035 (ST7796 resistive). Default remains [env:cyd].
+; Optional 3.5" CYD ESP32-3248S035C (ST7796 + GT911 capacitive). Default [env:cyd].
 ; 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 / KY009 G). See ../CYD_PROJECT_GUIDE.md
 [env:cyd_35r]
 extends = env:cyd
+build_unflags =
+  -DILI9341_2_DRIVER=1
+  -DTFT_WIDTH=240
+  -DTFT_HEIGHT=320
+  -DTFT_BL=21
+  -DLV_MEM_SIZE=49152
 build_flags =
  ${env:cyd.build_flags}
-  -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
-
+  -DUSE_HSPI_PORT
+  -DSUPPORT_TRANSACTIONS
+  -DTFT_RGB_ORDER=TFT_BGR
+  -DLV_MEM_SIZE=32768
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,7 +7,7 @@
 #include "ui.h"

 static constexpr uint32_t DRAW_BUF_SIZE =
-    (SCREEN_WIDTH * SCREEN_HEIGHT / 10 * (LV_COLOR_DEPTH / 8));
+    (SCREEN_WIDTH * SCREEN_HEIGHT / DRAW_BUF_DIV * (LV_COLOR_DEPTH / 8));
 static uint32_t draw_buf[DRAW_BUF_SIZE / 4];

 void setup() {
--- a/src/touch.cpp
+++ b/src/touch.cpp
@@ -3,10 +3,13 @@

 #include <Arduino.h>

+#if defined(CYD_BOARD_3248S035)
+#include <Wire.h>
+#endif
+
 /**
- * SoftSPI XPT2046
- * BL↔TR 是矩形主对角线镜像（XY 对调），不是 180°（180° 会搞成 TL↔BR）。
- * 先按 rot2 得到旧 UI，再做对角修正，反变换喂给 LVGL 270。
+ * 2.8": dedicated SoftSPI + BL/TR diagonal fix.
+ * 3.5C (3248S035C): capacitive GT911 on I2C SDA33/SCL32/INT21/RST25.
 */

 int16_t g_dbg_phys_x = -1;
@@ -15,6 +18,174 @@ int16_t g_dbg_logic_x = -1;
 int16_t g_dbg_logic_y = -1;
 bool g_dbg_touch_down = false;

+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)
+
+/* 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.
+   * GPIO21 may also drive KY-009 G (PWM after lamp_init); GT911 uses I2C poll. */
+  pinMode(CYD_GT911_INT, INPUT);
+  delay(50);
+}
+
+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;
+  static uint32_t last_log = 0;
+  const bool do_log = (millis() - last_log > 200);
+
+  if (!gt_read(GT_POINT_INFO, &info, 1)) {
+    data->state = LV_INDEV_STATE_RELEASED;
+    g_dbg_touch_down = false;
+    if (do_log) {
+      last_log = millis();
+      Serial.println("TouchProbe GT911 I2C err");
+    }
+    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;
+    g_dbg_touch_down = false;
+    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;
+    g_dbg_touch_down = false;
+    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. Mirror long axis so L/R matches UI
+   * (else preset 3 hits 10). Resulting UI ≈ (H-1-raw_y, raw_x). */
+  const int16_t nx = clampi(raw_x, 0, SCREEN_WIDTH - 1);
+  const int16_t ny = clampi(raw_y, 0, SCREEN_HEIGHT - 1);
+  const int16_t feed_x = (int16_t)((SCREEN_WIDTH - 1) - nx);
+  const int16_t feed_y = (int16_t)((SCREEN_HEIGHT - 1) - ny);
+  const int16_t ui_x = (int16_t)((SCREEN_HEIGHT - 1) - ny);
+  const int16_t ui_y = nx;
+
+  g_dbg_phys_x = raw_x;
+  g_dbg_phys_y = raw_y;
+  g_dbg_logic_x = ui_x;
+  g_dbg_logic_y = ui_y;
+  g_dbg_touch_down = true;
+
+  if (do_log) {
+    last_log = millis();
+    Serial.printf("Touch HIT GT911 raw(%d,%d) ~ui(%d,%d)\n", raw_x, raw_y,
+                  ui_x, ui_y);
+  }
+
+  data->point.x = feed_x;
+  data->point.y = feed_y;
+  data->state = LV_INDEV_STATE_PRESSED;
+}
+
+#else
+
 static void soft_write(uint8_t data) {
  for (int i = 7; i >= 0; --i) {
    digitalWrite(CYD_TOUCH_MOSI, (data >> i) & 1);
@@ -49,16 +220,6 @@ static uint16_t xpt_read(uint8_t cmd) {
  return v;
 }

-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;
-}
-
 void touch_init() {
  pinMode(CYD_TOUCH_CS, OUTPUT);
  pinMode(CYD_TOUCH_CLK, OUTPUT);
@@ -94,8 +255,6 @@ void touch_read_cb(lv_indev_t * /*indev*/, lv_indev_data_t *data) {
  x = clampi(x, 0, SCREEN_WIDTH - 1);
  y = clampi(y, 0, SCREEN_HEIGHT - 1);

-  // 旧 UI（LVGL270）：(y, 239-x) — 该空间里 BL↔TR，做主对角线镜像
-  // (ux,uy) -> (uy*(319/239), ux*(239/319))
  const int32_t old_ux = y;
  const int32_t old_uy = (SCREEN_WIDTH - 1) - x;
  int16_t ui_x = clampi((old_uy * (UI_HOR_RES - 1)) / (UI_VER_RES - 1), 0,
@@ -103,7 +262,6 @@ void touch_read_cb(lv_indev_t * /*indev*/, lv_indev_data_t *data) {
  int16_t ui_y = clampi((old_ux * (UI_VER_RES - 1)) / (UI_HOR_RES - 1), 0,
                        UI_VER_RES - 1);

-  // 反变换喂 LVGL，使最终落在 (ui_x, ui_y)
  const int16_t feed_x = (int16_t)((SCREEN_WIDTH - 1) - ui_y);
  const int16_t feed_y = ui_x;

@@ -123,3 +281,5 @@ void touch_read_cb(lv_indev_t * /*indev*/, lv_indev_data_t *data) {
  data->point.y = feed_y;
  data->state = LV_INDEV_STATE_PRESSED;
 }
+
+#endif
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -118,7 +118,7 @@ static lv_obj_t *make_color_btn(lv_obj_t *scr, const char *txt, int x,
                                lamp_color_t c, lv_obj_t **out_lbl) {
  lv_obj_t *btn = lv_button_create(scr);
  lv_obj_set_size(btn, UW(88), UH(40));
-  lv_obj_align(btn, LV_ALIGN_TOP_LEFT, x, 72);
+  lv_obj_align(btn, LV_ALIGN_TOP_LEFT, UX(x), UY(72));
  style_btn(btn, COL_BTN);
  lv_obj_add_event_cb(btn, on_color, LV_EVENT_CLICKED, (void *)(uintptr_t)c);
  lv_obj_t *lbl = lv_label_create(btn);