From 9755698f4e766eee6634e8cf9ab0edf22fb5a1cb Mon Sep 17 00:00:00 2001 From: "DESKTOP-PUHFO60\\dsx2016" Date: Tue, 27 Oct 2026 20:33:37 +0800 Subject: [PATCH] Rename 2.8 firmware/env from bare cyd to cyd_28r. Drop ambiguous firmware/cyd; PlatformIO env and export paths are size-explicit (cyd_28r / cyd_35r). --- README.md | 33 ++++++++++++++--------- firmware/README.md | 15 ++++++----- firmware/{cyd => cyd_28r}/VERSION.txt | 6 ++--- firmware/{cyd => cyd_28r}/boot_app0.bin | Bin firmware/{cyd => cyd_28r}/bootloader.bin | Bin firmware/{cyd => cyd_28r}/firmware.bin | Bin 574496 -> 574512 bytes firmware/{cyd => cyd_28r}/flash.bat | 0 firmware/{cyd => cyd_28r}/flash.ps1 | 0 firmware/{cyd => cyd_28r}/meta.json | 2 +- firmware/{cyd => cyd_28r}/partitions.bin | Bin firmware/cyd_35r/VERSION.txt | 2 +- firmware/export_from_build.ps1 | 15 +++++------ include/pins.h | 2 +- platformio.ini | 5 ++-- 14 files changed, 44 insertions(+), 36 deletions(-) rename firmware/{cyd => cyd_28r}/VERSION.txt (76%) rename firmware/{cyd => cyd_28r}/boot_app0.bin (100%) rename firmware/{cyd => cyd_28r}/bootloader.bin (100%) rename firmware/{cyd => cyd_28r}/firmware.bin (98%) rename firmware/{cyd => cyd_28r}/flash.bat (100%) rename firmware/{cyd => cyd_28r}/flash.ps1 (100%) rename firmware/{cyd => cyd_28r}/meta.json (58%) rename firmware/{cyd => cyd_28r}/partitions.bin (100%) diff --git a/README.md b/README.md index 43b232b..b7205f7 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/firmware/README.md b/firmware/README.md index 782b699..fad9cdd 100644 --- a/firmware/README.md +++ b/firmware/README.md @@ -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，除非明确要求）。 diff --git a/firmware/cyd/VERSION.txt b/firmware/cyd_28r/VERSION.txt similarity index 76% rename from firmware/cyd/VERSION.txt rename to firmware/cyd_28r/VERSION.txt index a8296f0..e5863cf 100644 --- a/firmware/cyd/VERSION.txt +++ b/firmware/cyd_28r/VERSION.txt @@ -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 diff --git a/firmware/cyd/boot_app0.bin b/firmware/cyd_28r/boot_app0.bin similarity index 100% rename from firmware/cyd/boot_app0.bin rename to firmware/cyd_28r/boot_app0.bin diff --git a/firmware/cyd/bootloader.bin b/firmware/cyd_28r/bootloader.bin similarity index 100% rename from firmware/cyd/bootloader.bin rename to firmware/cyd_28r/bootloader.bin diff --git a/firmware/cyd/firmware.bin b/firmware/cyd_28r/firmware.bin similarity index 98% rename from firmware/cyd/firmware.bin rename to firmware/cyd_28r/firmware.bin index c4ef93d69adade8b02a643cb1528b12cbf615fbd..0b08e7a0021f549af927c3fd55bfefea3654b623 100644 GIT binary patch delta 3292 zcmciFeQ*@z9l-H@LN+;Q5-uE)fJwcGI!#TQi?l+>k!K%C1W69gCJ4TuC+(1mKo7;1 z4#7RtP7VghIfU6#Te%8I#$tOjNLQ&dJs_q8h;zJH)S{_{>Cjg2RNApMdi^d9A~Rte z|B##c-1F@7{C@j9`|Qi@#iQdB(ebeok$$ptgSTkQOPi~#;@kbHxF;AypCEiX6L4ksUm+aJW(3*M!qn?85`#dasA7Z!4)| z`UE9AZc=h{wUQo``;@Gy;z01Z!G@@tUli~a_nQ}&Vu;y&b%UGEXMEIS=T(Wg%bd*F z`m(Mkr)V&5$rL5a@H@Yf0UW7S@hibfnZCnLI%<9Uu+2u9j zVck5#{qtq@lam_E3s7pU(Mp#mSy=4{}3{0vWE1zJ%zTbc5YEhL~39vp7wl%XBdkcGFtt7HNX zpdR~g=Y~T$J_;)NTP#5h#vnCI$#uxbftgBfL>LMM=np7)5Iq6T!VW5{a0^QDc9W7X zp%VcV;7p^ENwi}=3UOiv10#%TjK=%7DfuckVIkajXS$NlpdBqJ!`W#(C2-8{n;Newkw6?VL=Z*@K^XAD4Grmg$wdlDBoIdoVT2Hb0Ux|@BR!9tc_v9z5{M&)2*L;< z2m?NN;f99vJq(Hzl1Lzq7$OKGgdhy~;Ds9+(sz@Ol-+x`C@Qp1ED}kV=(2zLi0~JP z3j58+MPs&@V%-oG6NR$wjf#E|uk)4bvY2|Md*Vvs~#1tWpSx2^t zgW{a^^fu94s;^Qqdl+#A-eSIYp!;LD!Mlc*J=`jImXQ2QLrR3E`3Ky_*PM`2>rp49 z?9!0AbVUi7?1Wrzoqd+0D7Qy!7abl^Y5#n;m>`7Te)ad_dpV`XXQ@7C0{c5?iI~qvGvSe@v&HHJ-v?|t+IAgls@@cUeL)~%dC>kg~q>~ye{j5ePWLIgEgaD zTq6!!3!UPmwWeDzUc7sPhx~tH6#k=r2H@Z^EVynDYZ?1l-LdiAIDyv0u zq^70sSMp`HD}=k?-3R%-{?;e*PpdSohkCe`XO#7PuU@2Iw}?ly)!VB#4nIM4(j6`% zY?U6+Z`4CGW}yxz&qoB zrp4PdE!IZ7$@}N9Z&+mq^$mfhHZI8(N-jf?U4{`{qT~;d$FAHMjbfCb5)t}XX!wlQ z1q&98V7Ui=sN}nrIHXT7>zxqZYvW6mG|y!+b!eC~P2VYWKg4ql zmmBIFePNC&go0eAvDjs_G`Wlj+fl5>+QGhclv|f6Yv&=oT#T~bI;0nwqgbi&IDX2I z&rv$_a5%9gtjt{Ik3N6lx$Qmw$gO*${QQ*o`rDgUd)J&>Tm98DMjrk3xZ3_5 WZQ4JpU(m<=_x)v8?K=MH>;D6FQx$mt delta 3361 zcmciFeN0v79l-JPAQvw5$~zPFlE9SIW|xZZFWmZ^XMjSzI4Tz1dTq5vM7`bEiV^E& z2P$oGqlgo7+DJEA>dQKom@;>ojb#=^hrKK{U2BV2O==c!xONFmmi0RJJyx;JFiroc zH~Hjw`8{vvIp;q2++z(h+8bsxyT#D{^aB~sS7%zw9$b9osWW1CT5tO6-sk5YTva_d zZL`+;r&lYxa?LmUMM+nN@HUD02iEV)6>(iJ?#mOCTRlpiYSiUvBy|lpHyku~c*L)a zz~f5RWh<%i36k1*XSAmIexRg_Si&+*~L*_u|*cs|N2i!`nF<~+G}{By>w%vYxAbOv3)gHwhk0Fpn`&kUlvIAb6&r`A**T1Xe?~#iWO39;`U>;+l%DY&{U9eYGIPvQ4xR96i z+gIcMLVkiPyyF-*+FI$lSQKRpbGrQnub~3>qHi6~F?M1(Qt|0pC9mLJyp2AzV-s|w z;!2s4U8u)O%)-YHb2sp7w4fF{u?b5bR)##eh7MSPc=VTY%diJ|`0r{ZKR_ooL&vFy z_`)Fzqa{lI2HUUzNeF#U$-Rid=~YVZM*t5X78i<@JcFKM?!r+rHCTqJ81N~19L*>~ zEQVJq*^NDT6qE7(gG`J7vXOvmMM|DUE6U-*#X=>2i9IMmI@CN#05FvD<6K!Zj5CQn%gBKpS;o87m2tURE7(@u& z=tLVD5kvrf_~3;bE`%SYF9s1pH#*UVMg-u84_>9gLT6PZr5p%Fm@;D--h zc;JQ$VLzQQh!DEbi8eGMhyeWX!3z)Ea3TB%{V|A;)&Gc?l4uPDM7LA4TZeWCZ`?gI zYxzl?#7jV2j@jHU+?KOmWJQVv=KT#~kyv7uH;7AV1>=n}(r6lp(6o$8@%k)N?G?#Z zHi;DuvC*8{B94g7)GqOlnw1?QM!aD?)gc}eB4iG{D&7(!=HWx4G~#-#`Pm^cO$hT_hefGy znA;AE=_1v9)-Fvo2Pm1(92W8MRg63oPSBI=88Yk4-5ny+^dAw`R_77%X_CmYUipKV zC&YZ~y+4XgQDU*Vw1<(_m}NbTwAp;EM|`$qYu&BQ((P5RVbu+*6ZJBC%w1oORT8^Q z>_a=Y*ZlA#gSDIgIVsjEYrJJGjWoC2f*q|YOVp3s`M&>;&m`_yo2d8N@eAfJPKhVQ zH8ZMLB{4f=|7GX#vcKK9`b=LoO z&2>_SnfaFEKyiMMqiQ!xKp{g`pzw!EZa^eMIpIPAQjmpeVw!dWIr^6J^72?Vcl1Xb z@TLek<{4g^)bghM!jF|SM#sh$QnptUeB7zK&O7zOVyE6sY!KZ)QSxuN(^MnGD!8h3 zh>KP-?Fpy8#^=TjkPa1CQn3JsiDajifi?7wRe;dcDIgxQ}7r%+fr*F#!r*3bF zy)~Dq^RtaUG;ee2`8Dd>vZ6-G22}i%1>;uZ7s#jB-`D3_`yGg~TKl6*qoOKO!*W)% z#UGcy3v2M*=%JJw51!NNyBfXhgUqJvtuYEE`MqJs*#@UJ1?E-7 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)" diff --git a/include/pins.h b/include/pins.h index b304879..9c485f2 100644 --- a/include/pins.h +++ b/include/pins.h @@ -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 diff --git a/platformio.ini b/platformio.ini index 9411e48..5327c20 100644 --- a/platformio.ini +++ b/platformio.ini @@ -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