dsx2016/serverinfotest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename 2.8 firmware/env from bare cyd to cyd_28r.

Browse Source 
Drop ambiguous firmware/cyd; PlatformIO env and export paths are size-explicit (cyd_28r / cyd_35r).
This commit is contained in:
DESKTOP-PUHFO60\dsx2016
2026-10-27 20:33:37 +08:00
parent 0c5281b631
commit 9755698f4e
14 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
README.md
View File

@@ -4,14 +4,22 @@
| 板型 | env | 屏 / 触控 | 背光 | 刷写目录 |
|------|-----|-----------|------|----------|
| **2.8" · 2432S028R** | `cyd`（默认） | ILI9341 + XPT2046 SoftSPI · UI 320×240 | GPIO**21** | [`firmware/cyd/`](firmware/cyd/) |
| **2.8" · 2432S028R** | `cyd_28r` | ILI9341 + XPT2046 SoftSPI · UI 320×240 | GPIO**21** | [`firmware/cyd_28r/`](firmware/cyd_28r/) |
| **3.5" · 3248S035C** | `cyd_35r` | ST7796 + GT911 I2C · UI 480×320（`UX/UY` 缩放） | GPIO**27** | [`firmware/cyd_35r/`](firmware/cyd_35r/) |
本工程**无外设接线**（只吃 USB 供电 + 串口）。主机 `send_sysinfo` **与板型无关**（同一 SI 协议）。
本工程**无外设接线**（只吃 USB 供电 + 串口）。主机 `send_sysinfo` **与板型无关**（同一 SI 协议）。
目录名带尺寸：`cyd_28r` / `cyd_35r`，**没有**含糊的 `firmware/cyd/`。
**认板再刷**：2.8 / 3.5 固件不可互刷（BL / 屏驱 / 触控全不同）。3.5：
**认板再刷**：2.8 / 3.5 固件不可互刷（BL / 屏驱 / 触控全不同）。
```powershell
# 2.8"
pio run -e cyd_28r -t upload
# 或
cd firmware\cyd_28r
.\flash.ps1
# 3.5"
pio run -e cyd_35r -t upload
# 或
cd firmware\cyd_35r
@@ -65,27 +73,26 @@ python send_sysinfo.py -p /dev/ttyUSB0
| 板型 | 目录 |
|------|------|
| 2.8" | [`firmware/cyd/`](firmware/cyd/) |
| 2.8" | [`firmware/cyd_28r/`](firmware/cyd_28r/) |
| 3.5" | [`firmware/cyd_35r/`](firmware/cyd_35r/) |
```powershell
cd firmware\cyd # 或 firmware\cyd_35r
cd firmware\cyd_28r # 3.5: firmware\cyd_35r
.\flash.ps1
# 或
.\flash.ps1 -Port COM3
```
源码烧录：`pio run -e cyd -t upload`（3.5：`-e cyd_35r`）
重新打包：`.\firmware\export_from_build.ps1`（3.5 加 `-Env cyd_35r`）
串口监视：`pio device monitor -b 460800`
源码烧录：`pio run -e cyd_28r -t upload` / `pio run -e cyd_35r -t upload`
重新打包：`.\firmware\export_from_build.ps1 -Env cyd_28r`（或 `-Env cyd_35r`）
串口监视：`pio device monitor -e cyd_28r -b 460800`
## 本地 git（必做）
本工程是**独立本地 repo**，有效改动都要提交；**不 push**（除非明确要求）。顺序对齐 [CYD_PROJECT_GUIDE.md](../CYD_PROJECT_GUIDE.md) §0 / §3：
1. 改代码
2. `pio run -e cyd -t upload`（或 `cyd_35r`）真机验证
3. `.\firmware\export_from_build.ps1`（需要时加 `-Env cyd_35r`）
2. `pio run -e cyd_28r -t upload`（或 `cyd_35r`）真机验证
3. `.\firmware\export_from_build.ps1 -Env cyd_28r`（或 `cyd_35r`）
4. `git add -A` → `git commit`
禁止：只改代码不烧录、不导出固件、**不本地 commit** 就收工。
@@ -102,7 +109,9 @@ cd firmware\cyd # 或 firmware\cyd_35r
## 文件
```
include/… src/… firmware/
include/… src/…
firmware/cyd_28r/ # 2.8"
firmware/cyd_35r/ # 3.5"
host/send_sysinfo.exe # Windows 免 Python（入库）
host/run.bat # 双击启动
host/install_autostart.ps1 / uninstall_autostart.ps1

15
firmware/README.md
View File

@@ -2,9 +2,11 @@
| 目录 | 板子 |
|------|------|
| [`cyd/`](cyd/) | **2.8"** CYD ESP32-2432S028R（ILI9341） |
| [`cyd_28r/`](cyd_28r/) | **2.8"** CYD ESP32-2432S028R（ILI9341） |
| [`cyd_35r/`](cyd_35r/) | **3.5"** CYD ESP32-3248S035C（ST7796 + GT911） |
**没有** `firmware/cyd/`——目录名必须带尺寸。
功能：**本机/服务器信息面板**（USB 串口收 `SI|...`，屏上显示 CPU/GPU/RAM/DISK）
版本信息见各目录下 `VERSION.txt`。
@@ -16,9 +18,8 @@
2. 执行：
```powershell
cd firmware\cyd # 3.5": firmware\cyd_35r
cd firmware\cyd_28r # 3.5": firmware\cyd_35r
.\flash.ps1
# 或指定端口
.\flash.ps1 -Port COM3
```
@@ -45,11 +46,11 @@ esptool.py --chip esp32 --port COM3 --baud 921600 write_flash -z ^
在仓库根目录：
```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 -SkipBuild
.\firmware\export_from_build.ps1 -Env cyd_28r # 2.8 -> firmware/cyd_28r
.\firmware\export_from_build.ps1 -Env cyd_35r # 3.5 -> firmware/cyd_35r
.\firmware\export_from_build.ps1 -Env cyd_28r -SkipBuild
```
刷完后在 PC 上运行 `..\..\host\send_sysinfo.ps1` 推送本机信息。
刷完后用 `..\..\host\run.bat` 或 `send_sysinfo.exe` 推送本机信息。
导出固件后记得在仓库根目录 **本地 `git commit`**（见根 `README.md`「本地 git」；不 push，除非明确要求）。

