fix 3.5 backlight and GT911 for cyd_35r.

TFT_BL was wrongly GPIO21 (GT911 INT); use GPIO27, DRAW_BUF_DIV=20, and export firmware/cyd_35r. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-10-25 19:40:29 +08:00
commit ba09f4f48e
33 changed files with 3223 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,12 @@
+.pio/
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch
+*.pyc
+__pycache__/
+.DS_Store
+Thumbs.db
+*.elf
+# Build dir bins stay out; firmware/ prebuilt packages stay in
+!firmware/**/*.bin
--- a/README.md
+++ b/README.md
@@ -0,0 +1,100 @@
+# CYD WiFi 配网基础
+
+可复用 WiFi 配网模块，支持 **2.8"** 与 **3.5"** CYD。显示/触控骨架对齐 [tftest](../tftest)；3.5 背光与 GT911 按 [CYD_PROJECT_GUIDE.md](../CYD_PROJECT_GUIDE.md)。
+
+| 板型 | env | 屏 / 触控 | 背光 |
+|------|-----|-----------|------|
+| **2.8" · 2432S028R** | `cyd`（默认） | ILI9341 + XPT2046 SoftSPI | GPIO**21** |
+| **3.5" · 3248S035C** | `cyd_35r` | ST7796 + GT911 I2C | GPIO**27** |
+
+## 为什么这样设计
+
+| 方式 | 优点 | 缺点 | 本项目 |
+|------|------|------|--------|
+| **屏上 LVGL 扫网 + 键盘** | 不离开手机当前 WiFi；有屏设备体验最好 | 依赖触控 | **主路径** |
+| **SoftAP + Captive Portal** | 手机浏览器配网；无屏板子也能用 | 需连设备热点 | **备用**（Phone AP） |
+| BLE / Espressif Provisioning | 官方、可加密 | 要专用 App、占内存 | 未采用 |
+| tzapu WiFiManager | 成熟 | 阻塞式、和 LVGL 难并存 | 未采用 |
+
+凭证存 **NVS（Preferences）**，重启自动重连；断线会周期性重试。
+
+## 刷写（无需每次编译）
+
+| 板型 | 目录 |
+|------|------|
+| 2.8" | [`firmware/cyd/`](firmware/cyd/) |
+| 3.5" | [`firmware/cyd_35r/`](firmware/cyd_35r/) |
+
+```powershell
+cd firmware\cyd          # 或 firmware\cyd_35r
+.\flash.ps1
+# 或
+.\flash.ps1 -Port COM3
+```
+
+重新打包：
+
+```powershell
+.\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_35r -t upload`  
+串口监视：`pio device monitor -b 460800`
+
+1. 无凭证：进入 **WiFi Setup**，点 **Scan**，选网络，键盘输入密码，**Join**。
+2. 或点 **Phone AP**：手机连 `CYD-Setup`，打开 `http://192.168.4.1/`。
+3. 成功后进状态页；**Change WiFi** / **Forget** 可重配。
+
+## 接到其它项目
+
+只需带走这些文件（无业务耦合）：
+
+```
+include/wifi_prov.h     # 核心 API（无 LVGL）
+src/wifi_prov.cpp
+include/wifi_ui.h       # 可选：屏上 UI
+src/wifi_ui.cpp
+```
+
+有屏时的最小接入：
+
+```cpp
+wifi_prov_begin();   // 有凭证则自动连
+wifi_ui_create();    // 无凭证则进配网页
+
+void loop() {
+  wifi_prov_loop();
+  wifi_ui_tick();
+  // ...
+}
+```
+
+无屏 / 只要门户：
+
+```cpp
+wifi_prov_begin();
+if (!wifi_prov_is_connected()) {
+  wifi_prov_portal_start("MyDevice-Setup");
+}
+// loop 里 wifi_prov_loop();
+```
+
+宏可覆盖（`build_flags`）：
+
+- `WIFI_PROV_AP_SSID` — 默认 `CYD-Setup`
+- `WIFI_PROV_CONNECT_TIMEOUT_MS` — 默认 20s
+- `WIFI_PROV_RECONNECT_MS` — 默认 8s
+
+## 模块划分
+
+- `touch.*` / `pins.h` — CYD 硬件（按 `CYD_BOARD_3248S035` 分支）
+- `wifi_prov.*` — NVS、扫描、连接、重连、SoftAP 门户
+- `wifi_ui.*` — LVGL 列表 + 密码键盘 + 状态页（`UX/UY` 适配 480×320）
+- `main.cpp` — 演示入口
+
+## 硬件
+
+- **2.8"**：ILI9341 240×320，横屏 `ROTATION_270`（逻辑 320×240），触控 SoftSPI。
+- **3.5" C**：ST7796 320×480，逻辑 UI 480×320；GT911 `SDA33/SCL32/INT21/RST25`；**勿**把 GPIO33 当 `TOUCH_CS`。
--- a/copy_lv_conf.py
+++ b/copy_lv_conf.py
@@ -0,0 +1,13 @@
+Import("env")  # noqa: F821
+from pathlib import Path
+
+src = Path(env["PROJECT_DIR"]) / "include" / "lv_conf.h"  # noqa: F821
+dst_dir = Path(env["PROJECT_LIBDEPS_DIR"]) / env["PIOENV"]  # noqa: F821
+dst_dir.mkdir(parents=True, exist_ok=True)
+dst = dst_dir / "lv_conf.h"
+if src.exists():
+    dst.write_text(src.read_text(encoding="utf-8"), encoding="utf-8")
+    lvgl = dst_dir / "lvgl" / "lv_conf.h"
+    if (dst_dir / "lvgl").exists():
+        lvgl.write_text(src.read_text(encoding="utf-8"), encoding="utf-8")
+    print(f"copy_lv_conf: synced -> {dst}")
--- a/firmware/README.md
+++ b/firmware/README.md
@@ -0,0 +1,52 @@
+# 预编译固件（可随时刷写）
+
+| 目录 | 板子 |
+|------|------|
+| [`cyd/`](cyd/) | **2.8"** CYD ESP32-2432S028R（ILI9341） |
+| [`cyd_35r/`](cyd_35r/) | **3.5"** CYD ESP32-3248S035C（ST7796 + GT911） |
+
+功能：**WiFi 配网**（屏上扫网 + SoftAP 门户）  
+版本信息见各目录下 `VERSION.txt`。
+
+也可在 [`../../cydweb`](../../cydweb)（CYD Flasher）里通过浏览器串口刷写本目录固件。
+
+## 直接刷写（无需重新编译）
+
+1. USB 连接板子  
+2. 执行：
+
+```powershell
+cd firmware\cyd          # 3.5": firmware\cyd_35r
+.\flash.ps1
+# 或指定端口
+.\flash.ps1 -Port COM3
+```
+
+也可运行 `flash.bat`。
+
+依赖其一即可：
+
+- 已安装 PlatformIO（`pio`，自带 esptool）
+- 或 `pip install esptool`
+
+## 手动 esptool
+
+```bash
+esptool.py --chip esp32 --port COM3 --baud 921600 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
+```
+
+## 从源码重新打包进本目录
+
+在仓库根目录：
+
+```powershell
+.\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 -Env cyd_35r -SkipBuild
+```
--- a/firmware/cyd/VERSION.txt
+++ b/firmware/cyd/VERSION.txt
@@ -0,0 +1,16 @@
+name: CYD WiFi Prov (cyd)
+git: unknown
+date: 2026-10-22
+board: ESP32-2432S028R (ILI9341)
+features: LVGL WiFi setup, SoftAP captive portal, NVS credentials, SoftSPI touch
+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    70758031CA3FDD951C208CCA9CEB1FB3C3C4A89AEF45142256DA6720D7E3574B
+  partitions.bin  148B959CBFF1C38AA8E1D5C0BA9D612C54997B945E56A63F41223EEF650653A1
--- a/firmware/cyd/boot_app0.bin
+++ b/firmware/cyd/boot_app0.bin
--- a/firmware/cyd/bootloader.bin
+++ b/firmware/cyd/bootloader.bin
--- a/firmware/cyd/firmware.bin
+++ b/firmware/cyd/firmware.bin
--- a/firmware/cyd/flash.bat
+++ b/firmware/cyd/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/flash.ps1
+++ b/firmware/cyd/flash.ps1
@@ -0,0 +1,98 @@
+# Flash archived CYD WiFi Prov 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/media/preview.html
+++ b/firmware/cyd/media/preview.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" />
+<title>WiFi Connected</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:28px;text-align:center;font-size:22px;font-weight:700;color:#3DDC97}
+  .ssid{position:absolute;left:0;right:0;top:68px;text-align:center;font-size:16px}
+  .ip{position:absolute;left:0;right:0;top:96px;text-align:center}
+  .rssi{position:absolute;left:0;right:0;top:118px;text-align:center}
+  .hint{position:absolute;left:0;right:0;top:148px;text-align:center;font-size:11px}
+  .bar{position:absolute;left:16px;right:16px;bottom:16px;display:flex;gap:10px;justify-content:center}
+  .bar .btn{height:40px;min-width:120px}
+  .bar .f{background:#6B3A1E;min-width:90px}
+
+</style>
+</head>
+<body>
+<div class="bezel"><div class="screen" id="s">
+
+  <div class="t">WiFi Connected</div>
+  <div class="ssid">MyHome-5G</div>
+  <div class="ip muted">IP  192.168.1.42</div>
+  <div class="rssi muted">RSSI  -58 dBm</div>
+  <div class="hint muted">Ready for other projects</div>
+  <div class="bar">
+    <button class="btn acc" type="button">Change WiFi</button>
+    <button class="btn f" type="button">Forget</button>
+  </div>
+
+</div></div>
+</body>
+</html>
--- a/firmware/cyd/meta.json
+++ b/firmware/cyd/meta.json
@@ -0,0 +1,15 @@
+{
+  "boardId": "esp32-2432s028",
+  "name": "CYD WiFi Prov",
+  "summary": "LVGL on-screen WiFi setup plus SoftAP captive portal",
+  "description": "Scan networks on the touchscreen, enter password with keyboard, or use phone portal CYD-Setup. Credentials stored in NVS with auto-reconnect.",
+  "tags": [
+    "wifi",
+    "provisioning",
+    "touch",
+    "captive-portal"
+  ],
+  "media": {
+    "preview": "media/preview.html"
+  }
+}
--- a/firmware/cyd/partitions.bin
+++ b/firmware/cyd/partitions.bin
--- a/firmware/cyd_35r/VERSION.txt
+++ b/firmware/cyd_35r/VERSION.txt
@@ -0,0 +1,15 @@
+name: CYD wifitest (cyd_35r)
+git: unknown
+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    6E6DBCB9E886AF2FA0A894092CA0C9B8C28BA74D03BB6E7B26F175E943D32F5D
+  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 WiFi Prov 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,51 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" />
+<title>WiFi Connected</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:28px;text-align:center;font-size:22px;font-weight:700;color:#3DDC97}
+  .ssid{position:absolute;left:0;right:0;top:68px;text-align:center;font-size:16px}
+  .ip{position:absolute;left:0;right:0;top:96px;text-align:center}
+  .rssi{position:absolute;left:0;right:0;top:118px;text-align:center}
+  .hint{position:absolute;left:0;right:0;top:148px;text-align:center;font-size:11px}
+  .bar{position:absolute;left:16px;right:16px;bottom:16px;display:flex;gap:10px;justify-content:center}
+  .bar .btn{height:40px;min-width:120px}
+  .bar .f{background:#6B3A1E;min-width:90px}
+
+
+/* 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">WiFi Connected</div>
+  <div class="ssid">MyHome-5G</div>
+  <div class="ip muted">IP  192.168.1.42</div>
+  <div class="rssi muted">RSSI  -58 dBm</div>
+  <div class="hint muted">Ready for other projects</div>
+  <div class="bar">
+    <button class="btn acc" type="button">Change WiFi</button>
+    <button class="btn f" type="button">Forget</button>
+  </div>
+
+</div></div>
+
+</div>
+</body>
+</html>
--- a/firmware/cyd_35r/meta.json
+++ b/firmware/cyd_35r/meta.json
@@ -0,0 +1,15 @@
+{
+  "boardId": "esp32-3248s035",
+  "name": "CYD WiFi Prov (3.5\")",
+  "summary": "LVGL on-screen WiFi setup plus SoftAP captive portal",
+  "description": "Scan networks on the touchscreen, enter password with keyboard, or use phone portal CYD-Setup. Credentials stored in NVS with auto-reconnect.",
+  "tags": [
+    "wifi",
+    "provisioning",
+    "touch",
+    "captive-portal"
+  ],
+  "media": {
+    "preview": "media/preview.html"
+  }
+}
--- a/firmware/cyd_35r/partitions.bin
+++ b/firmware/cyd_35r/partitions.bin
--- a/firmware/export_from_build.ps1
+++ b/firmware/export_from_build.ps1
@@ -0,0 +1,71 @@
+# Export firmware bins from PlatformIO build.
+# Default: 2.8" (cyd -> firmware/cyd)
+# 3.5":    .\firmware\export_from_build.ps1 -Env cyd_35r
+#          (only after: pio run -e cyd_35r)
+
+param(
+  [switch]$SkipBuild,
+  [ValidateSet("cyd", "cyd_35r")]
+  [string]$Env = "cyd"
+)
+
+$ErrorActionPreference = "Stop"
+$root = Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Path)
+Set-Location $root
+
+$env:Path = "C:\Users\dsx2016\AppData\Local\Programs\Python\Python312\Scripts;" + $env:Path
+
+if (-not $SkipBuild) {
+  pio run -e $Env
+  if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+}
+
+$src = Join-Path $root (".pio\build\" + $Env)
+if ($Env -eq "cyd_35r") {
+  $dstName = "cyd_35r"
+  $boardLine = "board: ESP32-3248S035 (ST7796)"
+  $boardIdHint = "esp32-3248s035"
+} else {
+  $dstName = "cyd"
+  $boardLine = "board: ESP32-2432S028R (ILI9341)"
+  $boardIdHint = "esp32-2432s028"
+}
+$dst = Join-Path $root ("firmware\" + $dstName)
+New-Item -ItemType Directory -Force -Path $dst | Out-Null
+
+foreach ($f in @("bootloader.bin", "partitions.bin", "firmware.bin")) {
+  $p = Join-Path $src $f
+  if (-not (Test-Path $p)) { Write-Error "Missing build artifact: $p — build with: pio run -e $Env" }
+  Copy-Item $p $dst -Force
+}
+
+$bootApp = Join-Path $env:USERPROFILE ".platformio\packages\framework-arduinoespressif32\tools\partitions\boot_app0.bin"
+if (-not (Test-Path $bootApp)) {
+  Write-Error "boot_app0.bin not found under PlatformIO packages"
+}
+Copy-Item $bootApp (Join-Path $dst "boot_app0.bin") -Force
+
+$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
+$lines = @(
+  "name: CYD wifitest ($dstName)",
+  "git: $git",
+  "date: $date",
+  $boardLine,
+  "flash_size: 4MB",
+  "offsets:",
+  "  0x1000  bootloader.bin",
+  "  0x8000  partitions.bin",
+  "  0xe000  boot_app0.bin",
+  "  0x10000 firmware.bin",
+  "sha256:"
+)
+foreach ($h in $hashes) {
+  $lines += ("  {0,-15} {1}" -f (Split-Path $h.Path -Leaf), $h.Hash)
+}
+$lines | Set-Content -Encoding utf8 (Join-Path $dst "VERSION.txt")
+
+
+Write-Host "Exported -> $dst (env=$Env git=$git)"
--- a/include/lv_conf.h
+++ b/include/lv_conf.h
--- a/include/pins.h
+++ b/include/pins.h
@@ -0,0 +1,42 @@
+#pragma once
+
+// Board pins — 2.8" default; 3.5" when CYD_BOARD_3248S035 is set (env:cyd_35r)
+
+#if defined(CYD_BOARD_3248S035)
+#define TFT_BL_PIN 27
+#define SCREEN_WIDTH  320
+#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
+/* 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))
+#define UY(y) ((int)(((long)(y) * (UI_VER_RES)) / 240))
+#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/include/touch.h
+++ b/include/touch.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include <lvgl.h>
+#include <stdint.h>
+
+void touch_init();
+void touch_read_cb(lv_indev_t *indev, lv_indev_data_t *data);
--- a/include/wifi_prov.h
+++ b/include/wifi_prov.h
@@ -0,0 +1,82 @@
+#pragma once
+
+/**
+ * 通用 WiFi 配网核心（无 LVGL 依赖）
+ *
+ * 流程：
+ * 1. wifi_prov_begin() 读 NVS，有凭证则尝试 STA 连接
+ * 2. 失败 / 无凭证 → 业务层开屏上 UI 或 SoftAP 门户
+ * 3. wifi_prov_save() + wifi_prov_connect_to() 完成配网
+ * 4. loop 里调用 wifi_prov_loop() 做断线重连与门户处理
+ */
+
+#include <Arduino.h>
+#include <WiFi.h>
+
+#ifndef WIFI_PROV_AP_SSID
+#define WIFI_PROV_AP_SSID "CYD-Setup"
+#endif
+
+#ifndef WIFI_PROV_CONNECT_TIMEOUT_MS
+#define WIFI_PROV_CONNECT_TIMEOUT_MS 20000u
+#endif
+
+#ifndef WIFI_PROV_RECONNECT_MS
+#define WIFI_PROV_RECONNECT_MS 8000u
+#endif
+
+static constexpr int WIFI_PROV_MAX_SCAN = 16;
+static constexpr size_t WIFI_PROV_SSID_MAX = 32;
+static constexpr size_t WIFI_PROV_PASS_MAX = 64;
+
+struct WifiScanItem {
+  char ssid[WIFI_PROV_SSID_MAX + 1];
+  int32_t rssi;
+  wifi_auth_mode_t auth;
+};
+
+enum WifiProvState : uint8_t {
+  WIFI_PROV_IDLE = 0,
+  WIFI_PROV_CONNECTING,
+  WIFI_PROV_CONNECTED,
+  WIFI_PROV_FAILED,
+  WIFI_PROV_PORTAL,
+};
+
+using WifiProvStateCb = void (*)(WifiProvState state, void *user);
+
+void wifi_prov_set_state_cb(WifiProvStateCb cb, void *user = nullptr);
+
+/** 初始化 Preferences + WiFi STA；有凭证则异步开始连接。返回是否已有凭证。 */
+bool wifi_prov_begin();
+
+bool wifi_prov_has_credentials();
+bool wifi_prov_is_connected();
+WifiProvState wifi_prov_state();
+
+String wifi_prov_ssid();
+String wifi_prov_ip();
+int8_t wifi_prov_rssi();
+
+void wifi_prov_save(const char *ssid, const char *password);
+void wifi_prov_clear();
+
+/** 用已存凭证连接（异步，结果看 wifi_prov_loop / state） */
+void wifi_prov_connect_saved();
+
+/** 连接指定网络并在成功后写入 NVS */
+void wifi_prov_connect_to(const char *ssid, const char *password);
+
+/** 同步扫描，结果写入 out[]，返回条数（≤ WIFI_PROV_MAX_SCAN） */
+int wifi_prov_scan(WifiScanItem *out, int max_items);
+
+/**
+ * SoftAP + 简易 Captive Portal（手机连 CYD-Setup → http://192.168.4.1）
+ * 与屏上配网可并行；配网成功后会自动 stop。
+ */
+void wifi_prov_portal_start(const char *ap_ssid = WIFI_PROV_AP_SSID);
+void wifi_prov_portal_stop();
+bool wifi_prov_portal_active();
+
+/** 每 loop 调用：重连、门户 HTTP、状态回调 */
+void wifi_prov_loop();
--- a/include/wifi_ui.h
+++ b/include/wifi_ui.h
@@ -0,0 +1,17 @@
+#pragma once
+
+/**
+ * LVGL 屏上配网 UI（依赖 wifi_prov）
+ * 复用：拷贝 wifi_ui.* + 在业务里 wifi_ui_create() / wifi_ui_tick()
+ */
+
+void wifi_ui_create();
+void wifi_ui_tick();
+
+/** 强制进入配网页（改密 / 首次） */
+void wifi_ui_show_setup();
+
+/** 显示已连接状态页 */
+void wifi_ui_show_status();
+
+bool wifi_ui_is_setup();
--- a/platformio.ini
+++ b/platformio.ini
@@ -0,0 +1,80 @@
+; CYD ESP32-2432S028 — WiFi provisioning (LVGL touch + SoftAP portal)
+[env:cyd]
+platform = espressif32
+board = esp32dev
+framework = arduino
+monitor_speed = 460800
+upload_speed = 460800
+board_build.partitions = default.csv
+
+lib_deps =
+  bodmer/TFT_eSPI@^2.5.43
+  lvgl/lvgl@9.2.2
+
+build_flags =
+  -DCORE_DEBUG_LEVEL=0
+  -DUSER_SETUP_LOADED=1
+  -DILI9341_2_DRIVER=1
+  -DTFT_WIDTH=240
+  -DTFT_HEIGHT=320
+  -DTFT_MISO=12
+  -DTFT_MOSI=13
+  -DTFT_SCLK=14
+  -DTFT_CS=15
+  -DTFT_DC=2
+  -DTFT_RST=-1
+  -DTFT_BL=21
+  -DTFT_BACKLIGHT_ON=HIGH
+  -DTOUCH_CS=-1
+  -DLOAD_GLCD=1
+  -DLOAD_FONT2=1
+  -DLOAD_FONT4=1
+  -DLOAD_FONT6=1
+  -DLOAD_FONT7=1
+  -DLOAD_FONT8=1
+  -DLOAD_GFXFF=1
+  -DSMOOTH_FONT=1
+  -DSPI_FREQUENCY=40000000
+  -DSPI_READ_FREQUENCY=20000000
+  -DLV_CONF_SKIP
+  -DLV_COLOR_DEPTH=16
+  -DLV_MEM_SIZE=49152
+  -DLV_FONT_MONTSERRAT_14=1
+  -DLV_FONT_MONTSERRAT_16=1
+  -DLV_FONT_MONTSERRAT_18=1
+  -DLV_FONT_MONTSERRAT_20=1
+  -DLV_USE_TFT_ESPI=1
+  -DLV_USE_FLEX=1
+  -DLV_USE_BUTTON=1
+  -DLV_USE_LABEL=1
+  -DLV_USE_LIST=1
+  -DLV_USE_TEXTAREA=1
+  -DLV_USE_KEYBOARD=1
+  -DLV_USE_BTNMATRIX=1
+  -I${PROJECT_DIR}/include
+
+extra_scripts = pre:copy_lv_conf.py
+
+; 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=49152
+build_flags =
+  ${env:cyd.build_flags}
+  -DST7796_DRIVER=1
+  -DTFT_WIDTH=320
+  -DTFT_HEIGHT=480
+  -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
@@ -0,0 +1,45 @@
+#include <Arduino.h>
+#include <lvgl.h>
+
+#include "pins.h"
+#include "touch.h"
+#include "wifi_prov.h"
+#include "wifi_ui.h"
+
+static constexpr uint32_t DRAW_BUF_SIZE =
+    (SCREEN_WIDTH * SCREEN_HEIGHT / DRAW_BUF_DIV * (LV_COLOR_DEPTH / 8));
+static uint32_t draw_buf[DRAW_BUF_SIZE / 4];
+
+void setup() {
+  Serial.begin(460800);
+  delay(200);
+  Serial.println();
+  Serial.printf("LVGL %d.%d.%d | CYD WiFi Prov\n", lv_version_major(),
+                lv_version_minor(), lv_version_patch());
+
+  pinMode(TFT_BL_PIN, OUTPUT);
+  digitalWrite(TFT_BL_PIN, HIGH);
+
+  touch_init();
+
+  lv_init();
+  lv_display_t *disp =
+      lv_tft_espi_create(SCREEN_WIDTH, SCREEN_HEIGHT, draw_buf, sizeof(draw_buf));
+  lv_display_set_rotation(disp, LV_DISPLAY_ROTATION_270);
+
+  lv_indev_t *indev = lv_indev_create();
+  lv_indev_set_type(indev, LV_INDEV_TYPE_POINTER);
+  lv_indev_set_read_cb(indev, touch_read_cb);
+  lv_indev_set_display(indev, disp);
+
+  wifi_prov_begin();
+  wifi_ui_create();
+}
+
+void loop() {
+  wifi_prov_loop();
+  wifi_ui_tick();
+  lv_timer_handler();
+  lv_tick_inc(5);
+  delay(5);
+}
--- a/src/touch.cpp
+++ b/src/touch.cpp
@@ -0,0 +1,284 @@
+#include "touch.h"
+#include "pins.h"
+
+#include <Arduino.h>
+
+#if defined(CYD_BOARD_3248S035)
+#include <Wire.h>
+#endif
+
+/**
+ * 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);
+    digitalWrite(CYD_TOUCH_CLK, HIGH);
+    delayMicroseconds(2);
+    digitalWrite(CYD_TOUCH_CLK, LOW);
+    delayMicroseconds(2);
+  }
+}
+
+static uint16_t soft_read12() {
+  uint16_t v = 0;
+  digitalWrite(CYD_TOUCH_CLK, HIGH);
+  delayMicroseconds(2);
+  digitalWrite(CYD_TOUCH_CLK, LOW);
+  delayMicroseconds(2);
+  for (int i = 0; i < 12; ++i) {
+    digitalWrite(CYD_TOUCH_CLK, HIGH);
+    delayMicroseconds(2);
+    v = (uint16_t)((v << 1) | (digitalRead(CYD_TOUCH_MISO) ? 1u : 0u));
+    digitalWrite(CYD_TOUCH_CLK, LOW);
+    delayMicroseconds(2);
+  }
+  return v;
+}
+
+static uint16_t xpt_read(uint8_t cmd) {
+  digitalWrite(CYD_TOUCH_CS, LOW);
+  soft_write(cmd);
+  uint16_t v = soft_read12();
+  digitalWrite(CYD_TOUCH_CS, HIGH);
+  return v;
+}
+
+void touch_init() {
+  pinMode(CYD_TOUCH_CS, OUTPUT);
+  pinMode(CYD_TOUCH_CLK, OUTPUT);
+  pinMode(CYD_TOUCH_MOSI, OUTPUT);
+  pinMode(CYD_TOUCH_MISO, INPUT);
+  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) {
+  uint16_t adc_x = xpt_read(0x90);
+  uint16_t adc_y = xpt_read(0xD0);
+  adc_x = (uint16_t)((adc_x + xpt_read(0x90)) / 2);
+  adc_y = (uint16_t)((adc_y + xpt_read(0xD0)) / 2);
+
+  const bool irq = (digitalRead(CYD_TOUCH_IRQ) == LOW);
+  const bool in_range =
+      (adc_x > 80 && adc_x < 4000 && adc_y > 80 && adc_y < 4000);
+
+  if (!in_range || (!irq && (adc_x < 200 || adc_y < 200))) {
+    data->state = LV_INDEV_STATE_RELEASED;
+    g_dbg_touch_down = false;
+    return;
+  }
+
+  const int16_t p_x = (int16_t)adc_x;
+  const int16_t p_y = (int16_t)(4095 - adc_y);
+
+  int16_t x = map(p_x, 200, 3700, 1, SCREEN_WIDTH);
+  int16_t y = map(p_y, 240, 3800, 1, SCREEN_HEIGHT);
+  x = clampi(x, 0, SCREEN_WIDTH - 1);
+  y = clampi(y, 0, SCREEN_HEIGHT - 1);
+
+  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,
+                        UI_HOR_RES - 1);
+  int16_t ui_y = clampi((old_ux * (UI_VER_RES - 1)) / (UI_HOR_RES - 1), 0,
+                        UI_VER_RES - 1);
+
+  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
--- a/src/wifi_prov.cpp
+++ b/src/wifi_prov.cpp
@@ -0,0 +1,403 @@
+#include "wifi_prov.h"
+
+#include <DNSServer.h>
+#include <Preferences.h>
+#include <WebServer.h>
+#include <cstring>
+
+static constexpr const char *NVS_NS = "wifi_prov";
+static constexpr const char *NVS_SSID = "ssid";
+static constexpr const char *NVS_PASS = "pass";
+
+static Preferences g_prefs;
+static WifiProvState g_state = WIFI_PROV_IDLE;
+static WifiProvStateCb g_cb = nullptr;
+static void *g_cb_user = nullptr;
+
+static char g_ssid[WIFI_PROV_SSID_MAX + 1] = {};
+static char g_pass[WIFI_PROV_PASS_MAX + 1] = {};
+static bool g_has_creds = false;
+
+static uint32_t g_connect_started_ms = 0;
+static uint32_t g_last_reconnect_ms = 0;
+static bool g_want_connect = false;
+
+static DNSServer *g_dns = nullptr;
+static WebServer *g_http = nullptr;
+static bool g_portal = false;
+static char g_ap_ssid[33] = WIFI_PROV_AP_SSID;
+
+static void set_state(WifiProvState s) {
+  if (g_state == s) {
+    return;
+  }
+  g_state = s;
+  if (g_cb) {
+    g_cb(s, g_cb_user);
+  }
+}
+
+static void load_creds() {
+  g_has_creds = false;
+  g_ssid[0] = '\0';
+  g_pass[0] = '\0';
+  if (!g_prefs.begin(NVS_NS, true)) {
+    return;
+  }
+  String ssid = g_prefs.getString(NVS_SSID, "");
+  String pass = g_prefs.getString(NVS_PASS, "");
+  g_prefs.end();
+  if (ssid.length() == 0 || ssid.length() > WIFI_PROV_SSID_MAX) {
+    return;
+  }
+  strncpy(g_ssid, ssid.c_str(), WIFI_PROV_SSID_MAX);
+  g_ssid[WIFI_PROV_SSID_MAX] = '\0';
+  strncpy(g_pass, pass.c_str(), WIFI_PROV_PASS_MAX);
+  g_pass[WIFI_PROV_PASS_MAX] = '\0';
+  g_has_creds = true;
+}
+
+static void begin_sta_connect(const char *ssid, const char *password) {
+  WiFi.mode(WIFI_STA);
+  WiFi.setAutoReconnect(true);
+  WiFi.persistent(false);
+  WiFi.disconnect(false, true);
+  delay(50);
+  WiFi.begin(ssid, password);
+  g_want_connect = true;
+  g_connect_started_ms = millis();
+  g_last_reconnect_ms = millis();
+  set_state(WIFI_PROV_CONNECTING);
+  Serial.printf("[wifi] connecting to \"%s\"...\n", ssid);
+}
+
+static String html_escape(const String &s) {
+  String o;
+  o.reserve(s.length());
+  for (size_t i = 0; i < s.length(); ++i) {
+    const char c = s[i];
+    if (c == '&') {
+      o += "&amp;";
+    } else if (c == '<') {
+      o += "&lt;";
+    } else if (c == '>') {
+      o += "&gt;";
+    } else if (c == '"') {
+      o += "&quot;";
+    } else {
+      o += c;
+    }
+  }
+  return o;
+}
+
+static String portal_page() {
+  WifiScanItem items[WIFI_PROV_MAX_SCAN];
+  const int n = wifi_prov_scan(items, WIFI_PROV_MAX_SCAN);
+
+  String html;
+  html.reserve(2048);
+  html += F("<!DOCTYPE html><html><head><meta charset=utf-8>"
+            "<meta name=viewport content=\"width=device-width,initial-scale=1\">"
+            "<title>CYD WiFi</title>"
+            "<style>"
+            "body{font-family:system-ui,sans-serif;margin:16px;background:#0f1419;color:#eaf0f6}"
+            "h1{font-size:1.25rem}label{display:block;margin:.6rem 0 .2rem;color:#9ab}"
+            "input,select,button{width:100%;box-sizing:border-box;padding:.7rem;border-radius:8px;"
+            "border:1px solid #334;background:#1a2330;color:#eaf0f6;font-size:1rem}"
+            "button{margin-top:1rem;background:#1a6aa8;border:none;font-weight:600}"
+            ".hint{color:#7a8b9c;font-size:.85rem;margin-top:1rem}"
+            "</style></head><body>"
+            "<h1>WiFi Setup</h1>"
+            "<form method=POST action=/save>"
+            "<label>Network</label><select name=ssid>");
+
+  if (n <= 0) {
+    html += F("<option value=\"\">(no networks — type below)</option>");
+  } else {
+    for (int i = 0; i < n; ++i) {
+      html += F("<option value=\"");
+      html += html_escape(String(items[i].ssid));
+      html += F("\">");
+      html += html_escape(String(items[i].ssid));
+      html += F(" (");
+      html += String(items[i].rssi);
+      html += F(" dBm)</option>");
+    }
+  }
+
+  html += F("</select>"
+            "<label>Or SSID</label><input name=ssid_manual placeholder=\"manual SSID\">"
+            "<label>Password</label><input name=pass type=password placeholder=\"WiFi password\">"
+            "<button type=submit>Save &amp; Connect</button>"
+            "</form>"
+            "<p class=hint>AP: ");
+  html += html_escape(String(g_ap_ssid));
+  html += F(" · http://192.168.4.1/</p></body></html>");
+  return html;
+}
+
+static void handle_root() {
+  g_http->send(200, "text/html", portal_page());
+}
+
+static void handle_save() {
+  String ssid = g_http->arg("ssid_manual");
+  ssid.trim();
+  if (ssid.length() == 0) {
+    ssid = g_http->arg("ssid");
+    ssid.trim();
+  }
+  String pass = g_http->arg("pass");
+
+  g_http->send(200, "text/html",
+               F("<!DOCTYPE html><html><body style=\"font-family:sans-serif;background:#0f1419;"
+                 "color:#eaf0f6;padding:24px\"><h2>Connecting...</h2>"
+                 "<p>You can close this page. Device will leave setup AP.</p></body></html>"));
+
+  if (ssid.length() > 0) {
+    delay(200);
+    wifi_prov_portal_stop();
+    wifi_prov_connect_to(ssid.c_str(), pass.c_str());
+  }
+}
+
+static void handle_captive() {
+  g_http->sendHeader("Location", "http://192.168.4.1/", true);
+  g_http->send(302, "text/plain", "");
+}
+
+static void handle_not_found() {
+  handle_captive();
+}
+
+void wifi_prov_set_state_cb(WifiProvStateCb cb, void *user) {
+  g_cb = cb;
+  g_cb_user = user;
+}
+
+bool wifi_prov_begin() {
+  load_creds();
+  WiFi.mode(WIFI_STA);
+  WiFi.setAutoReconnect(true);
+  WiFi.persistent(false);
+
+  if (g_has_creds) {
+    begin_sta_connect(g_ssid, g_pass);
+  } else {
+    set_state(WIFI_PROV_IDLE);
+    Serial.println("[wifi] no credentials");
+  }
+  return g_has_creds;
+}
+
+bool wifi_prov_has_credentials() { return g_has_creds; }
+
+bool wifi_prov_is_connected() {
+  return WiFi.status() == WL_CONNECTED;
+}
+
+WifiProvState wifi_prov_state() { return g_state; }
+
+String wifi_prov_ssid() {
+  if (WiFi.status() == WL_CONNECTED) {
+    return WiFi.SSID();
+  }
+  return String(g_ssid);
+}
+
+String wifi_prov_ip() {
+  if (WiFi.status() != WL_CONNECTED) {
+    return String();
+  }
+  return WiFi.localIP().toString();
+}
+
+int8_t wifi_prov_rssi() {
+  if (WiFi.status() != WL_CONNECTED) {
+    return 0;
+  }
+  return (int8_t)WiFi.RSSI();
+}
+
+void wifi_prov_save(const char *ssid, const char *password) {
+  if (!ssid || !ssid[0]) {
+    return;
+  }
+  strncpy(g_ssid, ssid, WIFI_PROV_SSID_MAX);
+  g_ssid[WIFI_PROV_SSID_MAX] = '\0';
+  if (password) {
+    strncpy(g_pass, password, WIFI_PROV_PASS_MAX);
+  } else {
+    g_pass[0] = '\0';
+  }
+  g_pass[WIFI_PROV_PASS_MAX] = '\0';
+  g_has_creds = true;
+
+  if (g_prefs.begin(NVS_NS, false)) {
+    g_prefs.putString(NVS_SSID, g_ssid);
+    g_prefs.putString(NVS_PASS, g_pass);
+    g_prefs.end();
+  }
+  Serial.printf("[wifi] saved \"%s\"\n", g_ssid);
+}
+
+void wifi_prov_clear() {
+  g_ssid[0] = '\0';
+  g_pass[0] = '\0';
+  g_has_creds = false;
+  g_want_connect = false;
+  if (g_prefs.begin(NVS_NS, false)) {
+    g_prefs.clear();
+    g_prefs.end();
+  }
+  WiFi.disconnect(true, true);
+  set_state(WIFI_PROV_IDLE);
+  Serial.println("[wifi] credentials cleared");
+}
+
+void wifi_prov_connect_saved() {
+  if (!g_has_creds) {
+    set_state(WIFI_PROV_FAILED);
+    return;
+  }
+  begin_sta_connect(g_ssid, g_pass);
+}
+
+void wifi_prov_connect_to(const char *ssid, const char *password) {
+  wifi_prov_save(ssid, password ? password : "");
+  begin_sta_connect(g_ssid, g_pass);
+}
+
+int wifi_prov_scan(WifiScanItem *out, int max_items) {
+  if (!out || max_items <= 0) {
+    return 0;
+  }
+  if (max_items > WIFI_PROV_MAX_SCAN) {
+    max_items = WIFI_PROV_MAX_SCAN;
+  }
+
+  // SoftAP 时用 APSTA，否则扫描会关掉 AP
+  if (g_portal) {
+    WiFi.mode(WIFI_AP_STA);
+  } else {
+    WiFi.mode(WIFI_STA);
+  }
+
+  const int found = WiFi.scanNetworks(/*async=*/false, /*hidden=*/true);
+  if (found <= 0) {
+    WiFi.scanDelete();
+    return 0;
+  }
+
+  const int n = found < max_items ? found : max_items;
+  for (int i = 0; i < n; ++i) {
+    String s = WiFi.SSID(i);
+    strncpy(out[i].ssid, s.c_str(), WIFI_PROV_SSID_MAX);
+    out[i].ssid[WIFI_PROV_SSID_MAX] = '\0';
+    out[i].rssi = WiFi.RSSI(i);
+    out[i].auth = WiFi.encryptionType(i);
+  }
+  WiFi.scanDelete();
+  return n;
+}
+
+void wifi_prov_portal_start(const char *ap_ssid) {
+  if (g_portal) {
+    return;
+  }
+  if (ap_ssid && ap_ssid[0]) {
+    strncpy(g_ap_ssid, ap_ssid, sizeof(g_ap_ssid) - 1);
+    g_ap_ssid[sizeof(g_ap_ssid) - 1] = '\0';
+  }
+
+  WiFi.mode(WIFI_AP_STA);
+  WiFi.softAP(g_ap_ssid);
+  delay(100);
+
+  g_dns = new DNSServer();
+  g_http = new WebServer(80);
+  g_dns->start(53, "*", WiFi.softAPIP());
+
+  g_http->on("/", HTTP_GET, handle_root);
+  g_http->on("/save", HTTP_POST, handle_save);
+  g_http->on("/generate_204", HTTP_GET, handle_captive);
+  g_http->on("/gen_204", HTTP_GET, handle_captive);
+  g_http->on("/hotspot-detect.html", HTTP_GET, handle_root);
+  g_http->on("/connecttest.txt", HTTP_GET, handle_captive);
+  g_http->on("/ncsi.txt", HTTP_GET, handle_captive);
+  g_http->onNotFound(handle_not_found);
+  g_http->begin();
+
+  g_portal = true;
+  set_state(WIFI_PROV_PORTAL);
+  Serial.printf("[wifi] portal AP \"%s\" @ %s\n", g_ap_ssid,
+                WiFi.softAPIP().toString().c_str());
+}
+
+void wifi_prov_portal_stop() {
+  if (!g_portal) {
+    return;
+  }
+  if (g_http) {
+    g_http->stop();
+    delete g_http;
+    g_http = nullptr;
+  }
+  if (g_dns) {
+    g_dns->stop();
+    delete g_dns;
+    g_dns = nullptr;
+  }
+  WiFi.softAPdisconnect(true);
+  g_portal = false;
+  Serial.println("[wifi] portal stopped");
+}
+
+bool wifi_prov_portal_active() { return g_portal; }
+
+void wifi_prov_loop() {
+  if (g_portal && g_dns && g_http) {
+    g_dns->processNextRequest();
+    g_http->handleClient();
+  }
+
+  const wl_status_t st = WiFi.status();
+  const uint32_t now = millis();
+
+  if (g_want_connect || g_state == WIFI_PROV_CONNECTING) {
+    if (st == WL_CONNECTED) {
+      g_want_connect = false;
+      if (g_portal) {
+        wifi_prov_portal_stop();
+      }
+      set_state(WIFI_PROV_CONNECTED);
+      Serial.printf("[wifi] connected %s  ip=%s  rssi=%d\n", WiFi.SSID().c_str(),
+                    WiFi.localIP().toString().c_str(), WiFi.RSSI());
+      return;
+    }
+
+    if (now - g_connect_started_ms >= WIFI_PROV_CONNECT_TIMEOUT_MS ||
+        st == WL_CONNECT_FAILED || st == WL_NO_SSID_AVAIL) {
+      g_want_connect = false;
+      set_state(WIFI_PROV_FAILED);
+      Serial.println("[wifi] connect failed");
+      return;
+    }
+  }
+
+  // 已配置且非门户：断线后周期性重连
+  if (g_has_creds && !g_portal && g_state == WIFI_PROV_CONNECTED &&
+      st != WL_CONNECTED) {
+    set_state(WIFI_PROV_CONNECTING);
+    g_want_connect = true;
+    g_connect_started_ms = now;
+  }
+
+  if (g_has_creds && !g_portal && st != WL_CONNECTED &&
+      g_state != WIFI_PROV_CONNECTING &&
+      now - g_last_reconnect_ms >= WIFI_PROV_RECONNECT_MS) {
+    g_last_reconnect_ms = now;
+    begin_sta_connect(g_ssid, g_pass);
+  }
+}
--- a/src/wifi_ui.cpp
+++ b/src/wifi_ui.cpp
@@ -0,0 +1,527 @@
+#include "wifi_ui.h"
+#include "pins.h"
+#include "wifi_prov.h"
+
+#include <Arduino.h>
+#include <cstdio>
+#include <cstring>
+#include <lvgl.h>
+
+static constexpr uint32_t COL_BG = 0x0A1016;
+static constexpr uint32_t COL_INK = 0xEAF0F6;
+static constexpr uint32_t COL_MUTED = 0x7A8B9C;
+static constexpr uint32_t COL_LINE = 0x1C2A38;
+static constexpr uint32_t COL_OK = 0x3DDC97;
+static constexpr uint32_t COL_BAD = 0xE85D4C;
+static constexpr uint32_t COL_ACCENT = 0x4FC3F7;
+static constexpr uint32_t COL_BTN = 0x243140;
+static constexpr uint32_t COL_BTN_ACC = 0x1A4A6E;
+static constexpr uint32_t COL_BTN_WARN = 0x6B3A1E;
+
+static lv_obj_t *scr_status = nullptr;
+static lv_obj_t *scr_setup = nullptr;
+static lv_obj_t *lbl_title = nullptr;
+static lv_obj_t *lbl_ssid = nullptr;
+static lv_obj_t *lbl_ip = nullptr;
+static lv_obj_t *lbl_rssi = nullptr;
+static lv_obj_t *lbl_hint = nullptr;
+
+static lv_obj_t *lbl_setup_status = nullptr;
+static lv_obj_t *list_wifi = nullptr;
+static lv_obj_t *overlay = nullptr;
+static lv_obj_t *dlg = nullptr;
+static lv_obj_t *lbl_dlg_ssid = nullptr;
+static lv_obj_t *ta_pass = nullptr;
+static lv_obj_t *btn_show_pass = nullptr;
+static lv_obj_t *lbl_show_pass = nullptr;
+static lv_obj_t *kb = nullptr;
+
+static WifiScanItem g_items[WIFI_PROV_MAX_SCAN];
+static int g_item_n = 0;
+static char g_pick_ssid[WIFI_PROV_SSID_MAX + 1] = {};
+static bool g_on_setup = false;
+static bool g_pass_visible = false;
+static WifiProvState g_last_shown = WIFI_PROV_IDLE;
+
+static void style_btn(lv_obj_t *btn, uint32_t bg) {
+  lv_obj_set_style_radius(btn, 8, 0);
+  lv_obj_set_style_bg_color(btn, lv_color_hex(bg), 0);
+  lv_obj_set_style_bg_opa(btn, LV_OPA_COVER, 0);
+  lv_obj_set_style_shadow_width(btn, 0, 0);
+  lv_obj_set_style_border_width(btn, 0, 0);
+  lv_obj_set_style_pad_all(btn, 0, 0);
+}
+
+static lv_obj_t *make_btn(lv_obj_t *parent, const char *text, uint32_t bg,
+                          lv_event_cb_t cb, int w, int h) {
+  lv_obj_t *btn = lv_button_create(parent);
+  lv_obj_set_size(btn, w, h);
+  style_btn(btn, bg);
+  lv_obj_t *lab = lv_label_create(btn);
+  lv_label_set_text(lab, text);
+  lv_obj_set_style_text_color(lab, lv_color_hex(COL_INK), 0);
+  lv_obj_set_style_text_font(lab, &lv_font_montserrat_14, 0);
+  lv_obj_center(lab);
+  if (cb) {
+    lv_obj_add_event_cb(btn, cb, LV_EVENT_CLICKED, nullptr);
+  }
+  return btn;
+}
+
+static void hide_password_dialog() {
+  if (overlay) {
+    lv_obj_add_flag(overlay, LV_OBJ_FLAG_HIDDEN);
+  }
+  if (kb) {
+    lv_obj_add_flag(kb, LV_OBJ_FLAG_HIDDEN);
+  }
+}
+
+static void set_pass_visible(bool visible) {
+  g_pass_visible = visible;
+  if (ta_pass) {
+    lv_textarea_set_password_mode(ta_pass, !visible);
+  }
+  if (lbl_show_pass) {
+    lv_label_set_text(lbl_show_pass, visible ? "Hide" : "Show");
+  }
+}
+
+static void show_password_dialog(const char *ssid) {
+  strncpy(g_pick_ssid, ssid, WIFI_PROV_SSID_MAX);
+  g_pick_ssid[WIFI_PROV_SSID_MAX] = '\0';
+  if (lbl_dlg_ssid) {
+    lv_label_set_text(lbl_dlg_ssid, g_pick_ssid);
+  }
+  if (ta_pass) {
+    lv_textarea_set_text(ta_pass, "");
+  }
+  set_pass_visible(false);
+  if (overlay) {
+    lv_obj_clear_flag(overlay, LV_OBJ_FLAG_HIDDEN);
+    lv_obj_move_foreground(overlay);
+  }
+  if (kb) {
+    lv_obj_clear_flag(kb, LV_OBJ_FLAG_HIDDEN);
+    lv_obj_move_foreground(kb);
+  }
+}
+
+static void set_setup_status(const char *msg) {
+  if (lbl_setup_status) {
+    lv_label_set_text(lbl_setup_status, msg);
+  }
+}
+
+static void on_row_join(lv_event_t *e) {
+  const int idx = (int)(intptr_t)lv_event_get_user_data(e);
+  if (idx < 0 || idx >= g_item_n) {
+    return;
+  }
+  if (g_items[idx].auth == WIFI_AUTH_OPEN) {
+    set_setup_status("Connecting...");
+    wifi_prov_connect_to(g_items[idx].ssid, "");
+    return;
+  }
+  show_password_dialog(g_items[idx].ssid);
+}
+
+static void rebuild_list() {
+  if (!list_wifi) {
+    return;
+  }
+  lv_obj_clean(list_wifi);
+
+  if (g_item_n <= 0) {
+    lv_obj_t *lab = lv_label_create(list_wifi);
+    lv_label_set_text(lab, "No networks. Tap Scan.");
+    lv_obj_set_style_text_color(lab, lv_color_hex(COL_MUTED), 0);
+    return;
+  }
+
+  // 行本身不可点，只有右侧 Join 按钮才会配网，避免滚动误触
+  for (int i = 0; i < g_item_n; ++i) {
+    lv_obj_t *row = lv_obj_create(list_wifi);
+    lv_obj_set_width(row, lv_pct(100));
+    lv_obj_set_height(row, UH(36));
+    lv_obj_set_style_bg_color(row, lv_color_hex(0x121A24), 0);
+    lv_obj_set_style_bg_opa(row, LV_OPA_COVER, 0);
+    lv_obj_set_style_border_width(row, 0, 0);
+    lv_obj_set_style_radius(row, 6, 0);
+    lv_obj_set_style_pad_hor(row, 6, 0);
+    lv_obj_set_style_pad_ver(row, 2, 0);
+    lv_obj_set_style_margin_bottom(row, 4, 0);
+    lv_obj_set_flex_flow(row, LV_FLEX_FLOW_ROW);
+    lv_obj_set_flex_align(row, LV_FLEX_ALIGN_SPACE_BETWEEN, LV_FLEX_ALIGN_CENTER,
+                          LV_FLEX_ALIGN_CENTER);
+    // 行/信息区不接点击：触摸落到父列表上，整区可拖滚动；只有 Join 可点
+    lv_obj_clear_flag(row, LV_OBJ_FLAG_SCROLLABLE);
+    lv_obj_clear_flag(row, LV_OBJ_FLAG_CLICKABLE);
+    lv_obj_add_flag(row, LV_OBJ_FLAG_EVENT_BUBBLE);
+
+    lv_obj_t *info = lv_obj_create(row);
+    lv_obj_set_flex_grow(info, 1);
+    lv_obj_set_height(info, lv_pct(100));
+    lv_obj_set_style_bg_opa(info, LV_OPA_TRANSP, 0);
+    lv_obj_set_style_border_width(info, 0, 0);
+    lv_obj_set_style_pad_all(info, 0, 0);
+    lv_obj_clear_flag(info, LV_OBJ_FLAG_SCROLLABLE);
+    lv_obj_clear_flag(info, LV_OBJ_FLAG_CLICKABLE);
+    lv_obj_add_flag(info, LV_OBJ_FLAG_EVENT_BUBBLE);
+
+    char line[56];
+    snprintf(line, sizeof(line), LV_SYMBOL_WIFI " %s", g_items[i].ssid);
+    lv_obj_t *lab = lv_label_create(info);
+    lv_label_set_text(lab, line);
+    lv_label_set_long_mode(lab, LV_LABEL_LONG_DOT);
+    lv_obj_set_width(lab, lv_pct(100));
+    lv_obj_set_style_text_color(lab, lv_color_hex(COL_INK), 0);
+    lv_obj_set_style_text_font(lab, &lv_font_montserrat_14, 0);
+    lv_obj_align(lab, LV_ALIGN_LEFT_MID, UX(0), UY(-6));
+
+    char rssi[16];
+    snprintf(rssi, sizeof(rssi), "%d dBm", (int)g_items[i].rssi);
+    lv_obj_t *lab_r = lv_label_create(info);
+    lv_label_set_text(lab_r, rssi);
+    lv_obj_set_style_text_color(lab_r, lv_color_hex(COL_MUTED), 0);
+    lv_obj_set_style_text_font(lab_r, &lv_font_montserrat_14, 0);
+    lv_obj_align(lab_r, LV_ALIGN_LEFT_MID, UX(0), UY(8));
+
+    lv_obj_t *join = lv_button_create(row);
+    lv_obj_set_size(join, UW(56), UH(28));
+    style_btn(join, COL_BTN_ACC);
+    lv_obj_t *jl = lv_label_create(join);
+    lv_label_set_text(jl, "Join");
+    lv_obj_set_style_text_color(jl, lv_color_hex(COL_INK), 0);
+    lv_obj_set_style_text_font(jl, &lv_font_montserrat_14, 0);
+    lv_obj_center(jl);
+    lv_obj_add_event_cb(join, on_row_join, LV_EVENT_CLICKED,
+                        (void *)(intptr_t)i);
+  }
+}
+
+static void do_scan() {
+  set_setup_status("Scanning...");
+  lv_timer_handler();
+  g_item_n = wifi_prov_scan(g_items, WIFI_PROV_MAX_SCAN);
+  rebuild_list();
+  char buf[40];
+  snprintf(buf, sizeof(buf), "Found %d", g_item_n);
+  set_setup_status(buf);
+}
+
+static void on_scan(lv_event_t *e) {
+  LV_UNUSED(e);
+  do_scan();
+}
+
+static void on_portal(lv_event_t *e) {
+  LV_UNUSED(e);
+  wifi_prov_portal_start();
+  set_setup_status("Phone: join CYD-Setup");
+}
+
+static void on_join(lv_event_t *e) {
+  LV_UNUSED(e);
+  const char *pass = ta_pass ? lv_textarea_get_text(ta_pass) : "";
+  hide_password_dialog();
+  set_setup_status("Connecting...");
+  wifi_prov_connect_to(g_pick_ssid, pass);
+}
+
+static void on_dlg_back(lv_event_t *e) {
+  LV_UNUSED(e);
+  hide_password_dialog();
+}
+
+static void on_toggle_pass(lv_event_t *e) {
+  LV_UNUSED(e);
+  set_pass_visible(!g_pass_visible);
+}
+
+static void on_kb(lv_event_t *e) {
+  const lv_event_code_t code = lv_event_get_code(e);
+  if (code == LV_EVENT_READY) {
+    on_join(e);
+  } else if (code == LV_EVENT_CANCEL) {
+    hide_password_dialog();
+  }
+}
+
+static void on_change_wifi(lv_event_t *e) {
+  LV_UNUSED(e);
+  wifi_ui_show_setup();
+  do_scan();
+}
+
+static void on_forget(lv_event_t *e) {
+  LV_UNUSED(e);
+  wifi_prov_clear();
+  wifi_ui_show_setup();
+  set_setup_status("Cleared. Scan to setup.");
+}
+
+static void refresh_status_labels() {
+  if (!lbl_ssid) {
+    return;
+  }
+  const WifiProvState st = wifi_prov_state();
+  if (st == WIFI_PROV_CONNECTED && wifi_prov_is_connected()) {
+    lv_label_set_text(lbl_title, "WiFi Connected");
+    lv_obj_set_style_text_color(lbl_title, lv_color_hex(COL_OK), 0);
+    lv_label_set_text(lbl_ssid, wifi_prov_ssid().c_str());
+    char ip[40];
+    snprintf(ip, sizeof(ip), "IP  %s", wifi_prov_ip().c_str());
+    lv_label_set_text(lbl_ip, ip);
+    char rs[24];
+    snprintf(rs, sizeof(rs), "RSSI  %d dBm", (int)wifi_prov_rssi());
+    lv_label_set_text(lbl_rssi, rs);
+    lv_label_set_text(lbl_hint, "Ready for other projects");
+  } else if (st == WIFI_PROV_CONNECTING) {
+    lv_label_set_text(lbl_title, "Connecting...");
+    lv_obj_set_style_text_color(lbl_title, lv_color_hex(COL_ACCENT), 0);
+    lv_label_set_text(lbl_ssid, wifi_prov_ssid().c_str());
+    lv_label_set_text(lbl_ip, "IP  —");
+    lv_label_set_text(lbl_rssi, "");
+    lv_label_set_text(lbl_hint, "Please wait");
+  } else if (st == WIFI_PROV_FAILED) {
+    lv_label_set_text(lbl_title, "Connect failed");
+    lv_obj_set_style_text_color(lbl_title, lv_color_hex(COL_BAD), 0);
+    lv_label_set_text(lbl_ssid, wifi_prov_ssid().c_str());
+    lv_label_set_text(lbl_ip, "IP  —");
+    lv_label_set_text(lbl_rssi, "");
+    lv_label_set_text(lbl_hint, "Tap Change WiFi");
+  } else {
+    lv_label_set_text(lbl_title, "Not configured");
+    lv_obj_set_style_text_color(lbl_title, lv_color_hex(COL_MUTED), 0);
+    lv_label_set_text(lbl_ssid, "—");
+    lv_label_set_text(lbl_ip, "IP  —");
+    lv_label_set_text(lbl_rssi, "");
+    lv_label_set_text(lbl_hint, "Open setup");
+  }
+}
+
+static void build_status() {
+  scr_status = lv_obj_create(NULL);
+  lv_obj_set_style_bg_color(scr_status, lv_color_hex(COL_BG), 0);
+  lv_obj_set_style_bg_opa(scr_status, LV_OPA_COVER, 0);
+  lv_obj_clear_flag(scr_status, LV_OBJ_FLAG_SCROLLABLE);
+
+  lbl_title = lv_label_create(scr_status);
+  lv_obj_set_style_text_font(lbl_title, &lv_font_montserrat_20, 0);
+  lv_obj_set_style_text_color(lbl_title, lv_color_hex(COL_OK), 0);
+  lv_obj_align(lbl_title, LV_ALIGN_TOP_MID, UX(0), UY(16));
+
+  lbl_ssid = lv_label_create(scr_status);
+  lv_obj_set_style_text_font(lbl_ssid, &lv_font_montserrat_18, 0);
+  lv_obj_set_style_text_color(lbl_ssid, lv_color_hex(COL_INK), 0);
+  lv_obj_align(lbl_ssid, LV_ALIGN_TOP_MID, UX(0), UY(52));
+
+  lbl_ip = lv_label_create(scr_status);
+  lv_obj_set_style_text_font(lbl_ip, &lv_font_montserrat_14, 0);
+  lv_obj_set_style_text_color(lbl_ip, lv_color_hex(COL_ACCENT), 0);
+  lv_obj_align(lbl_ip, LV_ALIGN_TOP_MID, UX(0), UY(86));
+
+  lbl_rssi = lv_label_create(scr_status);
+  lv_obj_set_style_text_font(lbl_rssi, &lv_font_montserrat_14, 0);
+  lv_obj_set_style_text_color(lbl_rssi, lv_color_hex(COL_MUTED), 0);
+  lv_obj_align(lbl_rssi, LV_ALIGN_TOP_MID, UX(0), UY(110));
+
+  lbl_hint = lv_label_create(scr_status);
+  lv_obj_set_style_text_font(lbl_hint, &lv_font_montserrat_14, 0);
+  lv_obj_set_style_text_color(lbl_hint, lv_color_hex(COL_MUTED), 0);
+  lv_obj_align(lbl_hint, LV_ALIGN_TOP_MID, UX(0), UY(140));
+
+  lv_obj_t *row = lv_obj_create(scr_status);
+  lv_obj_set_size(row, UI_HOR_RES - UW(24), UH(44));
+  lv_obj_align(row, LV_ALIGN_BOTTOM_MID, UX(0), UY(-12));
+  lv_obj_set_style_bg_opa(row, LV_OPA_TRANSP, 0);
+  lv_obj_set_style_border_width(row, 0, 0);
+  lv_obj_set_style_pad_all(row, 0, 0);
+  lv_obj_set_flex_flow(row, LV_FLEX_FLOW_ROW);
+  lv_obj_set_flex_align(row, LV_FLEX_ALIGN_SPACE_BETWEEN, LV_FLEX_ALIGN_CENTER,
+                        LV_FLEX_ALIGN_CENTER);
+  lv_obj_clear_flag(row, LV_OBJ_FLAG_SCROLLABLE);
+
+  make_btn(row, "Change WiFi", COL_BTN_ACC, on_change_wifi, UW(140), UH(40));
+  make_btn(row, "Forget", COL_BTN_WARN, on_forget, UW(100), UH(40));
+}
+
+static void build_setup() {
+  scr_setup = lv_obj_create(NULL);
+  lv_obj_set_style_bg_color(scr_setup, lv_color_hex(COL_BG), 0);
+  lv_obj_set_style_bg_opa(scr_setup, LV_OPA_COVER, 0);
+  lv_obj_clear_flag(scr_setup, LV_OBJ_FLAG_SCROLLABLE);
+
+  lv_obj_t *title = lv_label_create(scr_setup);
+  lv_label_set_text(title, "WiFi Setup");
+  lv_obj_set_style_text_font(title, &lv_font_montserrat_18, 0);
+  lv_obj_set_style_text_color(title, lv_color_hex(COL_INK), 0);
+  lv_obj_align(title, LV_ALIGN_TOP_LEFT, UX(10), UY(8));
+
+  lbl_setup_status = lv_label_create(scr_setup);
+  lv_label_set_text(lbl_setup_status, "Tap Scan");
+  lv_obj_set_style_text_font(lbl_setup_status, &lv_font_montserrat_14, 0);
+  lv_obj_set_style_text_color(lbl_setup_status, lv_color_hex(COL_MUTED), 0);
+  lv_obj_align(lbl_setup_status, LV_ALIGN_TOP_RIGHT, UX(-10), UY(10));
+
+  lv_obj_t *bar = lv_obj_create(scr_setup);
+  lv_obj_set_size(bar, UI_HOR_RES - UW(16), UH(36));
+  lv_obj_align(bar, LV_ALIGN_TOP_MID, UX(0), UY(34));
+  lv_obj_set_style_bg_opa(bar, LV_OPA_TRANSP, 0);
+  lv_obj_set_style_border_width(bar, 0, 0);
+  lv_obj_set_style_pad_all(bar, 0, 0);
+  lv_obj_set_flex_flow(bar, LV_FLEX_FLOW_ROW);
+  lv_obj_set_flex_align(bar, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_CENTER,
+                        LV_FLEX_ALIGN_CENTER);
+  lv_obj_set_style_pad_column(bar, UW(8), 0);
+  lv_obj_clear_flag(bar, LV_OBJ_FLAG_SCROLLABLE);
+
+  make_btn(bar, "Scan", COL_BTN_ACC, on_scan, UW(72), UH(32));
+  make_btn(bar, "Phone AP", COL_BTN, on_portal, UW(96), UH(32));
+  make_btn(bar, "Status", COL_BTN, [](lv_event_t *e) {
+    LV_UNUSED(e);
+    wifi_ui_show_status();
+  }, UW(72), UH(32));
+
+  list_wifi = lv_obj_create(scr_setup);
+  lv_obj_set_size(list_wifi, UI_HOR_RES - UW(16), UI_VER_RES - UH(80));
+  lv_obj_align(list_wifi, LV_ALIGN_TOP_MID, UX(0), UY(74));
+  lv_obj_set_style_bg_color(list_wifi, lv_color_hex(COL_LINE), 0);
+  lv_obj_set_style_border_width(list_wifi, 0, 0);
+  lv_obj_set_style_radius(list_wifi, 8, 0);
+  lv_obj_set_style_pad_all(list_wifi, 4, 0);
+  lv_obj_set_flex_flow(list_wifi, LV_FLEX_FLOW_COLUMN);
+  lv_obj_set_flex_align(list_wifi, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START,
+                        LV_FLEX_ALIGN_START);
+  lv_obj_set_scroll_dir(list_wifi, LV_DIR_VER);
+  // 必须 CLICKABLE，否则列表区域收不到拖动手势，只有点到子按钮才可能滚
+  lv_obj_add_flag(list_wifi, LV_OBJ_FLAG_SCROLLABLE);
+  lv_obj_add_flag(list_wifi, LV_OBJ_FLAG_CLICKABLE);
+  lv_obj_add_flag(list_wifi, LV_OBJ_FLAG_SCROLL_ELASTIC);
+  lv_obj_add_flag(list_wifi, LV_OBJ_FLAG_SCROLL_MOMENTUM);
+
+  // 密码层
+  overlay = lv_obj_create(scr_setup);
+  lv_obj_set_size(overlay, UI_HOR_RES, UI_VER_RES);
+  lv_obj_set_style_bg_color(overlay, lv_color_hex(0x000000), 0);
+  lv_obj_set_style_bg_opa(overlay, LV_OPA_70, 0);
+  lv_obj_set_style_border_width(overlay, 0, 0);
+  lv_obj_set_style_pad_all(overlay, 0, 0);
+  lv_obj_clear_flag(overlay, LV_OBJ_FLAG_SCROLLABLE);
+  lv_obj_add_flag(overlay, LV_OBJ_FLAG_HIDDEN);
+
+  dlg = lv_obj_create(overlay);
+  lv_obj_set_size(dlg, UI_HOR_RES - UW(20), UH(100));
+  lv_obj_align(dlg, LV_ALIGN_TOP_MID, UX(0), UY(8));
+  lv_obj_set_style_bg_color(dlg, lv_color_hex(0x15202C), 0);
+  lv_obj_set_style_border_width(dlg, 0, 0);
+  lv_obj_set_style_radius(dlg, 10, 0);
+  lv_obj_set_style_pad_all(dlg, 8, 0);
+  lv_obj_clear_flag(dlg, LV_OBJ_FLAG_SCROLLABLE);
+
+  lbl_dlg_ssid = lv_label_create(dlg);
+  lv_label_set_text(lbl_dlg_ssid, "");
+  lv_obj_set_style_text_color(lbl_dlg_ssid, lv_color_hex(COL_ACCENT), 0);
+  lv_obj_set_style_text_font(lbl_dlg_ssid, &lv_font_montserrat_14, 0);
+  lv_obj_align(lbl_dlg_ssid, LV_ALIGN_TOP_LEFT, UX(0), UY(0));
+
+  lv_obj_t *pass_row = lv_obj_create(dlg);
+  lv_obj_set_size(pass_row, UI_HOR_RES - UW(40), UH(32));
+  lv_obj_align(pass_row, LV_ALIGN_TOP_LEFT, UX(0), UY(22));
+  lv_obj_set_style_bg_opa(pass_row, LV_OPA_TRANSP, 0);
+  lv_obj_set_style_border_width(pass_row, 0, 0);
+  lv_obj_set_style_pad_all(pass_row, 0, 0);
+  lv_obj_set_flex_flow(pass_row, LV_FLEX_FLOW_ROW);
+  lv_obj_set_flex_align(pass_row, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_CENTER,
+                        LV_FLEX_ALIGN_CENTER);
+  lv_obj_set_style_pad_column(pass_row, UW(6), 0);
+  lv_obj_clear_flag(pass_row, LV_OBJ_FLAG_SCROLLABLE);
+
+  ta_pass = lv_textarea_create(pass_row);
+  lv_obj_set_size(ta_pass, UI_HOR_RES - UW(40) - UW(62), UH(32));
+  lv_textarea_set_one_line(ta_pass, true);
+  lv_textarea_set_password_mode(ta_pass, true);
+  lv_textarea_set_placeholder_text(ta_pass, "Password");
+  lv_obj_set_style_text_font(ta_pass, &lv_font_montserrat_14, 0);
+
+  btn_show_pass = lv_button_create(pass_row);
+  lv_obj_set_size(btn_show_pass, UW(56), UH(28));
+  style_btn(btn_show_pass, COL_BTN);
+  lbl_show_pass = lv_label_create(btn_show_pass);
+  lv_label_set_text(lbl_show_pass, "Show");
+  lv_obj_set_style_text_color(lbl_show_pass, lv_color_hex(COL_INK), 0);
+  lv_obj_set_style_text_font(lbl_show_pass, &lv_font_montserrat_14, 0);
+  lv_obj_center(lbl_show_pass);
+  lv_obj_add_event_cb(btn_show_pass, on_toggle_pass, LV_EVENT_CLICKED, nullptr);
+
+  lv_obj_t *row = lv_obj_create(dlg);
+  lv_obj_set_size(row, UI_HOR_RES - UW(40), UH(28));
+  lv_obj_align(row, LV_ALIGN_BOTTOM_MID, UX(0), UY(0));
+  lv_obj_set_style_bg_opa(row, LV_OPA_TRANSP, 0);
+  lv_obj_set_style_border_width(row, 0, 0);
+  lv_obj_set_style_pad_all(row, 0, 0);
+  lv_obj_set_flex_flow(row, LV_FLEX_FLOW_ROW);
+  lv_obj_set_flex_align(row, LV_FLEX_ALIGN_SPACE_BETWEEN, LV_FLEX_ALIGN_CENTER,
+                        LV_FLEX_ALIGN_CENTER);
+  lv_obj_clear_flag(row, LV_OBJ_FLAG_SCROLLABLE);
+  make_btn(row, "Back", COL_BTN, on_dlg_back, UW(70), UH(26));
+  make_btn(row, "Join", COL_BTN_ACC, on_join, UW(70), UH(26));
+
+  kb = lv_keyboard_create(scr_setup);
+  lv_obj_set_size(kb, UI_HOR_RES, UH(110));
+  lv_obj_align(kb, LV_ALIGN_BOTTOM_MID, UX(0), UY(0));
+  lv_keyboard_set_mode(kb, LV_KEYBOARD_MODE_TEXT_LOWER);
+  lv_keyboard_set_textarea(kb, ta_pass);
+  lv_obj_add_event_cb(kb, on_kb, LV_EVENT_ALL, nullptr);
+  lv_obj_add_flag(kb, LV_OBJ_FLAG_HIDDEN);
+}
+
+void wifi_ui_create() {
+  build_status();
+  build_setup();
+
+  if (wifi_prov_has_credentials()) {
+    wifi_ui_show_status();
+  } else {
+    wifi_ui_show_setup();
+    do_scan();
+  }
+  refresh_status_labels();
+}
+
+void wifi_ui_show_setup() {
+  g_on_setup = true;
+  hide_password_dialog();
+  lv_screen_load(scr_setup);
+}
+
+void wifi_ui_show_status() {
+  g_on_setup = false;
+  hide_password_dialog();
+  refresh_status_labels();
+  lv_screen_load(scr_status);
+}
+
+bool wifi_ui_is_setup() { return g_on_setup; }
+
+void wifi_ui_tick() {
+  const WifiProvState st = wifi_prov_state();
+
+  if (st != g_last_shown) {
+    g_last_shown = st;
+    if (st == WIFI_PROV_CONNECTED) {
+      wifi_ui_show_status();
+    } else if (st == WIFI_PROV_FAILED && g_on_setup) {
+      set_setup_status("Failed — retry");
+    } else if (st == WIFI_PROV_CONNECTING && g_on_setup) {
+      set_setup_status("Connecting...");
+    } else if (st == WIFI_PROV_PORTAL && g_on_setup) {
+      set_setup_status("Phone: CYD-Setup");
+    }
+  }
+
+  if (!g_on_setup) {
+    refresh_status_labels();
+  }
+}