diff --git a/README.md b/README.md
index bc97d94..d6b9751 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,16 @@ GPIO22 读人体红外(PIR)模块 OUT:每次检测到运动开始,屏幕
## 硬件
+| 项目 | 2.8"(默认) | 3.5" C |
+|------|-------------|--------|
+| 板子 | ESP32-2432S028R | ESP32-3248S035C |
+| 屏 / 触控 | ILI9341 + XPT2046 SoftSPI | ST7796 + GT911 I2C |
+| 背光 | GPIO21 | GPIO27 |
+| PIR OUT | **GPIO22**(两板相同) | **GPIO22** |
+| PlatformIO | `cyd` | `cyd_35r` |
+
| 项目 | 说明 |
|------|------|
-| 板子 | CYD ESP32-2432S028R |
| 模块 | 三脚小型人体红外(卖家常写 mini SR501,实际多为 **HC-SR505**) |
| 供电 | **3.3V**(本工程已实测可用) |
| 输出 | **GPIO22** |
@@ -32,7 +39,7 @@ GPIO22 读人体红外(PIR)模块 OUT:每次检测到运动开始,屏幕
注意:
- 上电后约 **30~60 秒** 预热,此前可能无反应或乱跳
-- OUT 接 **GPIO22**(勿接 21 背光),必须共地
+- OUT 接 **GPIO22**(2.8 勿接 21 背光;3.5 勿接 27 背光),必须共地
- 小模块一般无灵敏度旋钮;检测距离大约 3m 量级
## 操作
@@ -43,14 +50,23 @@ GPIO22 读人体红外(PIR)模块 OUT:每次检测到运动开始,屏幕
## 构建 / 烧录
```bash
+# 2.8"
pio run -e cyd -t upload
+
+# 3.5" C
+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
```
@@ -58,4 +74,5 @@ cd firmware\cyd
```powershell
.\firmware\export_from_build.ps1
+.\firmware\export_from_build.ps1 -Env cyd_35r
```
diff --git a/firmware/README.md b/firmware/README.md
index 133c4c0..ad9cacf 100644
--- a/firmware/README.md
+++ b/firmware/README.md
@@ -1,15 +1,22 @@
# 预编译固件
-目录:[`cyd/`](cyd/)
+| 目录 | 板子 |
+|------|------|
+| [`cyd/`](cyd/) | **2.8"** ESP32-2432S028R(ILI9341 + XPT2046) |
+| [`cyd_35r/`](cyd_35r/) | **3.5" C** ESP32-3248S035C(ST7796 + GT911,BL=27) |
-板子:**CYD ESP32-2432S028R**(ILI9341)
-功能:小型人体红外 SR505/mini SR501(GPIO22、3.3V)计数 + SoftSPI 触控 + LVGL
+功能:小型人体红外 SR505/mini SR501(GPIO22、3.3V)计数 + 触控 + LVGL
## 刷写
```powershell
+# 2.8"
cd firmware\cyd
.\flash.ps1
+
+# 3.5"
+cd firmware\cyd_35r
+.\flash.ps1
# 或 .\flash.ps1 -Port COM3
```
@@ -17,5 +24,7 @@ cd firmware\cyd
```powershell
.\firmware\export_from_build.ps1
+.\firmware\export_from_build.ps1 -Env 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..ef81be7
--- /dev/null
+++ b/firmware/cyd_35r/VERSION.txt
@@ -0,0 +1,15 @@
+name: CYD humanInfraredModuletest (cyd_35r)
+git: d5b37d0
+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 BBD98BD91197C777FD453E7427CBCF4A5B385728FA7D7E9D52F9437899CEC874
+ 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..890192e
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..42ec133
--- /dev/null
+++ b/firmware/cyd_35r/media/preview.html
@@ -0,0 +1,53 @@
+
+
+
+
+Human IR
+
+
+
+
+
+
+
+
Human IR
+
OUT->GPIO22 VCC 3.3V
+
3
+
detects
+
MOTION
+
hold 1250 ms
+
+
OUT HIGH act=HIGH
+
+
+
+
+
+
+
diff --git a/firmware/cyd_35r/meta.json b/firmware/cyd_35r/meta.json
new file mode 100644
index 0000000..357b471
--- /dev/null
+++ b/firmware/cyd_35r/meta.json
@@ -0,0 +1,19 @@
+{
+ "boardId": "esp32-3248s035",
+ "name": "CYD Human IR (3.5\")",
+ "summary": "Small PIR (SR505/mini SR501) on GPIO22 @ 3.3V: motion-start count +1",
+ "description": "ST7796 + GT911 capacitive + LVGL. BL=GPIO27. VCC 3.3V / GND / OUT->GPIO22. Float INPUT, idle LOW active HIGH. Motion edge +1, hold bar, Reset clears.",
+ "tags": [
+ "pir",
+ "sr505",
+ "human-infrared",
+ "gpio22",
+ "3.3v",
+ "touch",
+ "lvgl",
+ "counter"
+ ],
+ "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/firmware/export_from_build.ps1 b/firmware/export_from_build.ps1
index 4b6c9b9..504ed83 100644
--- a/firmware/export_from_build.ps1
+++ b/firmware/export_from_build.ps1
@@ -67,21 +67,5 @@ foreach ($h in $hashes) {
}
$lines | Set-Content -Encoding utf8 (Join-Path $dst "VERSION.txt")
-# Keep / refresh meta.json boardId for catalog filtering
-$metaPath = Join-Path $dst "meta.json"
-if (Test-Path $metaPath) {
- try {
- $meta = Get-Content $metaPath -Raw | ConvertFrom-Json
- $meta.boardId = $boardIdHint
- if ($Env -eq "cyd_35r" -and $meta.name -notmatch "3\.5") {
- $meta.name = ($meta.name -replace "\s*$","") + " (3.5\")"
- }
- $meta | ConvertTo-Json -Depth 8 | Set-Content -Encoding utf8 $metaPath
- } catch {
- Write-Host "meta.json update skipped: $_"
- }
-} elseif ($Env -eq "cyd_35r") {
- Write-Host "Note: add firmware/cyd_35r/meta.json with boardId=$boardIdHint for the web catalog"
-}
Write-Host "Exported -> $dst (env=$Env git=$git)"
diff --git a/include/pins.h b/include/pins.h
index ebf8fe4..313281b 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,5 +34,12 @@
#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 PIR_PIN 22
diff --git a/platformio.ini b/platformio.ini
index 09d3681..66bf050 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -55,19 +55,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=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/main.cpp b/src/main.cpp
index f167d95..ed8377a 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..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