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

chore(release): bump firmware to 0.2.60 and tone resources to 1016 

The new 1.bin is smaller and keeps the same flash addresses for 2.bin and 3.bin.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
yuquanjun 2026-10-16 20:37:36 +08:00
parent 756639f5f6
commit b02072c950
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Global/Global.c
View File

@ -272,7 +272,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,59}; /* major.minor.patch — 0.2.59: 第6个琶音落在下一拍 */ const uint8_t Version[3] = {0,2,60}; /* major.minor.patch — 0.2.60: 八音顺序只用于第1首节奏 */
uint8_t Led = 8; uint8_t Led = 8;
/* App 已下发琴颈引导灯：拨片勿再全绿盖掉 */ /* App 已下发琴颈引导灯：拨片勿再全绿盖掉 */
static uint8_t s_app_neck_led = 0; static uint8_t s_app_neck_led = 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 "1008" #define EXTFLASH_TONE_RES_VER "1016"
#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 8 #define EXTFLASH_TONE_RES_VER_PATCH 16
#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 506007UL #define EXTFLASH_BIN1_RHYTHM_SIZE 501863UL
#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
tools/pack_extflash_tone_0903.py
View File

@ -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 = "1008" TONE_TAG = "1016"
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" / "音色文件" / "1008" TONE_DIR = REPO / "Doc" / "音色文件" / "1016"
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 = "1008" TONE_RES_VER = "1016"
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.59" FW_VER = "0.2.60"
UI0902_RES_BASE = 0x00100000 UI0902_RES_BASE = 0x00100000
BOOT_FLASH_ADDR = 0x08000000 BOOT_FLASH_ADDR = 0x08000000
APP_FLASH_ADDR = 0x08008000 APP_FLASH_ADDR = 0x08008000