diff --git a/Global/Global.c b/Global/Global.c index fef79ed..0ffa9e7 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,3}; /* major.minor.patch — 0.2.3: local song HKTK load/play + tone addr logs */ +const uint8_t Version[3] = {0,2,5}; /* major.minor.patch — 0.2.5: local song 2.bin from Doc/音色文件/0908/2ss.bin */ uint8_t Led = 8; bool PressFlag = 0; diff --git a/project/inc/ExtFlash_Tone_Addr.h b/project/inc/ExtFlash_Tone_Addr.h index cd3050c..833eb8f 100644 --- a/project/inc/ExtFlash_Tone_Addr.h +++ b/project/inc/ExtFlash_Tone_Addr.h @@ -21,9 +21,9 @@ #define EXTFLASH_BIN1_RHYTHM_SIZE 530317UL #define EXTFLASH_BIN2_SONG_HAITIAN_ADDR 0x0009D07DUL -#define EXTFLASH_BIN2_SONG_HAITIAN_SIZE 41040UL +#define EXTFLASH_BIN2_SONG_HAITIAN_SIZE 41140UL -#define EXTFLASH_BIN3_UNIVERSAL_ADDR 0x000A70CDUL +#define EXTFLASH_BIN3_UNIVERSAL_ADDR 0x000A7131UL #define EXTFLASH_BIN3_UNIVERSAL_SIZE 31854UL /* Convenience aliases used by UI ADDRESS */ @@ -35,8 +35,8 @@ /* Legacy AutoBand bank — not repacked in 0903; left unchanged in firmware */ #define FLASH_ADDR_AUTOBAND_LEGACY 0x0009EB5FUL -#define EXTFLASH_TONE_PACK_END 0x000AED3BUL -#define EXTFLASH_TONE_PACK_SIZE 716091UL +#define EXTFLASH_TONE_PACK_END 0x000AED9FUL +#define EXTFLASH_TONE_PACK_SIZE 716191UL #define UI0902_RES_BASE_SAFE_GAP (0x00100000UL - EXTFLASH_TONE_PACK_END) #endif diff --git a/tools/publish_k1_release.py b/tools/publish_k1_release.py index 951d071..d3a915d 100644 --- a/tools/publish_k1_release.py +++ b/tools/publish_k1_release.py @@ -25,7 +25,7 @@ MAP_TXT = REPO / "Doc" / "音色文件" / "0903" / "FLASH_MAP.txt" IAP_DIR = REPO / "升级" / "MCU主控升级" OUT_ROOT = REPO / "tools" / "out" -FW_VER = "0.2.3" +FW_VER = "0.2.5" TONE_RES_VER = "0903" UI0902_RES_BASE = 0x00100000