diff --git a/README.md b/README.md index 423c942..ea945b2 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,29 @@ # LCD1602A 液晶（CYD） -触控 + LVGL 参考 `tftest` / `hw269test` / `hw069digitdisplaytest`。 +触控 + LVGL 参考 `tftest` / `hw269test` / `CYD_PROJECT_GUIDE.md`。 LCD1602A（HD44780）经 **PCF8574 I2C 转接板** 驱动：改两行文字、背光、脚位映射。 用途：16×2 **字符提示屏**（状态、读数、短菜单）。驱动简单、资料多；不是彩屏替代品。本工程用于在 CYD 上验证接线与显示是否正常。 ## 硬件 -| 项目 | 说明 | -|------|------| -| 板子 | CYD ESP32-2432S028R | -| 模块 | LCD1602A + I2C 背包（PCF8574，实测地址常为 **0x27**，亦见 **0x3F**） | -| SDA | **GPIO22** | -| SCL | **GPIO27** | +| 项目 | **2.8"（默认 `cyd`）** | **3.5C（`cyd_35r`）** | +|------|------------------------|------------------------| +| 板子 | ESP32-2432S028R | ESP32-3248S035C | +| 屏 / 触控 | ILI9341 + XPT2046 SoftSPI | ST7796 + GT911 I2C | +| TFT 背光 | GPIO21 | **GPIO27** | +| LCD SDA | **GPIO22** | **GPIO22**（不变） | +| LCD SCL | **GPIO27** | **GPIO21**（2.8 的 27 → 21） | +| LCD 总线 | `Wire` | `Wire1`（GT911 占 `Wire` 33/32） | 接线： -| LCD1602A(I2C) | CYD | -|---------------|-----| -| VCC | **5V**（推荐；3.3V 可能对比度不稳） | -| GND | GND | -| SDA | GPIO22 | -| SCL | GPIO27 | +| LCD1602A(I2C) | 2.8" CYD | 3.5" C CYD | +|---------------|----------|------------| +| VCC | **5V**（推荐） | 同左 | +| GND | GND | GND | +| SDA | GPIO22 | GPIO22 | +| SCL | GPIO27 | **GPIO21** | 上电扫描 `0x27 / 0x3F / 0x26 / 0x3E / 0x20 / 0x38`。串口与 TFT 状态栏显示是否找到地址。 @@ -41,7 +43,8 @@ LCD1602A（HD44780）经 **PCF8574 I2C 转接板** 驱动：改两行文字、 1. 确认已调对比度 + VCC=5V 2. TFT 点 **Map** 换 PCF8574 脚位映射，再点 **Hello** -3. 看串口是否有 `PCF8574 found @ 0x..` / `LCD1602A OK` +3. 看串口是否有 `PCF8574 found @ 0x..` / `LCD1602A OK` +4. 3.5：确认 SCL 接的是 **21** 不是 27（27 是 TFT 背光） ## 操作 @@ -54,14 +57,23 @@ LCD1602A（HD44780）经 **PCF8574 I2C 转接板** 驱动：改两行文字、 ## 构建 / 烧录 ```powershell +# 2.8" pio run -e cyd -t upload + +# 3.5C +pio run -e cyd_35r -t upload ``` ## 预编译固件 ```powershell +# 2.8" cd firmware\cyd .\flash.ps1 + +# 3.5" +cd firmware\cyd_35r +.\flash.ps1 # 或 .\flash.ps1 -Port COMx ``` @@ -69,6 +81,7 @@ cd firmware\cyd ```powershell .\firmware\export_from_build.ps1 +.\firmware\export_from_build.ps1 -Env cyd_35r ``` ## 变更记录 @@ -78,3 +91,4 @@ cd firmware\cyd | 2026-10-23 | 初版：I2C LCD1602A（SDA22/SCL27）+ SoftSPI 触控 + LVGL；Demo/Hello/背光 | | 2026-10-23 | 修空白屏：对齐 LiquidCrystal_I2C 时序；增加 Map；提示拧蓝色对比度电位器 | | 2026-10-23 | 文档：对比度仅硬件可调、关背光通常不可读、用途与排障说明 | +| 2026-10-25 | 按指南修正 3.5：BL=27、外设 22+21、GT911 INT 复位后 INPUT、LCD 用 Wire1 | diff --git a/firmware/README.md b/firmware/README.md index 3fd2333..ceb415a 100644 --- a/firmware/README.md +++ b/firmware/README.md @@ -1,17 +1,20 @@ # 预编译固件 -目录：[`cyd/`](cyd/) +| 目录 | 板型 | +|------|------| +| [`cyd/`](cyd/) | **2.8"** ESP32-2432S028R（ILI9341），LCD SDA22/SCL27 | +| [`cyd_35r/`](cyd_35r/) | **3.5C** ESP32-3248S035C（ST7796），LCD SDA22/SCL21，BL=27 | -板子：**CYD ESP32-2432S028R**（ILI9341） -功能：LCD1602A I2C（SDA=GPIO22，SCL=GPIO27，PCF8574）+ SoftSPI 触控 + LVGL - -说明见仓库根目录 [`README.md`](../README.md)（对比度电位器、背光、Map 脚位）。 +说明见仓库根目录 [`README.md`](../README.md)（对比度电位器、背光、Map 脚位、板型接线）。 ## 刷写 ```powershell cd firmware\cyd .\flash.ps1 +# 或 3.5: +cd firmware\cyd_35r +.\flash.ps1 # 或 .\flash.ps1 -Port COM3 ``` @@ -19,5 +22,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 -SkipBuild -Env cyd_35r ``` diff --git a/firmware/cyd_35r/VERSION.txt b/firmware/cyd_35r/VERSION.txt new file mode 100644 index 0000000..14ae0f6 --- /dev/null +++ b/firmware/cyd_35r/VERSION.txt @@ -0,0 +1,15 @@ +name: CYD lcd1602atest (cyd_35r) +git: 57644d2 +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 9C0D00C0D8ABC9CCF55E4BB78DB51A49113B7C2095C029D15BBCBAF67EE0F05A + 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..cfa5d93 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..a440e20 --- /dev/null +++ b/firmware/cyd_35r/flash.ps1 @@ -0,0 +1,98 @@ +# Flash archived CYD LCD1602A 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..88fcbea --- /dev/null +++ b/firmware/cyd_35r/media/preview.html @@ -0,0 +1,55 @@ + + + + +LCD1602A + + + +
+ +
+ +
LCD1602A
+
I2C SDA22 SCL27 PCF8574
+
OK 0x27 map0
+
Blank? turn BLUE pot on backpack
+
[Hello World!]
+
[LCD1602A]
+
+ + + + +
+ +
+ +
+ + diff --git a/firmware/cyd_35r/meta.json b/firmware/cyd_35r/meta.json new file mode 100644 index 0000000..72629d1 --- /dev/null +++ b/firmware/cyd_35r/meta.json @@ -0,0 +1,19 @@ +{ + "boardId": "esp32-3248s035", + "name": "CYD LCD1602A (3.5\")", + "summary": "LCD1602A HD44780 via PCF8574 I2C: SDA GPIO22, SCL GPIO21 — demo / hello / map / backlight; contrast = blue pot only", + "description": "GT911 capacitive touch + LVGL on ESP32-3248S035C (ST7796, BL=GPIO27). LCD1602A on I2C backpack Wire1 SDA22/SCL21 (scan 0x27/0x3F). Contrast is hardware pot (Vo), not software. Backlight off usually unreadable on blue/white modules.", + "tags": [ + "lcd1602a", + "hd44780", + "pcf8574", + "i2c", + "display", + "touch", + "lvgl", + "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..2108af9 Binary files /dev/null and b/firmware/cyd_35r/partitions.bin differ diff --git a/include/pins.h b/include/pins.h index 303797f..b80d28f 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,9 +34,20 @@ #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 +/* LCD1602A I2C backpack: 2.8 forever 22+27; 3.5 forever 22+21 (27 is BL). */ #define LCD_I2C_SDA_PIN 22 +#if defined(CYD_BOARD_3248S035) +#define LCD_I2C_SCL_PIN 21 +#else #define LCD_I2C_SCL_PIN 27 +#endif #define LCD_I2C_FREQ_HZ 100000 #define LCD_COLS 16 #define LCD_ROWS 2 diff --git a/platformio.ini b/platformio.ini index c252e60..24b5c47 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,5 +1,6 @@ -; CYD ESP32-2432S028 — LCD1602A I2C(SDA22/SCL27) + SoftSPI 触控 + LVGL -; 触控/屏配置参考 tftest / hw269test / hw069digitdisplaytest +; CYD — LCD1602A I2C + 触控 + LVGL +; 2.8 (cyd): SDA22/SCL27 SoftSPI; 3.5 (cyd_35r): SDA22/SCL21 GT911, BL=27 +; 参考 tftest / temperature / 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 / LCD SCL). 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 diff --git a/src/lcd.cpp b/src/lcd.cpp index 9ffd97f..61073f4 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -5,6 +5,14 @@ #include #include +/* 3.5: GT911 owns Wire (SDA33/SCL32); LCD uses Wire1 (SDA22/SCL21). + * 2.8: touch is SoftSPI — LCD alone on Wire (SDA22/SCL27). */ +#if defined(CYD_BOARD_3248S035) +#define LCD_WIRE Wire1 +#else +#define LCD_WIRE Wire +#endif + // 两套常见 PCF8574→HD44780 接线（背光位都在 bit3 / bit7 两种） struct PinMap { uint8_t rs; @@ -30,9 +38,12 @@ struct DemoMsg { const char *line1; }; +static char g_demo_sda[17]; +static char g_demo_scl[17]; + static const DemoMsg DEMOS[] = { {"Hello CYD!", "LCD1602A I2C"}, - {"SDA=GPIO22", "SCL=GPIO27"}, + {g_demo_sda, g_demo_scl}, {"Turn blue pot", "for contrast!"}, {"Backlight ON", "Touch UI demo"}, }; @@ -50,9 +61,9 @@ static uint8_t bit_of(uint8_t idx) { return (uint8_t)(1u << idx); } static uint8_t bl_mask() { return g_bl ? bit_of(pm().bl) : 0; } static bool i2c_write(uint8_t data) { - Wire.beginTransmission(g_addr); - Wire.write(data); - return Wire.endTransmission() == 0; + LCD_WIRE.beginTransmission(g_addr); + LCD_WIRE.write(data); + return LCD_WIRE.endTransmission() == 0; } static uint8_t pack_nibble(uint8_t nibble_hi_or_val, uint8_t mode_rs) { @@ -131,8 +142,8 @@ static void write_row(uint8_t row) { } static bool probe_addr(uint8_t addr) { - Wire.beginTransmission(addr); - return Wire.endTransmission() == 0; + LCD_WIRE.beginTransmission(addr); + return LCD_WIRE.endTransmission() == 0; } // 严格按 LiquidCrystal_I2C::begin 时序 @@ -164,14 +175,17 @@ static void apply_lines() { } void lcd_init() { + snprintf(g_demo_sda, sizeof(g_demo_sda), "SDA=GPIO%d", LCD_I2C_SDA_PIN); + snprintf(g_demo_scl, sizeof(g_demo_scl), "SCL=GPIO%d", LCD_I2C_SCL_PIN); + memset(g_lines, 0, sizeof(g_lines)); pad_copy(g_lines[0], "LCD1602A"); pad_copy(g_lines[1], "turn blue pot"); - Wire.end(); + LCD_WIRE.end(); delay(2); - Wire.begin(LCD_I2C_SDA_PIN, LCD_I2C_SCL_PIN); - Wire.setClock(LCD_I2C_FREQ_HZ); + LCD_WIRE.begin(LCD_I2C_SDA_PIN, LCD_I2C_SCL_PIN); + LCD_WIRE.setClock(LCD_I2C_FREQ_HZ); delay(50); g_ok = false; diff --git a/src/main.cpp b/src/main.cpp index 40437a8..1a8042b 100644 --- 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() { diff --git a/src/touch.cpp b/src/touch.cpp index d43b68a..8f27c5f 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,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. + * GPIO21 is also LCD SCL on 3.5; must not hold it as OUTPUT HIGH. */ + 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 diff --git a/src/ui.cpp b/src/ui.cpp index ce406e9..6710f6b 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -179,17 +179,18 @@ void ui_create() { lv_obj_set_style_text_font(lbl_line1, &lv_font_montserrat_18, 0); lv_obj_align(lbl_line1, LV_ALIGN_TOP_MID, UX(0), UY(116)); - const int16_t gap = 8; - const int16_t bw = (UI_HOR_RES - 48 - gap) / 2; - const int16_t bx0 = 24; - const int16_t row0 = 148; - const int16_t row1 = 196; + const int16_t gap = UW(8); + const int16_t bw = (UI_HOR_RES - UW(48) - gap) / 2; + const int16_t bx0 = UX(24); + const int16_t row0 = UY(148); + const int16_t row1 = UY(196); + const int16_t bh = UH(40); - btn_demo = make_btn(scr, "Demo", bx0, row0, bw, 40, on_demo, &lbl_demo); - btn_hello = make_btn(scr, "Hello", bx0 + bw + gap, row0, bw, 40, on_hello, + btn_demo = make_btn(scr, "Demo", bx0, row0, bw, bh, on_demo, &lbl_demo); + btn_hello = make_btn(scr, "Hello", bx0 + bw + gap, row0, bw, bh, on_hello, nullptr); - btn_map = make_btn(scr, "Map 0", bx0, row1, bw, 40, on_map, &lbl_map); - btn_bl = make_btn(scr, "BL OFF", bx0 + bw + gap, row1, bw, 40, on_bl, &lbl_bl); + btn_map = make_btn(scr, "Map 0", bx0, row1, bw, bh, on_map, &lbl_map); + btn_bl = make_btn(scr, "BL OFF", bx0 + bw + gap, row1, bw, bh, on_bl, &lbl_bl); (void)btn_demo; (void)btn_hello;