SoundWalker
/
K1Guitar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(release): pack tone resources 1008 and bump to 0.2.46 

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
yuquanjun 2026-10-08 20:45:20 +08:00
parent e0860dd375
commit 53c21eee50
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Global/Global.c
View File

@ -111,7 +111,7 @@ int16_t MIC_VOL_MAP[11]= {-9000,-7000,-5000,-3000,-1000,1000,3000,5000,7000,9000
uint8_t TOUCH_AREA_NUM = (sizeof(Touch_Areas)/sizeof(Touch_AreaTypeDef)); uint8_t TOUCH_AREA_NUM = (sizeof(Touch_Areas)/sizeof(Touch_AreaTypeDef));
const uint8_t Version[3] = {0,2,45}; /* major.minor.patch — 0.2.45: 音乐会钢弦 Bank1/24，经典钢弦 Bank1/25 */ const uint8_t Version[3] = {0,2,46}; /* major.minor.patch — 0.2.46: 音色资源 1008，1.bin 更新 */
uint8_t Led = 8; uint8_t Led = 8;
bool PressFlag = 0; bool PressFlag = 0;

6
project/inc/ExtFlash_Tone_Addr.h
View File

@ -4,10 +4,10 @@
/* Auto-generated by tools/pack_extflash_tone_0903.py — do not hand-edit. */ /* Auto-generated by tools/pack_extflash_tone_0903.py — do not hand-edit. */
/* W25Q128 absolute offsets. Boot logo display uses UI0902_BOOT_LOGO_ADDR. */ /* W25Q128 absolute offsets. Boot logo display uses UI0902_BOOT_LOGO_ADDR. */
/* Tone resource pack has no in-bin version field; release tag = EXTFLASH_TONE_RES_VER. */ /* Tone resource pack has no in-bin version field; release tag = EXTFLASH_TONE_RES_VER. */
#define EXTFLASH_TONE_RES_VER "1002" #define EXTFLASH_TONE_RES_VER "1008"
#define EXTFLASH_TONE_RES_VER_MAJOR 0 #define EXTFLASH_TONE_RES_VER_MAJOR 0
#define EXTFLASH_TONE_RES_VER_MINOR 10 #define EXTFLASH_TONE_RES_VER_MINOR 10
#define EXTFLASH_TONE_RES_VER_PATCH 2 #define EXTFLASH_TONE_RES_VER_PATCH 8
#define EXTFLASH_LOGO_ADDR 0x00000000UL #define EXTFLASH_LOGO_ADDR 0x00000000UL
#define EXTFLASH_LOGO_SIZE 52080UL #define EXTFLASH_LOGO_SIZE 52080UL
@ -18,7 +18,7 @@
#define EXTFLASH_CHARGING_H 190 #define EXTFLASH_CHARGING_H 190
#define EXTFLASH_BIN1_RHYTHM_ADDR 0x0001B8F0UL #define EXTFLASH_BIN1_RHYTHM_ADDR 0x0001B8F0UL
#define EXTFLASH_BIN1_RHYTHM_SIZE 506913UL #define EXTFLASH_BIN1_RHYTHM_SIZE 506007UL
#define EXTFLASH_BIN2_SONG_HAITIAN_ADDR 0x0009D07DUL #define EXTFLASH_BIN2_SONG_HAITIAN_ADDR 0x0009D07DUL
#define EXTFLASH_BIN2_SONG_HAITIAN_SIZE 41914UL #define EXTFLASH_BIN2_SONG_HAITIAN_SIZE 41914UL

4
protocol/bl_uart_parse.c
View File

@ -611,8 +611,8 @@ static void BL_Sendmsg(uint16_t Data1, uint16_t Data2, uint16_t Data3, uint16_t
#define AT32_UID_BASE 0x1FFFF7E8UL /* 96-bit unique device ID */ #define AT32_UID_BASE 0x1FFFF7E8UL /* 96-bit unique device ID */
/* 01 04 音源版本：YY.M.D = 音色资源日期（Dream 无版本查询，发版时手改） /* 01 04 音源版本：YY.M.D = 音色资源日期（Dream 无版本查询，发版时手改）
* 26.10.2 → 2026-10-02（Doc/音色文件/1002） */ * 26.10.8 → 2026-10-08（Doc/音色文件/1008） */
static const uint8_t SOUND_VER[4] = {26, 10, 2, 0x01}; static const uint8_t SOUND_VER[4] = {26, 10, 8, 0x01};
/* 01 05 UI 资源/界面日期：YY.M.D（与 MCU 逻辑版本 Version[] 分开维护） */ /* 01 05 UI 资源/界面日期：YY.M.D（与 MCU 逻辑版本 Version[] 分开维护） */
static const uint8_t UI_VER[4] = {26, 9, 9, 0x01}; static const uint8_t UI_VER[4] = {26, 9, 9, 0x01};

4
tools/gen_sysset_font.py
View File

@ -194,7 +194,7 @@ def main():
raise SystemExit( raise SystemExit(
"USB row overflow: label ends %d, left arrow at %d" % (label_end, tril_x) "USB row overflow: label ends %d, left arrow at %d" % (label_end, tril_x)
) )
ver_w = text_w("0.2.45", glyphs) ver_w = text_w("0.2.46", glyphs)
gh = glyphs["0"][0].size[1] gh = glyphs["0"][0].size[1]
pill_h = gh + 8 pill_h = gh + 8
pill_w = ver_w + 18 pill_w = ver_w + 18
@ -377,7 +377,7 @@ def preview(pics, glyphs, back, back_xy, chev, chev_xy, tri_l, tl, tri_r, tr,
paste(canvas, tri_l, tl[0], row_y + (tl[1] - (CARD_Y0 + CARD_PITCH))) paste(canvas, tri_l, tl[0], row_y + (tl[1] - (CARD_Y0 + CARD_PITCH)))
paste(canvas, tri_r, tr[0], row_y + (tr[1] - (CARD_Y0 + CARD_PITCH))) paste(canvas, tri_r, tr[0], row_y + (tr[1] - (CARD_Y0 + CARD_PITCH)))
fill_round(canvas, CARD_X + pill_dx, CARD_Y0 + pill_dy, pill_w, pill_h, 6, (0, 8, 19)) fill_round(canvas, CARD_X + pill_dx, CARD_Y0 + pill_dy, pill_w, pill_h, 6, (0, 8, 19))
ver = "0.2.45" ver = "0.2.46"
tw = text_w(ver, glyphs) tw = text_w(ver, glyphs)
gh = glyphs["0"][0].size[1] gh = glyphs["0"][0].size[1]
draw_text(canvas, CARD_X + pill_dx + (pill_w - tw) // 2, draw_text(canvas, CARD_X + pill_dx + (pill_w - tw) // 2,

6
tools/pack_extflash_tone_0903.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""Pack external W25Q128 tone/logo image for K1 (1002). """Pack external W25Q128 tone/logo image for K1 (1008).
Layout (absolute W25Q128 offsets): Layout (absolute W25Q128 offsets):
0x00000000 logo.bin (legacy pad; boot UI uses UI0902 full-screen logo) 0x00000000 logo.bin (legacy pad; boot UI uses UI0902 full-screen logo)
@ -25,7 +25,7 @@ from pathlib import Path
ROOT = Path(__file__).resolve().parents[1] # firmware project root ROOT = Path(__file__).resolve().parents[1] # firmware project root
REPO = ROOT.parent.parent # 一诺国际吉他 REPO = ROOT.parent.parent # 一诺国际吉他
OUT_DIR = ROOT / "tools" / "out" OUT_DIR = ROOT / "tools" / "out"
TONE_TAG = "1002" TONE_TAG = "1008"
OUT_BIN = OUT_DIR / f"extflash_tone_{TONE_TAG}.bin" OUT_BIN = OUT_DIR / f"extflash_tone_{TONE_TAG}.bin"
OUT_RES = OUT_DIR / f"extflash_tone_{TONE_TAG}.res" OUT_RES = OUT_DIR / f"extflash_tone_{TONE_TAG}.res"
OUT_ALL_RES = OUT_DIR / f"extflash_ALL_tone{TONE_TAG}_ui0902.res" OUT_ALL_RES = OUT_DIR / f"extflash_ALL_tone{TONE_TAG}_ui0902.res"
@ -34,7 +34,7 @@ OUT_BIN_LEGACY = OUT_DIR / "extflash_tone_0903.bin"
OUT_RES_LEGACY = OUT_DIR / "extflash_tone_0903.res" OUT_RES_LEGACY = OUT_DIR / "extflash_tone_0903.res"
OUT_ALL_LEGACY = OUT_DIR / "extflash_ALL_tone0903_ui0902.res" OUT_ALL_LEGACY = OUT_DIR / "extflash_ALL_tone0903_ui0902.res"
OUT_HDR = ROOT / "project" / "inc" / "ExtFlash_Tone_Addr.h" OUT_HDR = ROOT / "project" / "inc" / "ExtFlash_Tone_Addr.h"
TONE_DIR = REPO / "Doc" / "音色文件" / "1002" TONE_DIR = REPO / "Doc" / "音色文件" / "1008"
OUT_MAP = TONE_DIR / "FLASH_MAP.txt" OUT_MAP = TONE_DIR / "FLASH_MAP.txt"
UI0902_BIN = OUT_DIR / "ui0902_res.bin" UI0902_BIN = OUT_DIR / "ui0902_res.bin"

4
tools/publish_k1_release.py
View File

@ -30,7 +30,7 @@ BOOT_BIN = (
/ "Exe" / "Exe"
/ "AT32F403ARCT7_BOOT.bin" / "AT32F403ARCT7_BOOT.bin"
) )
TONE_RES_VER = "1002" TONE_RES_VER = "1008"
TONE_BIN = PROJ / "tools" / "out" / f"extflash_tone_{TONE_RES_VER}.bin" TONE_BIN = PROJ / "tools" / "out" / f"extflash_tone_{TONE_RES_VER}.bin"
UI0902_BIN = PROJ / "tools" / "out" / "ui0902_res.bin" UI0902_BIN = PROJ / "tools" / "out" / "ui0902_res.bin"
MAP_TXT = REPO / "Doc" / "音色文件" / TONE_RES_VER / "FLASH_MAP.txt" MAP_TXT = REPO / "Doc" / "音色文件" / TONE_RES_VER / "FLASH_MAP.txt"
@ -38,7 +38,7 @@ TONE_HDR = PROJ / "project" / "inc" / "ExtFlash_Tone_Addr.h"
IAP_DIR = REPO / "升级" / "MCU主控升级" IAP_DIR = REPO / "升级" / "MCU主控升级"
OUT_ROOT = REPO / "tools" / "out" OUT_ROOT = REPO / "tools" / "out"
FW_VER = "0.2.45" FW_VER = "0.2.46"
UI0902_RES_BASE = 0x00100000 UI0902_RES_BASE = 0x00100000
BOOT_FLASH_ADDR = 0x08000000 BOOT_FLASH_ADDR = 0x08000000
APP_FLASH_ADDR = 0x08008000 APP_FLASH_ADDR = 0x08008000