6
firmware/cyd/VERSION.txt → firmware/cyd_28r/VERSION.txt
View File

@@ -1,5 +1,5 @@
name: CYD serverinfotest (cyd)
git: f83df3f
name: CYD serverinfotest (cyd_28r)
git: 0c5281b
date: 2026-10-27
board: ESP32-2432S028R (ILI9341)
flash_size: 4MB
@@ -11,5 +11,5 @@ offsets:
sha256:
bootloader.bin 3D234A7471F67B013686DABD4DEE7C1FA915C9928463616A94BC9297ACF1ABF8
boot_app0.bin F94C5D786A7A8FAB06AC5D10E33BF37711A6697636DC037559EA19CC410A17F0
firmware.bin C37191D2A95FDA84053DDB2F6BF3EE42ADF1C7C1527495284DD071EB9E7B1863
firmware.bin 6FF88A9DFF291AD7EA016AF17A591CDDF83153E58E782751255CE7DF6D876952
partitions.bin 148B959CBFF1C38AA8E1D5C0BA9D612C54997B945E56A63F41223EEF650653A1

0
firmware/cyd/boot_app0.bin → firmware/cyd_28r/boot_app0.bin
View File

0
firmware/cyd/bootloader.bin → firmware/cyd_28r/bootloader.bin
View File

BIN
firmware/cyd/firmware.bin → firmware/cyd_28r/firmware.bin
View File

Binary file not shown.

0
firmware/cyd/flash.bat → firmware/cyd_28r/flash.bat
View File

0
firmware/cyd/flash.ps1 → firmware/cyd_28r/flash.ps1
View File

2
firmware/cyd/meta.json → firmware/cyd_28r/meta.json
View File

@@ -2,7 +2,7 @@
"boardId": "esp32-2432s028",
"name": "CYD Server Info",
"summary": "LVGL panel for host CPU / GPU / RAM / disk via USB serial",
"description": "Receives SI|... lines from host/send_sysinfo.ps1 and shows live bars for CPU, GPU, memory and system drive. No external GPIO peripherals.",
"description": "2.8 inch board package (cyd_28r). Receives SI|... from host agent; LVGL bars for CPU/GPU/RAM/disk. No external GPIO peripherals.",
"tags": [
"monitor",
"host-info",

0
firmware/cyd/partitions.bin → firmware/cyd_28r/partitions.bin
View File

2
firmware/cyd_35r/VERSION.txt
View File

@@ -1,5 +1,5 @@
name: CYD serverinfotest (cyd_35r)
git: f83df3f
git: 0c5281b
date: 2026-10-27
board: ESP32-3248S035 (ST7796)
flash_size: 4MB

15
firmware/export_from_build.ps1
View File

@@ -1,12 +1,12 @@
# 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)
# 2.8": .\firmware\export_from_build.ps1 -Env cyd_28r -> firmware/cyd_28r
# 3.5": .\firmware\export_from_build.ps1 -Env cyd_35r -> firmware/cyd_35r
# No bare "cyd" directory — board size is always in the name.
param(
[switch]$SkipBuild,
[ValidateSet("cyd", "cyd_35r")]
[string]$Env = "cyd"
[ValidateSet("cyd_28r", "cyd_35r")]
[string]$Env = "cyd_28r"
)
$ErrorActionPreference = "Stop"
@@ -24,11 +24,9 @@ $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"
$dstName = "cyd_28r"
$boardLine = "board: ESP32-2432S028R (ILI9341)"
$boardIdHint = "esp32-2432s028"
}
$dst = Join-Path $root ("firmware\" + $dstName)
New-Item -ItemType Directory -Force -Path $dst | Out-Null
@@ -67,5 +65,4 @@ foreach ($h in $hashes) {
}
$lines | Set-Content -Encoding utf8 (Join-Path $dst "VERSION.txt")
Write-Host "Exported -> $dst (env=$Env git=$git)"

2
include/pins.h
View File

@@ -1,6 +1,6 @@
#pragma once
// Board pins — 2.8" default; 3.5" when CYD_BOARD_3248S035 is set (env:cyd_35r)
// Board pins — 2.8" (env:cyd_28r) default; 3.5" when CYD_BOARD_3248S035 (env:cyd_35r)
#if defined(CYD_BOARD_3248S035)
#define TFT_BL_PIN 27

5
platformio.ini
View File

@@ -1,5 +1,6 @@
; CYD — host PC / server info panel (USB serial feed + LVGL)
[env:cyd]
; Envs are size-explicit: cyd_28r (2.8") / cyd_35r (3.5"). No bare "cyd".
[env:cyd_28r]
platform = espressif32
board = esp32dev
framework = arduino
@@ -51,7 +52,7 @@ build_flags =
extra_scripts = pre:copy_lv_conf.py
; Optional 3.5" CYD ESP32-3248S035C (ST7796 + GT911 capacitive). Default [env:cyd].
; 3.5" CYD ESP32-3248S035C (ST7796 + GT911 capacitive).
; 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