From 6fbeaa4881209afcef3d6f9a0852c34ff790f4dd Mon Sep 17 00:00:00 2001 From: yuquanjun Date: Tue, 15 Sep 2026 21:01:30 +0800 Subject: [PATCH] release: bump firmware version to 0.2.13 Ship expert fretboard continue for local songs and tone resource pack 0915. Co-authored-by: Cursor --- Global/Global.c | 2 +- project/inc/ExtFlash_Tone_Addr.h | 6 +++--- tools/pack_extflash_tone_0903.py | 12 ++++++------ tools/publish_k1_release.py | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Global/Global.c b/Global/Global.c index 605b86a..cb5b7f7 100644 --- a/Global/Global.c +++ b/Global/Global.c @@ -101,7 +101,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)); -const uint8_t Version[3] = {0,2,12}; /* major.minor.patch — 0.2.12: autoclose 关闭 glyph; normal pick piece; HIL/flash tools */ +const uint8_t Version[3] = {0,2,13}; /* major.minor.patch — 0.2.13: expert fret continue; toneRes 0915 */ uint8_t Led = 8; bool PressFlag = 0; diff --git a/project/inc/ExtFlash_Tone_Addr.h b/project/inc/ExtFlash_Tone_Addr.h index d3b9eb8..27e7326 100644 --- a/project/inc/ExtFlash_Tone_Addr.h +++ b/project/inc/ExtFlash_Tone_Addr.h @@ -4,10 +4,10 @@ /* Auto-generated by tools/pack_extflash_tone_0903.py — do not hand-edit. */ /* 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. */ -#define EXTFLASH_TONE_RES_VER "0914" +#define EXTFLASH_TONE_RES_VER "0915" #define EXTFLASH_TONE_RES_VER_MAJOR 0 #define EXTFLASH_TONE_RES_VER_MINOR 9 -#define EXTFLASH_TONE_RES_VER_PATCH 14 +#define EXTFLASH_TONE_RES_VER_PATCH 15 #define EXTFLASH_LOGO_ADDR 0x00000000UL #define EXTFLASH_LOGO_SIZE 52080UL @@ -18,7 +18,7 @@ #define EXTFLASH_CHARGING_H 190 #define EXTFLASH_BIN1_RHYTHM_ADDR 0x0001B8F0UL -#define EXTFLASH_BIN1_RHYTHM_SIZE 509151UL +#define EXTFLASH_BIN1_RHYTHM_SIZE 506071UL #define EXTFLASH_BIN2_SONG_HAITIAN_ADDR 0x0009D07DUL #define EXTFLASH_BIN2_SONG_HAITIAN_SIZE 41914UL diff --git a/tools/pack_extflash_tone_0903.py b/tools/pack_extflash_tone_0903.py index 15e6fc8..4f021f6 100644 --- a/tools/pack_extflash_tone_0903.py +++ b/tools/pack_extflash_tone_0903.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -"""Pack external W25Q128 tone/logo image for K1 (0914). +"""Pack external W25Q128 tone/logo image for K1 (0915). Layout (absolute W25Q128 offsets): 0x00000000 logo.bin (legacy pad; boot UI uses UI0902 full-screen logo) @@ -10,10 +10,10 @@ Layout (absolute W25Q128 offsets): after 2.bin 3.bin 万能模式（随 2.bin 长度后移；写入 ExtFlash_Tone_Addr.h） Outputs: - tools/out/extflash_tone_0914.bin / .res - tools/out/extflash_ALL_tone0914_ui0902.res + tools/out/extflash_tone_0915.bin / .res + tools/out/extflash_ALL_tone0915_ui0902.res project/inc/ExtFlash_Tone_Addr.h - Doc/音色文件/0914/FLASH_MAP.txt + Doc/音色文件/0915/FLASH_MAP.txt """ from __future__ import annotations @@ -25,7 +25,7 @@ from pathlib import Path ROOT = Path(__file__).resolve().parents[1] # firmware project root REPO = ROOT.parent.parent # 一诺国际吉他 OUT_DIR = ROOT / "tools" / "out" -TONE_TAG = "0914" +TONE_TAG = "0915" OUT_BIN = OUT_DIR / f"extflash_tone_{TONE_TAG}.bin" OUT_RES = OUT_DIR / f"extflash_tone_{TONE_TAG}.res" OUT_ALL_RES = OUT_DIR / f"extflash_ALL_tone{TONE_TAG}_ui0902.res" @@ -164,7 +164,7 @@ def main() -> None: #define EXTFLASH_TONE_RES_VER "{TONE_TAG}" #define EXTFLASH_TONE_RES_VER_MAJOR 0 #define EXTFLASH_TONE_RES_VER_MINOR 9 -#define EXTFLASH_TONE_RES_VER_PATCH 14 +#define EXTFLASH_TONE_RES_VER_PATCH 15 #define EXTFLASH_LOGO_ADDR 0x{by_name['LOGO'][1]:08X}UL #define EXTFLASH_LOGO_SIZE {by_name['LOGO'][2]}UL diff --git a/tools/publish_k1_release.py b/tools/publish_k1_release.py index 7dc2a60..56d9631 100644 --- a/tools/publish_k1_release.py +++ b/tools/publish_k1_release.py @@ -30,7 +30,7 @@ BOOT_BIN = ( / "Exe" / "AT32F403ARCT7_BOOT.bin" ) -TONE_RES_VER = "0914" +TONE_RES_VER = "0915" TONE_BIN = PROJ / "tools" / "out" / f"extflash_tone_{TONE_RES_VER}.bin" UI0902_BIN = PROJ / "tools" / "out" / "ui0902_res.bin" 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主控升级" OUT_ROOT = REPO / "tools" / "out" -FW_VER = "0.2.12" +FW_VER = "0.2.13" UI0902_RES_BASE = 0x00100000 BOOT_FLASH_ADDR = 0x08000000 APP_FLASH_ADDR = 0x08008000