From 3744a79da56517a2afd5210d2e24dd00824b52a2 Mon Sep 17 00:00:00 2001 From: "DESKTOP-PUHFO60\\dsx2016" Date: Fri, 23 Oct 2026 16:24:13 +0800 Subject: [PATCH] Add optional cyd_35r (ESP32-3248S035) with 480x320 UI; default remains 2.8. --- firmware/export_from_build.ps1 | 56 ++++++++++++++++++++++++++-------- include/pins.h | 27 +++++++++++----- platformio.ini | 17 +++++++++++ src/ui.cpp | 10 +++--- 4 files changed, 85 insertions(+), 25 deletions(-) diff --git a/firmware/export_from_build.ps1 b/firmware/export_from_build.ps1 index 0f08240..b73e2fa 100644 --- a/firmware/export_from_build.ps1 +++ b/firmware/export_from_build.ps1 @@ -1,9 +1,13 @@ -# Rebuild (optional) and refresh firmware/cyd from PlatformIO build output. -# Usage: -# .\firmware\export_from_build.ps1 -# .\firmware\export_from_build.ps1 -SkipBuild +# 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) +param( + [switch]$SkipBuild, + [ValidateSet("cyd", "cyd_35r")] + [string]$Env = "cyd" +) $ErrorActionPreference = "Stop" $root = Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Path) @@ -12,17 +16,26 @@ Set-Location $root $env:Path = "C:\Users\dsx2016\AppData\Local\Programs\Python\Python312\Scripts;" + $env:Path if (-not $SkipBuild) { - pio run -e cyd + pio run -e $Env if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } } -$src = Join-Path $root ".pio\build\cyd" -$dst = Join-Path $root "firmware\cyd" +$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" } + if (-not (Test-Path $p)) { Write-Error "Missing build artifact: $p — build with: pio run -e $Env" } Copy-Item $p $dst -Force } @@ -37,11 +50,10 @@ try { $git = (git -C $root rev-parse --short HEAD).Trim() } catch { $git = "unkn $date = Get-Date -Format "yyyy-MM-dd" $hashes = Get-ChildItem (Join-Path $dst "*.bin") | Get-FileHash -Algorithm SHA256 $lines = @( - "name: CYD Active Buzzer (cyd)", + "name: CYD activeBuzzerTest ($dstName)", "git: $git", "date: $date", - "board: ESP32-2432S028R (ILI9341)", - "features: SoftSPI touch, LVGL, active buzzer on GPIO22", + $boardLine, "flash_size: 4MB", "offsets:", " 0x1000 bootloader.bin", @@ -54,4 +66,22 @@ 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 (git $git)" + +# 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 258700b..bafb24c 100644 --- a/include/pins.h +++ b/include/pins.h @@ -1,8 +1,20 @@ #pragma once -// CYD ESP32-2432S028R — 触控/屏脚与 tftest 一致 +// 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 +#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 #define CYD_TOUCH_IRQ 36 #define CYD_TOUCH_MOSI 32 @@ -10,10 +22,11 @@ #define CYD_TOUCH_CLK 25 #define CYD_TOUCH_CS 33 -// 有源蜂鸣器信号脚（高电平响） -#define BUZZER_PIN 22 +/* 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) -#define SCREEN_WIDTH 240 -#define SCREEN_HEIGHT 320 -#define UI_HOR_RES 320 -#define UI_VER_RES 240 + +#define BUZZER_PIN 22 diff --git a/platformio.ini b/platformio.ini index dc324ff..d99f2d2 100644 --- a/platformio.ini +++ b/platformio.ini @@ -54,3 +54,20 @@ build_flags = -I${PROJECT_DIR}/include extra_scripts = pre:copy_lv_conf.py + +; Optional 3.5" CYD ESP32-3248S035 (ST7796 resistive). Default remains [env:cyd]. +; Build: pio run -e cyd_35r +[env:cyd_35r] +extends = env:cyd +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 + diff --git a/src/ui.cpp b/src/ui.cpp index 60946ad..37242bc 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -60,23 +60,23 @@ void ui_create() { lv_label_set_text(lbl_title, "Active Buzzer"); lv_obj_set_style_text_color(lbl_title, lv_color_hex(COL_INK), 0); lv_obj_set_style_text_font(lbl_title, &lv_font_montserrat_28, 0); - lv_obj_align(lbl_title, LV_ALIGN_TOP_MID, 0, 16); + lv_obj_align(lbl_title, LV_ALIGN_TOP_MID, UX(0), UY(16)); lbl_pin = lv_label_create(scr); lv_label_set_text_fmt(lbl_pin, "Signal -> GPIO%d", BUZZER_PIN); lv_obj_set_style_text_color(lbl_pin, lv_color_hex(COL_MUTED), 0); lv_obj_set_style_text_font(lbl_pin, &lv_font_montserrat_14, 0); - lv_obj_align(lbl_pin, LV_ALIGN_TOP_MID, 0, 56); + lv_obj_align(lbl_pin, LV_ALIGN_TOP_MID, UX(0), UY(56)); lbl_state = lv_label_create(scr); lv_label_set_text(lbl_state, "OFF"); lv_obj_set_style_text_color(lbl_state, lv_color_hex(0xE85D4C), 0); lv_obj_set_style_text_font(lbl_state, &lv_font_montserrat_28, 0); - lv_obj_align(lbl_state, LV_ALIGN_TOP_MID, 0, 96); + lv_obj_align(lbl_state, LV_ALIGN_TOP_MID, UX(0), UY(96)); btn_buzz = lv_button_create(scr); - lv_obj_set_size(btn_buzz, UI_HOR_RES - 48, 64); - lv_obj_align(btn_buzz, LV_ALIGN_TOP_MID, 0, 152); + lv_obj_set_size(btn_buzz, UI_HOR_RES - UW(48), UH(64)); + lv_obj_align(btn_buzz, LV_ALIGN_TOP_MID, UX(0), UY(152)); style_btn(btn_buzz, COL_BTN); lv_obj_add_event_cb(btn_buzz, on_buzz, LV_EVENT_CLICKED, nullptr); lbl_buzz = lv_label_create(btn_buzz);