Fix 3.5C path: BL=27, GT911 capacitive touch, draw buffer /20.

Align cyd_35r with CYD_PROJECT_GUIDE (ST7796+GT911, INT as INPUT after reset); export firmware and scale BLE UI with UX/UY. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-25 19:19:01 +08:00
parent b65ec37fbe
commit cb647008fc
16 changed files with 473 additions and 50 deletions
--- a/README.md
+++ b/README.md
@@ -1,6 +1,13 @@
 # CYD BLE 基础

-面向 **ESP32-2432S028（CYD）** 的可复用 BLE 外设模块。显示/触控沿用 [tftest](../tftest) 的 LVGL9 + SoftSPI XPT2046 方案；工程约定见 [CYD_PROJECT_GUIDE.md](../CYD_PROJECT_GUIDE.md)。
+可复用 BLE 外设模块，支持两块板：
+
+| 板型 | env | 屏 / 触控 / 背光 |
+|------|-----|------------------|
+| **2.8"** ESP32-2432S028R（默认） | `cyd` | ILI9341 + XPT2046 SoftSPI + BL **21** |
+| **3.5"C** ESP32-3248S035C | `cyd_35r` | ST7796 + GT911 I2C + BL **27** |
+
+显示/触控沿用 [tftest](../tftest)；工程约定见 [CYD_PROJECT_GUIDE.md](../CYD_PROJECT_GUIDE.md)。**禁止把 2.8 的 `pins.h` 原样套到 3.5。**

 ## 为什么这样设计

@@ -24,7 +31,7 @@

 ## 屏上操作

-横屏 320×240：上方状态（State / Name / Addr / Peer / Echo），中间 **可滚动日志框**（不盖住按钮），底栏四键：
+横屏 UI（2.8：320×240；3.5：480×320，布局按 `UX/UY` 缩放）：上方状态（State / Name / Addr / Peer / Echo），中间 **可滚动日志框**（不盖住按钮），底栏四键：

 | 按钮 | 作用 |
 |------|------|
@@ -37,10 +44,15 @@

 ## 刷写（无需每次编译）

-预编译包在 [`firmware/cyd/`](firmware/cyd/)：
+预编译包：
+
+| 板型 | 目录 |
+|------|------|
+| 2.8" | [`firmware/cyd/`](firmware/cyd/) |
+| 3.5" | [`firmware/cyd_35r/`](firmware/cyd_35r/) |

 ```powershell
-cd firmware\cyd
+cd firmware\cyd        # 或 firmware\cyd_35r
 .\flash.ps1
 # 或
 .\flash.ps1 -Port COM3
@@ -49,11 +61,12 @@ cd firmware\cyd
 重新打包：

 ```powershell
-.\firmware\export_from_build.ps1
+.\firmware\export_from_build.ps1              # 2.8
+.\firmware\export_from_build.ps1 -Env cyd_35r # 3.5
 .\firmware\export_from_build.ps1 -SkipBuild
 ```

-源码直接烧录：`pio run -e cyd -t upload`  
+源码烧录：`pio run -e cyd -t upload` 或 `pio run -e cyd_35r -t upload`  
 串口监视：`pio device monitor -b 460800`

 ## 接到其它项目
@@ -119,4 +132,7 @@ ble_core_set_rx_cb([](const uint8_t *data, size_t len, void *) {

 ## 硬件

-CYD ESP32-2432S028R：ILI9341 240×320，横屏 `LV_DISPLAY_ROTATION_270`（逻辑 320×240）。板载 BLE 4.2，无需外接模块。
+板载 BLE 4.2，无需外接模块。横屏 `LV_DISPLAY_ROTATION_270`。
+
+- **2.8"**：ILI9341 240×320 → UI 320×240；背光 GPIO21；触控 SoftSPI
+- **3.5"C**：ST7796 320×480 → UI 480×320；背光 **GPIO27**（误用 21 = 黑屏）；触控 GT911 I2C 33/32/21/25
--- a/firmware/README.md
+++ b/firmware/README.md
@@ -1,12 +1,14 @@
 # 预编译固件（可随时刷写）

-当前归档目录：[`cyd/`](cyd/)
+| 目录 | 板子 |
+|------|------|
+| [`cyd/`](cyd/) | **2.8"** ESP32-2432S028R（ILI9341） |
+| [`cyd_35r/`](cyd_35r/) | **3.5"** ESP32-3248S035（ST7796 + GT911） |

-对应板子：**CYD ESP32-2432S028R**（ILI9341）  
 功能：**BLE 外设**（NimBLE + Nordic UART；屏上状态 + 滚动日志 + Adv/Echo/Ping）  
 分区：`min_spiffs`（约 1.9MB APP）  

-版本信息见 [`cyd/VERSION.txt`](cyd/VERSION.txt)。
+版本信息见各目录 `VERSION.txt`。

 也可在 [`../../cydweb`](../../cydweb)（CYD Flasher）里通过浏览器串口刷写本目录固件。

@@ -16,7 +18,7 @@
 2. 执行：

 ```powershell
