diff --git a/README.md b/README.md index 3ae0728..c7eabc9 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ ESP32 Cheap Yellow Display + HLK-LD2420 24GHz 毫米波雷达 + LVGL 仪表盘 | 板子 | ESP32-2432S028R(ILI9341 + XPT2046) | ESP32-3248S035C(ST7796 + GT911) | | 横屏 UI | 320×240 | 480×320 | | 背光 | GPIO21 | **GPIO27** | -| LD2420 OT1 | **GPIO22**(→ ESP RX) | **GPIO22**(同左) | -| LD2420 RX | **GPIO27**(← ESP TX) | **GPIO4**(← ESP TX;27 是背光) | +| LD2420 OT1 | **GPIO22**(→ ESP RX) | **GPIO21**(→ ESP RX) | +| LD2420 RX | **GPIO27**(← ESP TX) | **GPIO22**(← ESP TX) | | 供电 | 3.3V / GND(共地) | 同左 | 接线(固件 ≥ v1.5.3): @@ -23,11 +23,11 @@ LD2420 GND → CYD GND LD2420 OT1 → GPIO22 LD2420 RX → GPIO27 -# 3.5C(勿接 27/21:背光 / GT911 INT) +# 3.5C LD2420 3V3 → CYD 3.3V LD2420 GND → CYD GND -LD2420 OT1 → GPIO22 -LD2420 RX → GPIO4 +LD2420 OT1 → GPIO21 +LD2420 RX → GPIO22 ``` > 旧固件(< v1.5.3)串口 TX 在 OT2,且默认波特率多为 **256000**。本工程会依次探测 115200 / 256000。 @@ -105,7 +105,7 @@ README.md # 本文档 | 日期 | 说明 | |------|------| -| 2026-10-25 | 按 `CYD_PROJECT_GUIDE.md` 修正 3.5:BL=27、LD2420 TX→GPIO4、GT911 INT 复位后 INPUT;归档 `firmware/cyd_35r/` | +| 2026-10-25 | 按 `CYD_PROJECT_GUIDE.md` 修正 3.5 BL=27;LD2420 接线 OT1→21、RX→22;GT911 INT 复位后 INPUT;归档 `firmware/cyd_35r/` | | 2026-10-18 | 初版:CYD + LD2420 LVGL 仪表盘;OT1→GPIO22、RX→GPIO27;显示固件版本 | | 2026-10-18 | 存在逻辑改为 ESPHome 出厂门限 + 10s 离开保持(动/静均保持 ON) | | 2026-10-18 | 归档预编译固件到 `firmware/cyd_28r/`,附一键刷写;初始化本地 Git | @@ -114,7 +114,7 @@ README.md # 本文档 ``` CYD LVGL LD2420 Radar Dashboard -LD2420 probe @ 115200 baud RX=22 TX=27 # 3.5 为 TX=4 +LD2420 probe @ 115200 baud RX=22 TX=27 # 3.5: RX=21 TX=22 FW=v1.6.1 mode=simple set gates 1..12 to=10s (OK) ``` diff --git a/firmware/README.md b/firmware/README.md index 56d91ad..bc16ae8 100644 --- a/firmware/README.md +++ b/firmware/README.md @@ -3,7 +3,7 @@ | 目录 | 板子 | 接线 | |------|------|------| | [`cyd_28r/`](cyd_28r/) | ESP32-2432S028R(ILI9341) | OT1→22,RX→27 | -| [`cyd_35r/`](cyd_35r/) | ESP32-3248S035C(ST7796 + GT911) | OT1→22,RX→4;BL=27 | +| [`cyd_35r/`](cyd_35r/) | ESP32-3248S035C(ST7796 + GT911) | OT1→21,RX→22;BL=27 | 版本信息见各目录 `VERSION.txt`。 diff --git a/firmware/cyd_35r/VERSION.txt b/firmware/cyd_35r/VERSION.txt index 22b04af..5c21d25 100644 --- a/firmware/cyd_35r/VERSION.txt +++ b/firmware/cyd_35r/VERSION.txt @@ -1,5 +1,5 @@ name: CYD ld2420test (cyd_35r) -git: 5691490 +git: 786f48e date: 2026-10-25 board: ESP32-3248S035 (ST7796 + GT911) flash_size: 4MB @@ -11,5 +11,5 @@ offsets: sha256: bootloader.bin 3D234A7471F67B013686DABD4DEE7C1FA915C9928463616A94BC9297ACF1ABF8 boot_app0.bin F94C5D786A7A8FAB06AC5D10E33BF37711A6697636DC037559EA19CC410A17F0 - firmware.bin AD799C4C450A00B9037F9F071D45B322DCB36797836580343794B4E56CC2484D + firmware.bin 89D073E0AD6F64F22C068E14A442A62FB8D3E229C2F68D20A571231E26931F59 partitions.bin 0A8B5720E7B77FF11F1462458C3A509DEE79224E5279898F26D6A2E3AE0517B7 diff --git a/firmware/cyd_35r/firmware.bin b/firmware/cyd_35r/firmware.bin index dd27799..b5afa37 100644 Binary files a/firmware/cyd_35r/firmware.bin and b/firmware/cyd_35r/firmware.bin differ diff --git a/firmware/cyd_35r/meta.json b/firmware/cyd_35r/meta.json index 3e7fb54..697f55a 100644 --- a/firmware/cyd_35r/meta.json +++ b/firmware/cyd_35r/meta.json @@ -2,7 +2,7 @@ "boardId": "esp32-3248s035", "name": "CYD LD2420 radar dashboard (3.5\")", "summary": "Presence & distance from LD2420 mmWave radar", - "description": "OT1→GPIO22, RX→GPIO4. TFT_BL=27, GT911 capacitive. Distance gauge, presence LED, motion chart.", + "description": "OT1→GPIO21, RX→GPIO22. TFT_BL=27, GT911 capacitive. Distance gauge, presence LED, motion chart.", "tags": [ "radar", "ld2420", diff --git a/platformio.ini b/platformio.ini index e2ba1e8..8227f81 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,6 +1,6 @@ ; CYD ESP32-2432S028R — LVGL LD2420 mmWave radar dashboard -; LD2420 OT1 -> GPIO22 (ESP RX); module RX -> GPIO27 (2.8 ESP TX) / GPIO4 (3.5 ESP TX) -; See ../CYD_PROJECT_GUIDE.md — 3.5 BL=27, GT911 INT=21 (not BL). +; 2.8: OT1->GPIO22 (ESP RX), RX->GPIO27 (ESP TX) +; 3.5: OT1->GPIO21 (ESP RX), RX->GPIO22 (ESP TX); BL=27 [platformio] default_envs = cyd_28r @@ -68,7 +68,7 @@ build_flags = ; Optional 3.5" CYD ESP32-3248S035C (ST7796 + GT911 capacitive). Default remains cyd_28r. ; 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). LD2420 ESP TX -> GPIO4 (27=BL). +; TFT_BL=GPIO27. LD2420: OT1->GPIO21, RX->GPIO22. [env:cyd_35r] lib_deps = lvgl/lvgl@9.2.2 diff --git a/src/main.cpp b/src/main.cpp index 1a0be5b..663d9b9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,9 +2,8 @@ * CYD + LD2420 毫米波雷达仪表盘(2.8 默认 / 3.5C 可选) * * 接线 (固件 ≥ v1.5.3): - * LD2420 OT1 -> GPIO22 (模块串口 TX → ESP RX) 两板相同 - * LD2420 RX -> GPIO27 (2.8 ESP TX) / GPIO4 (3.5 ESP TX;27=背光) - * 3.5C (3248S035C): TFT_BL=27,GT911 INT=21 — 勿把 21/27 当传感器脚。 + * 2.8: OT1 -> GPIO22 (ESP RX), RX -> GPIO27 (ESP TX); BL=21 + * 3.5: OT1 -> GPIO21 (ESP RX), RX -> GPIO22 (ESP TX); BL=27 * VCC 3.3V / GND */ @@ -16,11 +15,12 @@ #include "touch.h" /* ---- pins ---- */ -#define LD2420_RX_PIN 22 /* ESP RX <- OT1 */ #if defined(CYD_BOARD_3248S035) -#define LD2420_TX_PIN 4 /* ESP TX -> RX;3.5 上 27=BL、21=GT911 INT */ +#define LD2420_RX_PIN 21 /* ESP RX <- OT1 */ +#define LD2420_TX_PIN 22 /* ESP TX -> RX */ #define TFT_BL_PIN 27 #else +#define LD2420_RX_PIN 22 /* ESP RX <- OT1 */ #define LD2420_TX_PIN 27 /* ESP TX -> RX */ #define TFT_BL_PIN 21 #endif