diff --git a/Global/Global.c b/Global/Global.c index fda79af..d7aa64b 100644 --- a/Global/Global.c +++ b/Global/Global.c @@ -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)); -const uint8_t Version[3] = {0,2,60}; /* major.minor.patch — 0.2.60: 八音顺序只用于第1首节奏 */ +const uint8_t Version[3] = {0,2,61}; /* major.minor.patch — 0.2.61: 音色资源 1019 */ uint8_t Led = 8; /* App 已下发琴颈引导灯:拨片勿再全绿盖掉 */ static uint8_t s_app_neck_led = 0; diff --git a/project/inc/ExtFlash_Tone_Addr.h b/project/inc/ExtFlash_Tone_Addr.h index ce02c59..d65c767 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 "1016" +#define EXTFLASH_TONE_RES_VER "1019" #define EXTFLASH_TONE_RES_VER_MAJOR 0 #define EXTFLASH_TONE_RES_VER_MINOR 10 -#define EXTFLASH_TONE_RES_VER_PATCH 16 +#define EXTFLASH_TONE_RES_VER_PATCH 19 #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 501863UL +#define EXTFLASH_BIN1_RHYTHM_SIZE 499354UL #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 f59976f..676ae98 100644 --- a/tools/pack_extflash_tone_0903.py +++ b/tools/pack_extflash_tone_0903.py @@ -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 = "1016" +TONE_TAG = "1019" 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" @@ -34,7 +34,7 @@ OUT_BIN_LEGACY = OUT_DIR / "extflash_tone_0903.bin" OUT_RES_LEGACY = OUT_DIR / "extflash_tone_0903.res" OUT_ALL_LEGACY = OUT_DIR / "extflash_ALL_tone0903_ui0902.res" OUT_HDR = ROOT / "project" / "inc" / "ExtFlash_Tone_Addr.h" -TONE_DIR = REPO / "Doc" / "音色文件" / "1016" +TONE_DIR = REPO / "Doc" / "音色文件" / "1019" OUT_MAP = TONE_DIR / "FLASH_MAP.txt" UI0902_BIN = OUT_DIR / "ui0902_res.bin" diff --git a/tools/publish_k1_release.py b/tools/publish_k1_release.py index 592d844..ed0d841 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 = "1016" +TONE_RES_VER = "1019" 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.60" +FW_VER = "0.2.61" UI0902_RES_BASE = 0x00100000 BOOT_FLASH_ADDR = 0x08000000 APP_FLASH_ADDR = 0x08008000