-cd firmware\cyd
+cd firmware\cyd        # 3.5: firmware\cyd_35r
 .\flash.ps1
 # 或指定端口
 .\flash.ps1 -Port COM3
@@ -45,7 +47,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 -> firmware/cyd
+.\firmware\export_from_build.ps1 -Env cyd_35r # 3.5 -> firmware/cyd_35r
 # 仅复制、不编译：
 .\firmware\export_from_build.ps1 -SkipBuild
+.\firmware\export_from_build.ps1 -Env cyd_35r -SkipBuild
 ```
--- a/firmware/cyd_35r/VERSION.txt
+++ b/firmware/cyd_35r/VERSION.txt
@@ -0,0 +1,15 @@
+name: CYD bletest (cyd_35r)
+git: b65ec37
+date: 2026-10-25
+board: ESP32-3248S035 (ST7796)
+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    E348AE0565A2DACA4F60CF3316C6D6ACA3E5C47B3CAD42856B79881D350D486E
+  partitions.bin  0A8B5720E7B77FF11F1462458C3A509DEE79224E5279898F26D6A2E3AE0517B7
--- 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 BLE 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 460800 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>CYD BLE</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}
+
+
+  .title{position:absolute;left:10px;top:6px;font-size:18px;font-weight:700;color:#4FC3F7}
+  .meta{position:absolute;left:10px;top:30px;font-size:11px;line-height:1.45}
+  .log{position:absolute;left:10px;right:10px;top:108px;bottom:52px;background:#121A24;border-radius:6px;padding:8px;font-size:11px;color:#7A8B9C}
+  .bar{position:absolute;left:8px;right:8px;bottom:8px;display:flex;gap:6px}
+  .bar .btn{flex:1;height:36px;font-size:11px}
+
+
+/* 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="title">CYD BLE</div>
+  <div class="meta">
+    <div><span class="muted">State</span> <span class="amber">Advertising</span></div>
+    <div><span class="muted">Name</span> CYD-BLE</div>
+    <div><span class="muted">Addr</span> AA:BB:CC:DD:EE:FF</div>
+    <div><span class="muted">Peer</span> -</div>
+    <div><span class="muted">Echo</span> <span class="ok">ON</span></div>
+    <div class="muted">App: nRF Connect / Serial BT</div>
+  </div>
+  <div class="log">Waiting for phone...<br/>TX: Hello from CYD</div>
+  <div class="bar">
+    <button class="btn warn" type="button">Stop Adv</button>
+    <button class="btn" type="button">Echo</button>
+    <button class="btn acc" type="button">Ping</button>
+    <button class="btn" type="button">Clear</button>
+  </div>
+
+</div></div>
+
+</div>
+</body>
+</html>
--- a/firmware/cyd_35r/meta.json
+++ b/firmware/cyd_35r/meta.json
@@ -0,0 +1,16 @@
+{
+  "boardId": "esp32-3248s035",
+  "name": "CYD BLE (3.5\")",
+  "summary": "NimBLE Nordic UART peripheral with LVGL status UI",
+  "description": "Advertise as CYD-BLE with Nordic UART Service. Touch UI: status, scrollable RX/TX log above button bar (Adv / Echo / Ping / Clear). Works with nRF Connect and Serial Bluetooth Terminal.",
+  "tags": [
+    "ble",
+    "nimble",
+    "nus",
+    "uart",
+    "touch"
+  ],
+  "media": {
+    "preview": "media/preview.html"
+  }
+}
--- a/firmware/cyd_35r/partitions.bin
+++ b/firmware/cyd_35r/partitions.bin
--- a/include/pins.h
+++ b/include/pins.h
@@ -8,19 +8,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,5 +34,13 @@
 #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
+
+


--- a/platformio.ini
+++ b/platformio.ini
@@ -56,19 +56,25 @@ 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
+; TFT_BL=GPIO27 (not 21 — 21 is GT911 INT). Keep TOUCH_CS=-1 — GPIO33 is SDA.
 [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/ble_ui.cpp
+++ b/src/ble_ui.cpp
@@ -230,42 +230,43 @@ void ble_ui_create() {
  lv_obj_set_style_text_font(hint, &lv_font_montserrat_14, 0);
  lv_obj_set_pos(hint, UX(10), UY(134));

-  const int bw = 72;
-  const int bh = 36;
-  const int btn_y = UI_VER_RES - bh - 8;
-  const int log_y = 154;
-  const int log_h = btn_y - log_y - 6;  // 不侵入底部按钮带
+  const int bw = UW(72);
+  const int bh = UH(36);
+  const int gap = UW(6);
+  const int btn_y = UI_VER_RES - bh - UY(8);
+  const int log_y = UY(154);
+  const int log_h = btn_y - log_y - UY(6);  // 不侵入底部按钮带

  lv_obj_t *log_box = lv_obj_create(scr);
-  lv_obj_set_pos(log_box, 8, log_y);
-  lv_obj_set_size(log_box, UI_HOR_RES - 16, log_h);
+  lv_obj_set_pos(log_box, UX(8), log_y);
+  lv_obj_set_size(log_box, UI_HOR_RES - UW(16), log_h);
  lv_obj_set_style_bg_color(log_box, lv_color_hex(0x121A24), 0);
  lv_obj_set_style_bg_opa(log_box, LV_OPA_COVER, 0);
  lv_obj_set_style_border_width(log_box, 0, 0);
  lv_obj_set_style_radius(log_box, 6, 0);
-  lv_obj_set_style_pad_all(log_box, 6, 0);
+  lv_obj_set_style_pad_all(log_box, UW(6), 0);
  lv_obj_set_scroll_dir(log_box, LV_DIR_VER);
  lv_obj_clear_flag(log_box, LV_OBJ_FLAG_SCROLL_ELASTIC);

  lbl_log = lv_label_create(log_box);
  lv_label_set_text(lbl_log, g_log);
  lv_label_set_long_mode(lbl_log, LV_LABEL_LONG_WRAP);
-  lv_obj_set_width(lbl_log, UI_HOR_RES - 36);
+  lv_obj_set_width(lbl_log, UI_HOR_RES - UW(36));
  lv_obj_set_style_text_color(lbl_log, lv_color_hex(COL_INK), 0);
  lv_obj_set_style_text_font(lbl_log, &lv_font_montserrat_14, 0);

  btn_adv = make_btn(scr, "Stop Adv", COL_BTN_ACC, on_adv, bw, bh);
  lbl_adv = lv_obj_get_child(btn_adv, 0);
-  lv_obj_set_pos(btn_adv, 8, btn_y);
+  lv_obj_set_pos(btn_adv, UX(8), btn_y);

  lv_obj_t *btn_echo = make_btn(scr, "Echo", COL_BTN, on_echo, bw, bh);
-  lv_obj_set_pos(btn_echo, 8 + bw + 6, btn_y);
+  lv_obj_set_pos(btn_echo, UX(8) + bw + gap, btn_y);

  lv_obj_t *btn_ping = make_btn(scr, "Ping", COL_BTN_ACC, on_ping, bw, bh);
-  lv_obj_set_pos(btn_ping, 8 + 2 * (bw + 6), btn_y);
+  lv_obj_set_pos(btn_ping, UX(8) + 2 * (bw + gap), btn_y);

  lv_obj_t *btn_clear = make_btn(scr, "Clear", COL_BTN_WARN, on_clear, bw, bh);
-  lv_obj_set_pos(btn_clear, 8 + 3 * (bw + 6), btn_y);
+  lv_obj_set_pos(btn_clear, UX(8) + 3 * (bw + gap), btn_y);

  refresh_static();
  refresh_state();
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,5 @@
 #include <Arduino.h>
+#include <esp_heap_caps.h>
 #include <lvgl.h>

 #include "ble_core.h"
@@ -7,8 +8,8 @@
 #include "touch.h"

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

 void setup() {
  Serial.begin(460800);
@@ -22,9 +23,15 @@ void setup() {

  touch_init();

+  draw_buf = (uint32_t *)heap_caps_malloc(DRAW_BUF_SIZE, MALLOC_CAP_DMA | MALLOC_CAP_8BIT);
+  if (!draw_buf) {
+    Serial.println("FATAL: draw_buf alloc failed");
+    while (true) delay(1000);
+  }
+
  lv_init();
  lv_display_t *disp =
-      lv_tft_espi_create(SCREEN_WIDTH, SCREEN_HEIGHT, draw_buf, sizeof(draw_buf));
+      lv_tft_espi_create(SCREEN_WIDTH, SCREEN_HEIGHT, draw_buf, DRAW_BUF_SIZE);
  lv_display_set_rotation(disp, LV_DISPLAY_ROTATION_270);

  lv_indev_t *indev = lv_indev_create();
--- a/src/touch.cpp
+++ b/src/touch.cpp
@@ -3,11 +3,188 @@

 #include <Arduino.h>

+#if defined(CYD_BOARD_3248S035)
+#include <Wire.h>
+#endif
+
 /**
- * SoftSPI XPT2046（与 tftest 相同校准）
- * BL↔TR 主对角线镜像修正，配合 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;
+int16_t g_dbg_phys_y = -1;
+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. */
+  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);
@@ -42,16 +219,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);
@@ -60,6 +227,7 @@ void touch_init() {
  pinMode(CYD_TOUCH_IRQ, INPUT);
  digitalWrite(CYD_TOUCH_CS, HIGH);
  digitalWrite(CYD_TOUCH_CLK, LOW);
+  Serial.println("Touch: SoftSPI + diagonal fix (BL/TR)");
 }

 void touch_read_cb(lv_indev_t * /*indev*/, lv_indev_data_t *data) {
@@ -74,6 +242,7 @@ void touch_read_cb(lv_indev_t * /*indev*/, lv_indev_data_t *data) {

  if (!in_range || (!irq && (adc_x < 200 || adc_y < 200))) {
    data->state = LV_INDEV_STATE_RELEASED;
+    g_dbg_touch_down = false;
    return;
  }

@@ -92,7 +261,24 @@ 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);

-  data->point.x = (int16_t)((SCREEN_WIDTH - 1) - ui_y);
-  data->point.y = ui_x;
+  const int16_t feed_x = (int16_t)((SCREEN_WIDTH - 1) - ui_y);
+  const int16_t feed_y = ui_x;
+
+  g_dbg_phys_x = x;
+  g_dbg_phys_y = y;
+  g_dbg_logic_x = ui_x;
+  g_dbg_logic_y = ui_y;
+  g_dbg_touch_down = true;
+
+  static uint32_t last_log = 0;
+  if (millis() - last_log > 80) {
+    last_log = millis();
+    Serial.printf("Touch UI(%d,%d)\n", ui_x, ui_y);
+  }
+
+  data->point.x = feed_x;
+  data->point.y = feed_y;
  data->state = LV_INDEV_STATE_PRESSED;
 }
+
+#endif