Merge branch 'main' into develop

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,5}; /* major.minor.patch — 0.2.5: local song 2.bin from Doc/音色文件/0908/2ss.bin */
+const uint8_t Version[3] = {0,2,6}; /* major.minor.patch — 0.2.6: local song 2.bin from Doc/音色文件/0908/2ss_2.bin */
 
 uint8_t Led = 8;
 bool PressFlag = 0;

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 41140UL
+#define EXTFLASH_BIN2_SONG_HAITIAN_SIZE 41263UL
 
-#define EXTFLASH_BIN3_UNIVERSAL_ADDR    0x000A7131UL
+#define EXTFLASH_BIN3_UNIVERSAL_ADDR    0x000A71ACUL
 #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          0x000AED9FUL
-#define EXTFLASH_TONE_PACK_SIZE         716191UL
+#define EXTFLASH_TONE_PACK_END          0x000AEE1AUL
+#define EXTFLASH_TONE_PACK_SIZE         716314UL
 #define UI0902_RES_BASE_SAFE_GAP        (0x00100000UL - EXTFLASH_TONE_PACK_END)
 
 #endif

tools/publish_k1_release.py

@@ -35,7 +35,7 @@ MAP_TXT = REPO / "Doc" / "音色文件" / "0903" / "FLASH_MAP.txt"
 IAP_DIR = REPO / "升级" / "MCU主控升级"
 OUT_ROOT = REPO / "tools" / "out"
 
-FW_VER = "0.2.5"
+FW_VER = "0.2.6"
 TONE_RES_VER = "0903"
 UI0902_RES_BASE = 0x00100000
 BOOT_FLASH_ADDR = 0x08000000