diff --git a/firmware/export_from_build.ps1 b/firmware/export_from_build.ps1 index f7db9f7..f77eeb1 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 KY-009 (cyd)", + "name: CYD smdky009ledtest ($dstName)", "git: $git", "date: $date", - "board: ESP32-2432S028R (ILI9341)", - "features: SoftSPI touch, LVGL, KY-009 R=GPIO22 G=GPIO27 B=GPIO4 color switch + PWM", + $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 fead679..51cbc6b 100644 --- a/include/pins.h +++ b/include/pins.h @@ -1,8 +1,20 @@ #pragma once -// CYD ESP32-2432S028R — 触控/屏脚与 tftest / hw269test 一致 +// 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,12 +22,13 @@ #define CYD_TOUCH_CLK 25 #define CYD_TOUCH_CS 33 -// KY-009 SMD RGB LED(26 留给喇叭,B 用 4) +/* 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 KY009_R_PIN 22 // R -> GPIO22 #define KY009_G_PIN 27 // G -> GPIO27 #define KY009_B_PIN 4 // B -> GPIO4 - -#define SCREEN_WIDTH 240 -#define SCREEN_HEIGHT 320 -#define UI_HOR_RES 320 -#define UI_VER_RES 240 diff --git a/platformio.ini b/platformio.ini index bfc92d6..d0ad016 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 ab634d5..0738860 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -117,7 +117,7 @@ static void on_slider(lv_event_t *e) { static lv_obj_t *make_color_btn(lv_obj_t *scr, const char *txt, int x, lamp_color_t c, lv_obj_t **out_lbl) { lv_obj_t *btn = lv_button_create(scr); - lv_obj_set_size(btn, 88, 40); + lv_obj_set_size(btn, UW(88), UH(40)); lv_obj_align(btn, LV_ALIGN_TOP_LEFT, x, 72); style_btn(btn, COL_BTN); lv_obj_add_event_cb(btn, on_color, LV_EVENT_CLICKED, (void *)(uintptr_t)c); @@ -141,20 +141,20 @@ void ui_create() { lv_label_set_text(lbl_title, "KY-009"); 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_20, 0); - lv_obj_align(lbl_title, LV_ALIGN_TOP_MID, 0, 4); + lv_obj_align(lbl_title, LV_ALIGN_TOP_MID, UX(0), UY(4)); lv_obj_t *lbl_pin = lv_label_create(scr); lv_label_set_text_fmt(lbl_pin, "R%d G%d B%d", KY009_R_PIN, KY009_G_PIN, KY009_B_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, 28); + lv_obj_align(lbl_pin, LV_ALIGN_TOP_MID, UX(0), UY(28)); lbl_state = lv_label_create(scr); lv_label_set_text(lbl_state, "RED ON"); lv_obj_set_style_text_color(lbl_state, lv_color_hex(COL_R), 0); lv_obj_set_style_text_font(lbl_state, &lv_font_montserrat_16, 0); - lv_obj_align(lbl_state, LV_ALIGN_TOP_MID, 0, 48); + lv_obj_align(lbl_state, LV_ALIGN_TOP_MID, UX(0), UY(48)); btn_r = make_color_btn(scr, "R", 24, LAMP_COLOR_R, &lbl_r); btn_g = make_color_btn(scr, "G", 116, LAMP_COLOR_G, &lbl_g); @@ -164,13 +164,13 @@ void ui_create() { lv_label_set_text(lbl_bright, "Brightness 60%"); lv_obj_set_style_text_color(lbl_bright, lv_color_hex(COL_INK), 0); lv_obj_set_style_text_font(lbl_bright, &lv_font_montserrat_16, 0); - lv_obj_align(lbl_bright, LV_ALIGN_TOP_MID, 0, 124); + lv_obj_align(lbl_bright, LV_ALIGN_TOP_MID, UX(0), UY(124)); slider = lv_slider_create(scr); - lv_obj_set_size(slider, UI_HOR_RES - 48, 28); + lv_obj_set_size(slider, UI_HOR_RES - UW(48), UH(28)); lv_slider_set_range(slider, 0, 100); lv_slider_set_value(slider, 60, LV_ANIM_OFF); - lv_obj_align(slider, LV_ALIGN_TOP_MID, 0, 150); + lv_obj_align(slider, LV_ALIGN_TOP_MID, UX(0), UY(150)); lv_obj_set_style_bg_color(slider, lv_color_hex(COL_BTN), LV_PART_MAIN); lv_obj_set_style_bg_color(slider, lv_color_hex(COL_R), LV_PART_INDICATOR); lv_obj_set_style_bg_color(slider, lv_color_hex(COL_INK), LV_PART_KNOB); @@ -179,8 +179,8 @@ void ui_create() { lv_obj_add_event_cb(slider, on_slider, LV_EVENT_RELEASED, nullptr); btn_light = lv_button_create(scr); - lv_obj_set_size(btn_light, UI_HOR_RES - 48, 44); - lv_obj_align(btn_light, LV_ALIGN_TOP_MID, 0, 190); + lv_obj_set_size(btn_light, UI_HOR_RES - UW(48), UH(44)); + lv_obj_align(btn_light, LV_ALIGN_TOP_MID, UX(0), UY(190)); style_btn(btn_light, COL_ON); lv_obj_add_event_cb(btn_light, on_light, LV_EVENT_CLICKED, nullptr); lbl_light = lv_label_create(btn_light);