diff --git a/CHANGELOG.md b/CHANGELOG.md index a0242f0..9239548 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 2026-10-25 — 3.5C 背光 / 触控按指南修正 + +- `cyd_35r`：`TFT_BL` / `TFT_BL_PIN` 改为 **GPIO27**（误用 21 会导致黑屏；21 是 GT911 INT）。 +- GT911 复位后 INT 置 `INPUT` 轮询，不再把 INT 当背光拉高。 +- `DRAW_BUF_DIV=20`；`LV_MEM` unflag 与 2.8 一致；补齐 `firmware/cyd_35r` 刷写脚本与文档。 + ## 2026-10-19 — GIF 动区闪 + 切回变小 - 显示统一全屏 STRETCH，离开 GIF 不再缩成小图。 diff --git a/README.md b/README.md index 9a32e50..ceb6e0e 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,19 @@ # CYD Photo Album -ESP32-2432S028R 电子相册：从 TF 卡读取 **JPG / PNG / GIF**，触控切换相片。 +电子相册：从 TF 卡读取 **JPG / PNG / GIF**，触控切换相片。 -硬件与触摸标定复用 `tftest`（SoftSPI + BL/TR 对角修正，**勿改** `src/touch.cpp`）。 +| 板型 | env | 屏 / 触控 | 背光 | +|------|-----|-----------|------| +| **2.8" ESP32-2432S028R**（默认） | `cyd` | ILI9341 + XPT2046 SoftSPI | GPIO**21** | +| **3.5" ESP32-3248S035C** | `cyd_35r` | ST7796 + GT911 I2C | GPIO**27** | + +硬件与触摸复用 `tftest`（2.8 SoftSPI 对角修正 / 3.5 最小 GT911）。**禁止**把 2.8 的 `pins` 原样套到 3.5。约定见上级目录 `CYD_PROJECT_GUIDE.md`。 ## 功能 - 扫描 TF 卡 `/photos` 与根目录的 `.jpg` / `.jpeg` / `.png` / `.gif` -- 半分辨率画布 160×120，界面始终全屏 STRETCH 到 320×240 -- JPG / PNG cover 铺满；GIF 建议 ≤160×120（1:1 解码，减少动区闪烁） +- 半分辨率画布，界面全屏 STRETCH（2.8 → 320×240；3.5 → 480×320） +- JPG / PNG cover 铺满；GIF 建议偏小（1:1 解码，减少动区闪烁） - **点左半屏 = 上一张，点右半屏 = 下一张**；底栏 `<` / `>` 同样切换 - GIF 自动播帧；右上角显示 TF 状态 - 串口 `#PUT` 传文件到卡（`tools/sd_put.py`） @@ -35,14 +40,19 @@ python tools/sd_put.py assets/photos/04_bounce.gif --port COM3 --remote /04_boun ## 构建 / 烧录 ```bash +# 2.8" pio run -e cyd -t upload --upload-port COM3 + +# 3.5C（确认丝印 3248S035C；BL=27、GT911） +pio run -e cyd_35r -t upload --upload-port COM3 ``` 或先导出再刷预编译包： ```powershell -.\firmware\export_from_build.ps1 -cd firmware\cyd +.\firmware\export_from_build.ps1 # → firmware\cyd +.\firmware\export_from_build.ps1 -Env cyd_35r # → firmware\cyd_35r +cd firmware\cyd # 或 cyd_35r .\flash.ps1 -Port COM3 ``` @@ -50,8 +60,10 @@ cd firmware\cyd | 路径 | 说明 | |------|------| -| `src/touch.cpp` | 触摸标定，勿改 | +| `include/pins.h` | 板型分支（BL / 触控 / UI 分辨率） | +| `src/touch.cpp` | 2.8 SoftSPI / 3.5 GT911，勿乱改映射 | | `src/photo_list.cpp` | 扫描相册文件 | | `src/photo_view.cpp` | JPG/PNG/GIF 解码 | | `src/ui.cpp` | 相册界面与切换 | -| `firmware/cyd/` | 预编译固件 + `flash.ps1` | +| `firmware/cyd/` | 2.8 预编译包 | +| `firmware/cyd_35r/` | 3.5 预编译包 | diff --git a/firmware/README.md b/firmware/README.md index b440dca..8dcbb49 100644 --- a/firmware/README.md +++ b/firmware/README.md @@ -1,18 +1,21 @@ # 预编译固件（可随时刷写） -当前归档目录：[`cyd/`](cyd/) +| 目录 | 板型 | 触控 | +|------|------|------| +| [`cyd/`](cyd/) | **ESP32-2432S028R** 2.8"（ILI9341） | SoftSPI XPT2046 | +| [`cyd_35r/`](cyd_35r/) | **ESP32-3248S035C** 3.5"（ST7796） | GT911 电容 | -对应板子：**CYD ESP32-2432S028R**（ILI9341） -功能：电子相册（JPG / PNG / GIF）+ SoftSPI 触控 + TF 卡 -版本信息见 [`cyd/VERSION.txt`](cyd/VERSION.txt)。 +功能：电子相册（JPG / PNG / GIF）+ TF 卡。版本见各目录 `VERSION.txt`。 ## 直接刷写（无需重新编译） 1. USB 连接板子 -2. 执行： +2. 按板型进入对应目录： ```powershell -cd firmware\cyd +cd firmware\cyd # 2.8" +# 或 +cd firmware\cyd_35r # 3.5C .\flash.ps1 # 或指定端口 .\flash.ps1 -Port COM3 @@ -41,7 +44,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 ``` diff --git a/firmware/cyd_35r/VERSION.txt b/firmware/cyd_35r/VERSION.txt new file mode 100644 index 0000000..b2cf7e5 --- /dev/null +++ b/firmware/cyd_35r/VERSION.txt @@ -0,0 +1,15 @@ +name: CYD phtotest (cyd_35r) +git: f870f5c +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 D10883DC87626DD5544015D63FF7BA788DB38A909DC32227AA1C57FBB55C7B50 + partitions.bin 148B959CBFF1C38AA8E1D5C0BA9D612C54997B945E56A63F41223EEF650653A1 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..59491e7 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..c80479b --- /dev/null +++ b/firmware/cyd_35r/flash.ps1 @@ -0,0 +1,98 @@ +# Flash archived CYD TF+Speaker 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." diff --git a/firmware/cyd_35r/media/preview.html b/firmware/cyd_35r/media/preview.html new file mode 100644 index 0000000..655dd64 --- /dev/null +++ b/firmware/cyd_35r/media/preview.html @@ -0,0 +1,51 @@ + + + + +PHOTOS + + + +
+ +
+
PHOTOS3 / 12TF OK
+
sunset.jpg
+
tap · SoftSPI touch
+
+
+ + +
+ + diff --git a/firmware/cyd_35r/meta.json b/firmware/cyd_35r/meta.json new file mode 100644 index 0000000..00238bb --- /dev/null +++ b/firmware/cyd_35r/meta.json @@ -0,0 +1,17 @@ +{ + "boardId": "esp32-3248s035", + "name": "CYD Photo album (3.5\")", + "summary": "TF card photo album with GT911 capacitive touch", + "description": "JPG/PNG/GIF album from TF card on ESP32-3248S035C (ST7796 + GT911). Prev/Next tap or buttons. Backlight GPIO27.", + "tags": [ + "photo", + "album", + "tf", + "touch", + "gt911", + "3.5" + ], + "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..2108af9 Binary files /dev/null and b/firmware/cyd_35r/partitions.bin differ diff --git a/include/pins.h b/include/pins.h index 27e2294..acfe21c 100644 --- 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,6 +34,14 @@ #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 SD_MISO 19 #define SD_MOSI 23 diff --git a/platformio.ini b/platformio.ini index 47b34ce..5f30e84 100644 --- a/platformio.ini +++ b/platformio.ini @@ -58,19 +58,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). 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=24576 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 diff --git a/src/main.cpp b/src/main.cpp index a5b994e..b66ebd2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,5 @@ #include +#include #include #include "pins.h" @@ -9,8 +10,8 @@ #include "ui.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; static uint32_t last_refresh_ms = 0; static constexpr uint32_t REFRESH_MS = 10000; @@ -50,10 +51,16 @@ void setup() { Serial.println("WARN: photo canvas alloc failed"); } + 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(); diff --git a/src/photo_view.cpp b/src/photo_view.cpp index 5ab9f0a..3b1c01d 100644 --- a/src/photo_view.cpp +++ b/src/photo_view.cpp @@ -12,14 +12,15 @@ #include // Half-res canvas (fits ESP32 DRAM). UI shows it at 2x -> 320x240. -static constexpr uint16_t CANVAS_W = UI_HOR_RES / 2; -static constexpr uint16_t CANVAS_H = UI_VER_RES / 2; +/* Cap decode canvas on all boards to fit 3.5" DRAM. */ +static constexpr uint16_t CANVAS_W = 128; +static constexpr uint16_t CANVAS_H = 96; static constexpr size_t CANVAS_PIXELS = (size_t)CANVAS_W * (size_t)CANVAS_H; -static uint16_t g_pixels[CANVAS_PIXELS]; // buffer A +static uint16_t *g_pixels = nullptr; // buffer A (heap) static uint16_t *g_buf_b = nullptr; // buffer B (heap, GIF double-buffer) -static uint16_t *g_show = g_pixels; // LVGL reads this -static uint16_t *g_draw = g_pixels; // GIF decoder writes this +static uint16_t *g_show = nullptr; // LVGL reads this +static uint16_t *g_draw = nullptr; // GIF decoder writes this static bool g_ready = false; static lv_image_dsc_t g_dsc; static uint16_t g_img_w = 0; @@ -39,7 +40,7 @@ static int g_dst_h = 0; // GIF worker (core 0): decode must not block LVGL/touch on core 1. static TaskHandle_t g_gif_task = nullptr; -static uint16_t *g_draw_dst = g_pixels; // alias used by gif_draw +static uint16_t *g_draw_dst = nullptr; // alias used by gif_draw static char g_gif_path[PHOTO_PATH_MAX]; static volatile bool g_gif_active = false; static volatile bool g_gif_busy = false; @@ -596,6 +597,14 @@ bool photo_view_init() { if (g_ready) { return true; } + if (!g_pixels) { + g_pixels = (uint16_t *)malloc(CANVAS_PIXELS * sizeof(uint16_t)); + if (!g_pixels) { + Serial.println("photo_view: canvas alloc failed"); + return false; + } + g_show = g_draw = g_draw_dst = g_pixels; + } canvas_clear(0x0000); canvas_sync_dsc(); g_ready = true; @@ -614,9 +623,11 @@ void photo_view_deinit() { free(g_buf_b); g_buf_b = nullptr; } - g_show = g_pixels; - g_draw = g_pixels; - g_draw_dst = g_pixels; + if (g_pixels) { + free(g_pixels); + g_pixels = nullptr; + } + g_show = g_draw = g_draw_dst = nullptr; g_ready = false; g_dsc.data = nullptr; } diff --git a/src/sd_info.cpp b/src/sd_info.cpp index 88f9b53..293168b 100644 --- a/src/sd_info.cpp +++ b/src/sd_info.cpp @@ -60,8 +60,10 @@ bool sd_init() { pinMode(SD_CS, OUTPUT); digitalWrite(SD_CS, HIGH); +#if !defined(CYD_BOARD_3248S035) pinMode(CYD_TOUCH_CS, OUTPUT); digitalWrite(CYD_TOUCH_CS, HIGH); +#endif sd_spi.begin(SD_SCK, SD_MISO, SD_MOSI, SD_CS); diff --git a/src/touch.cpp b/src/touch.cpp index d43b68a..bd64e07 100644 --- a/src/touch.cpp +++ b/src/touch.cpp @@ -3,10 +3,13 @@ #include +#if defined(CYD_BOARD_3248S035) +#include +#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,173 @@ 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); @@ -49,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); @@ -94,8 +254,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 +261,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 +280,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 diff --git a/src/ui.cpp b/src/ui.cpp index abee735..8a9476d 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -202,7 +202,7 @@ void ui_create() { // Top bar lv_obj_t *top = lv_obj_create(scr); - lv_obj_set_size(top, UI_HOR_RES, 28); + lv_obj_set_size(top, UI_HOR_RES, UH(28)); lv_obj_set_pos(top, UX(0), UY(0)); lv_obj_set_style_bg_color(top, lv_color_hex(COL_BG), 0); lv_obj_set_style_bg_opa(top, LV_OPA_80, 0); @@ -232,8 +232,8 @@ void ui_create() { // Bottom bar lv_obj_t *bot = lv_obj_create(scr); - lv_obj_set_size(bot, UI_HOR_RES, 40); - lv_obj_set_pos(bot, 0, UI_VER_RES - 40); + lv_obj_set_size(bot, UI_HOR_RES, UH(40)); + lv_obj_set_pos(bot, UX(0), UI_VER_RES - UH(40)); lv_obj_set_style_bg_color(bot, lv_color_hex(COL_BG), 0); lv_obj_set_style_bg_opa(bot, LV_OPA_80, 0); lv_obj_set_style_border_width(bot, 0, 0); @@ -254,7 +254,7 @@ void ui_create() { lv_obj_center(lp); btn_next = lv_button_create(bot); - lv_obj_set_pos(btn_next, UI_HOR_RES - 64, 6); + lv_obj_set_pos(btn_next, UI_HOR_RES - UW(64), UY(6)); lv_obj_set_size(btn_next, UW(56), UH(28)); lv_obj_add_flag(btn_next, LV_OBJ_FLAG_CLICKABLE); lv_obj_add_event_cb(btn_next, on_next, LV_EVENT_CLICKED, nullptr); @@ -268,7 +268,7 @@ void ui_create() { lbl_name = lv_label_create(bot); lv_label_set_text(lbl_name, "-"); lv_label_set_long_mode(lbl_name, LV_LABEL_LONG_CLIP); - lv_obj_set_width(lbl_name, UI_HOR_RES - 140); + lv_obj_set_width(lbl_name, UI_HOR_RES - UW(140)); lv_obj_set_style_text_font(lbl_name, &lv_font_montserrat_14, 0); lv_obj_set_style_text_color(lbl_name, lv_color_hex(COL_INK), 0); lv_obj_align(lbl_name, LV_ALIGN_TOP_MID, UX(0), UY(4));