From 11ddab46f54a8fedc5b7ff00b9f9ef8b7f1f4688 Mon Sep 17 00:00:00 2001 From: yuquanjun Date: Thu, 8 Oct 2026 12:15:08 +0800 Subject: [PATCH] fix(ui): boot string tone as concert steel guitar Show item 1 (Bank1 program 24, catalog tone 25) after power-on, and bump firmware to 0.2.43. Co-authored-by: Cursor --- Global/Global.c | 4 ++-- driver/drv_nvm.c | 2 +- midi/midi_tables.c | 2 +- midi/midi_tables.h | 4 ++-- tools/gen_sysset_font.py | 4 ++-- tools/publish_k1_release.py | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Global/Global.c b/Global/Global.c index aaa75cb..57b6dfe 100644 --- a/Global/Global.c +++ b/Global/Global.c @@ -16,7 +16,7 @@ GUI_SWITCH mGuiData[] = { { 0, 0, 11, GUI_TRANSPOSE}, // 0 { 78, 40, 260, GUI_SPEED}, // 1 { 0, 0, 1, GUI_MODE_PARAM}, // 2 ?? �Զ����࿪�� 0=�� 1=�� - { TIMBRE_BOOT_SLOT, 0, 4, GUI_TIMBRE_SELECT}, // 3 Bank1 的 25 号 + { TIMBRE_BOOT_SLOT, 0, 4, GUI_TIMBRE_SELECT}, // 3 显示第 1 项，Bank1 Program 24（音色表 25 号） { 0, 0, 3, GUI_PLAY_SECTION}, // 4 { 0, 0, 3, GUI_TAB_INDEX}, // 5 { 0, 0, 1, GUI_AUTOBAND_SW}, // 6 ?? �Զ����࿪�� 0=�� 1=�� @@ -111,7 +111,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,42}; /* major.minor.patch — 0.2.42: 开机弦音色固定 Bank1/25 */ +const uint8_t Version[3] = {0,2,43}; /* major.minor.patch — 0.2.43: 开机弦音色显示第 1 项 / Bank1 Program 24 */ uint8_t Led = 8; bool PressFlag = 0; diff --git a/driver/drv_nvm.c b/driver/drv_nvm.c index 793ce3d..742ef1f 100644 --- a/driver/drv_nvm.c +++ b/driver/drv_nvm.c @@ -216,7 +216,7 @@ void drv_nvm_load_default_calibration_static_value(NvmParam_Type * pData, uint8 pData->param.UsbMode = NVM_USB_MIDI; } mGuiData[GUI_SPEED].Current = pData->param.BPM; - /* 弦音色不跨开关机记忆，冷启动也用 Bank1 的 25 号 */ + /* 弦音色不跨开关机记忆，冷启动也显示第 1 项，Bank1 Program 24（音色表 25 号） */ pData->param.Timbre = TIMBRE_BOOT_SLOT; mGuiData[GUI_TIMBRE_SELECT].Current = pData->param.Timbre; mGuiData[GUI_TRANSPOSE].Current = pData->param.Transpose; diff --git a/midi/midi_tables.c b/midi/midi_tables.c index fd9483e..30f59b3 100644 --- a/midi/midi_tables.c +++ b/midi/midi_tables.c @@ -220,7 +220,7 @@ const STRING_MIDI *Chord_Midi_Table[7] = const STRING_MIDI *OrganChord_Midi_Table[7] = { OrganMIDI_1,OrganMIDI_2,OrganMIDI_3,OrganMIDI_4,OrganMIDI_5,OrganMIDI_6, OrganMIDI_7 }; -/* UI槽位0~4 → MIDI Program Change（Bank1）：24尼龙 / 25钢弦 / 27清音 / 30失真 / 33电贝司 */ +/* UI槽位0~4 → MIDI Program Change（Bank1）：24音乐会钢弦 / 25经典钢弦 / 27清音 / 30失真 / 33电贝司 */ const uint8_t Timbre_index[5] = {0x18, 0x19, 0x1B, 0x1E, 0x21}; diff --git a/midi/midi_tables.h b/midi/midi_tables.h index 591d437..bd4ed93 100644 --- a/midi/midi_tables.h +++ b/midi/midi_tables.h @@ -49,8 +49,8 @@ extern const STRING_MIDI OrganMIDI_7[]; extern const STRING_MIDI *Chord_Midi_Table[7]; extern const STRING_MIDI *OrganChord_Midi_Table[7]; extern const uint8_t Timbre_index[5]; -/* 开机不记忆：Bank1 Program 25（钢弦）= Timbre_index[1] */ -#define TIMBRE_BOOT_SLOT 1u +/* 开机不记忆：显示第 1 项，Bank1 Program 24（音色表 25 号）= Timbre_index[0] */ +#define TIMBRE_BOOT_SLOT 0u /* 当前使用的 MIDI 音符 */ extern STRING_MIDI USE_MIDI; diff --git a/tools/gen_sysset_font.py b/tools/gen_sysset_font.py index 0336648..dd83c78 100644 --- a/tools/gen_sysset_font.py +++ b/tools/gen_sysset_font.py @@ -194,7 +194,7 @@ def main(): raise SystemExit( "USB row overflow: label ends %d, left arrow at %d" % (label_end, tril_x) ) - ver_w = text_w("0.2.42", glyphs) + ver_w = text_w("0.2.43", glyphs) gh = glyphs["0"][0].size[1] pill_h = gh + 8 pill_w = ver_w + 18 @@ -377,7 +377,7 @@ def preview(pics, glyphs, back, back_xy, chev, chev_xy, tri_l, tl, tri_r, tr, paste(canvas, tri_l, tl[0], row_y + (tl[1] - (CARD_Y0 + CARD_PITCH))) paste(canvas, tri_r, tr[0], row_y + (tr[1] - (CARD_Y0 + CARD_PITCH))) fill_round(canvas, CARD_X + pill_dx, CARD_Y0 + pill_dy, pill_w, pill_h, 6, (0, 8, 19)) - ver = "0.2.42" + ver = "0.2.43" tw = text_w(ver, glyphs) gh = glyphs["0"][0].size[1] draw_text(canvas, CARD_X + pill_dx + (pill_w - tw) // 2, diff --git a/tools/publish_k1_release.py b/tools/publish_k1_release.py index 16937e8..ceca63c 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.42" +FW_VER = "0.2.43" UI0902_RES_BASE = 0x00100000 BOOT_FLASH_ADDR = 0x08000000 APP_FLASH_ADDR = 0x08008000