diff --git a/Global/Global.c b/Global/Global.c index 9069b4a..c18eade 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,11}; /* major.minor.patch — 0.2.11: power-key watchdog + refuse play on bad tone pack */ +const uint8_t Version[3] = {0,2,12}; /* major.minor.patch — 0.2.12: autoclose 关闭 glyph; normal pick piece; HIL/flash tools */ uint8_t Led = 8; bool PressFlag = 0; diff --git a/protocol/git_user_fw_ver.h b/protocol/git_user_fw_ver.h index fa029e2..a7c50eb 100644 --- a/protocol/git_user_fw_ver.h +++ b/protocol/git_user_fw_ver.h @@ -1,16 +1,16 @@ /* Auto-generated by tools/gen_git_user_fw_ver.py — do not edit. - * git HEAD (dirty): 8ac13ce6e9a9cbd3d2350a8a5da86e7d1cea1eff + * git HEAD (dirty): eed22d4b8c9713f3a331b357d0b3500d854bc395 * branch: develop → develop - * 01 0C wire: develop_8ac13c* + * 01 0C wire: develop_eed22d* */ #ifndef GIT_USER_FW_VER_H #define GIT_USER_FW_VER_H -#define GIT_COMMIT_ID_FULL "8ac13ce6e9a9cbd3d2350a8a5da86e7d1cea1eff" +#define GIT_COMMIT_ID_FULL "eed22d4b8c9713f3a331b357d0b3500d854bc395" #define GIT_BRANCH_NAME "develop" -#define GIT_COMMIT_SHORT6 "8ac13c" +#define GIT_COMMIT_SHORT6 "eed22d" #define GIT_DIRTY (1) -#define GIT_BUILD_ID "develop_8ac13c*" +#define GIT_BUILD_ID "develop_eed22d*" #define GIT_BUILD_ID_LEN 15u #endif /* GIT_USER_FW_VER_H */ diff --git a/tools/publish_k1_release.py b/tools/publish_k1_release.py index ad316dd..7dc2a60 100644 --- a/tools/publish_k1_release.py +++ b/tools/publish_k1_release.py @@ -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.11" +FW_VER = "0.2.12" UI0902_RES_BASE = 0x00100000 BOOT_FLASH_ADDR = 0x08000000 APP_FLASH_ADDR = 0x08008000