Add optional cyd_35r (ESP32-3248S035) with 480x320 UI; default remains 2.8.
This commit is contained in:
@@ -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 HW069 Digit Display (cyd)",
|
||||
"name: CYD hw069digitdisplaytest ($dstName)",
|
||||
"git: $git",
|
||||
"date: $date",
|
||||
"board: ESP32-2432S028R (ILI9341)",
|
||||
"features: SoftSPI touch, LVGL, HW069 TM1637 CLK=GPIO22 DIO=GPIO27",
|
||||
$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)"
|
||||
|
||||
@@ -1,9 +1,20 @@
|
||||
#pragma once
|
||||
|
||||
// CYD ESP32-2432S028R — 触控/屏脚与 tftest 一致
|
||||
// HW-069 v1.1 四位数显（TM1637）：CLK=GPIO22，DIO=GPIO27
|
||||
// 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
|
||||
@@ -11,10 +22,12 @@
|
||||
#define CYD_TOUCH_CLK 25
|
||||
#define CYD_TOUCH_CS 33
|
||||
|
||||
/* 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 HW069_CLK_PIN 22
|
||||
#define HW069_DIO_PIN 27
|
||||
|
||||
#define SCREEN_WIDTH 240
|
||||
#define SCREEN_HEIGHT 320
|
||||
#define UI_HOR_RES 320
|
||||
#define UI_VER_RES 240
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
14
src/ui.cpp
14
src/ui.cpp
@@ -147,20 +147,20 @@ void ui_create() {
|
||||
lv_label_set_text(lbl_title, "HW-069");
|
||||
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, 4);
|
||||
lv_obj_align(lbl_title, LV_ALIGN_TOP_MID, UX(0), UY(4));
|
||||
|
||||
lbl_pin = lv_label_create(scr);
|
||||
lv_label_set_text_fmt(lbl_pin, "v1.1 CLK%d DIO%d TM1637", HW069_CLK_PIN,
|
||||
HW069_DIO_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, 36);
|
||||
lv_obj_align(lbl_pin, LV_ALIGN_TOP_MID, UX(0), UY(36));
|
||||
|
||||
lbl_value = lv_label_create(scr);
|
||||
lv_label_set_text(lbl_value, "1234");
|
||||
lv_obj_set_style_text_color(lbl_value, lv_color_hex(COL_ACCENT), 0);
|
||||
lv_obj_set_style_text_font(lbl_value, &lv_font_montserrat_28, 0);
|
||||
lv_obj_align(lbl_value, LV_ALIGN_TOP_MID, 0, 56);
|
||||
lv_obj_align(lbl_value, LV_ALIGN_TOP_MID, UX(0), UY(56));
|
||||
|
||||
const int16_t row_y = 92;
|
||||
const int16_t gap = 8;
|
||||
@@ -183,13 +183,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_14, 0);
|
||||
lv_obj_align(lbl_bright, LV_ALIGN_TOP_MID, 0, 140);
|
||||
lv_obj_align(lbl_bright, LV_ALIGN_TOP_MID, UX(0), UY(140));
|
||||
|
||||
slider = lv_slider_create(scr);
|
||||
lv_obj_set_size(slider, UI_HOR_RES - 48, 24);
|
||||
lv_obj_set_size(slider, UI_HOR_RES - UW(48), UH(24));
|
||||
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, 162);
|
||||
lv_obj_align(slider, LV_ALIGN_TOP_MID, UX(0), UY(162));
|
||||
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_ACCENT), LV_PART_INDICATOR);
|
||||
lv_obj_set_style_bg_color(slider, lv_color_hex(COL_INK), LV_PART_KNOB);
|
||||
@@ -200,7 +200,7 @@ void ui_create() {
|
||||
const int16_t btn_w = (UI_HOR_RES - 48 - gap) / 2;
|
||||
btn_colon = lv_button_create(scr);
|
||||
lv_obj_set_size(btn_colon, btn_w, 40);
|
||||
lv_obj_align(btn_colon, LV_ALIGN_TOP_LEFT, 24, 196);
|
||||
lv_obj_align(btn_colon, LV_ALIGN_TOP_LEFT, UX(24), UY(196));
|
||||
style_btn(btn_colon, COL_DIM);
|
||||
lv_obj_add_event_cb(btn_colon, on_colon, LV_EVENT_CLICKED, nullptr);
|
||||
lbl_colon = lv_label_create(btn_colon);
|
||||
|
||||
Reference in New Issue
Block a user