diff --git a/sw_usb_audio/app_usb_aud_fosi_c1/gen_factory.bat b/sw_usb_audio/app_usb_aud_fosi_c1/gen_factory.bat index 171a80f..b76846e 100644 --- a/sw_usb_audio/app_usb_aud_fosi_c1/gen_factory.bat +++ b/sw_usb_audio/app_usb_aud_fosi_c1/gen_factory.bat @@ -1 +1 @@ -xflash bin/factory/phaten_module_factory.xe --loader loader.o --upgrade 6 bin/fps_uac1/phaten_module_fps_uac1.xe --upgrade 2 ../app_usb_aud_fosi_c1_lp/bin/bypass_uac1/phaten_module_bypass_uac1.xe -o %1 +xflash bin/factory/phaten_module_factory.xe --loader loader.o --upgrade 2 bin/fps_uac1/phaten_module_fps_uac1.xe --upgrade 6 ../app_usb_aud_fosi_c1_lp/bin/bypass_uac1/phaten_module_bypass_uac1.xe -o %1 diff --git a/sw_usb_audio/app_usb_aud_fosi_c1/gen_update.bat b/sw_usb_audio/app_usb_aud_fosi_c1/gen_update.bat index e187bc8..b644bc9 100644 --- a/sw_usb_audio/app_usb_aud_fosi_c1/gen_update.bat +++ b/sw_usb_audio/app_usb_aud_fosi_c1/gen_update.bat @@ -1 +1 @@ -xflash --factory-version 15.3 --target-file src/core/xu316_qf60.xn --upgrade 6 bin/fps_uac1/phaten_module_fps_uac1.xe --upgrade 2 ../app_usb_aud_fosi_c1_lp/bin/bypass_uac1/phaten_module_bypass_uac1.xe -o %1 +xflash --factory-version 15.3 --target-file src/core/xu316_qf60.xn --upgrade 2 bin/fps_uac1/phaten_module_fps_uac1.xe --upgrade 6 ../app_usb_aud_fosi_c1_lp/bin/bypass_uac1/phaten_module_bypass_uac1.xe -o %1 diff --git a/sw_usb_audio/app_usb_aud_fosi_c1/src/extensions/audiohw.xc b/sw_usb_audio/app_usb_aud_fosi_c1/src/extensions/audiohw.xc index e9238c6..ad782ba 100644 --- a/sw_usb_audio/app_usb_aud_fosi_c1/src/extensions/audiohw.xc +++ b/sw_usb_audio/app_usb_aud_fosi_c1/src/extensions/audiohw.xc @@ -34,11 +34,11 @@ extern "C" { #define DISABLE_REBOOT 1 #define MODE_FPS_UAC2 COAX_IN_FLAG // 1 FPS -#define MODE_BYPASS_UAC1 USB_IN_FLAG // 2 BYPASS +#define MODE_BYPASS_UAC1 I2S_IN_FLAG // 6 BYPASS #define MODE_BR_UAC2 OPT_IN_FLAG // 3 BR #define MODE_V71_UAC2 UAC1_IN_FLAG // 4 V71 #define MODE_V71_UAC1 BT_IN_FLAG // 5 UAC1 -#define MODE_FPS_UAC1 I2S_IN_FLAG // 6 UAC1 +#define MODE_FPS_UAC1 USB_IN_FLAG // 2 FPS UAC1 extern unsigned g_host_os; // 1 -> Windows, 2 -> Others audio_sampling g_new_playback_format, g_playback_format; @@ -121,8 +121,8 @@ timer tm; // 改动原因:新增C1模式持久化文件路径,使用LittleFS保存mode按键状态,保证断电重启后可恢复。 #define C1_MODE_VALUE_PATH "c1_mode_value" -// 改动原因:产品仅保留两档——1=BYPASS_UAC1(灯灭)、4=FPS_UAC1(橙灯常亮);灯索引与 c1_mode 同值下发 tile1。 -#define C1_MODE_VALUE_DEFAULT 1 +// 改动原因:产品仅保留两档——1=BYPASS_UAC1(灯灭)、4=FPS_UAC1(橙灯常亮);默认 4=FPS;灯索引与 c1_mode 同值下发 tile1。 +#define C1_MODE_VALUE_DEFAULT 4 #define C1_MODE_VALUE_MIN 1 #define C1_MODE_VALUE_MAX 4 @@ -1970,7 +1970,7 @@ void app_control_slave(server interface c1_led_ctrl_if i_c1_led_ctrl) { // 改动原因:tile1 先于 tile0 运行,上电先把硬件灯全灯且不调用 apply,避免用占位 mic/mode 组合误亮;shadow 置为全灯灯电平便于首包 set_* 时 apply 与端口一致。 unsigned led_shadow = 0xF; - unsigned mode_led_color_idx = 1; + unsigned mode_led_color_idx = C1_MODE_VALUE_DEFAULT; unsigned mic_mute_switch = 1; c1_panel_leds_force_all_off_hw(); diff --git a/sw_usb_audio/app_usb_aud_fosi_c1_lp/src/extensions/audiohw.xc b/sw_usb_audio/app_usb_aud_fosi_c1_lp/src/extensions/audiohw.xc index 92f21fe..0eec16f 100644 --- a/sw_usb_audio/app_usb_aud_fosi_c1_lp/src/extensions/audiohw.xc +++ b/sw_usb_audio/app_usb_aud_fosi_c1_lp/src/extensions/audiohw.xc @@ -34,11 +34,11 @@ extern "C" { #define DISABLE_REBOOT 1 #define MODE_FPS_UAC2 COAX_IN_FLAG // 1 FPS -#define MODE_BYPASS_UAC1 USB_IN_FLAG // 2 BYPASS +#define MODE_BYPASS_UAC1 I2S_IN_FLAG // 6 BYPASS #define MODE_BR_UAC2 OPT_IN_FLAG // 3 BR #define MODE_V71_UAC2 UAC1_IN_FLAG // 4 V71 #define MODE_V71_UAC1 BT_IN_FLAG // 5 UAC1 -#define MODE_FPS_UAC1 I2S_IN_FLAG // 6 UAC1 +#define MODE_FPS_UAC1 USB_IN_FLAG // 2 FPS UAC1 extern unsigned g_host_os; // 1 -> Windows, 2 -> Others audio_sampling g_new_playback_format, g_playback_format; @@ -121,8 +121,8 @@ timer tm; // 改动原因:新增C1模式持久化文件路径,使用LittleFS保存mode按键状态,保证断电重启后可恢复。 #define C1_MODE_VALUE_PATH "c1_mode_value" -// 改动原因:产品仅保留两档——1=BYPASS_UAC1(灯灭)、4=FPS_UAC1(橙灯常亮);灯索引与 c1_mode 同值下发 tile1。 -#define C1_MODE_VALUE_DEFAULT 1 +// 改动原因:产品仅保留两档——1=BYPASS_UAC1(灯灭)、4=FPS_UAC1(橙灯常亮);默认 4=FPS;灯索引与 c1_mode 同值下发 tile1。 +#define C1_MODE_VALUE_DEFAULT 4 #define C1_MODE_VALUE_MIN 1 #define C1_MODE_VALUE_MAX 4 @@ -1973,7 +1973,7 @@ void app_control_slave(server interface c1_led_ctrl_if i_c1_led_ctrl, chanend c_ { // 改动原因:tile1 先于 tile0 运行,上电先把硬件灯全灯且不调用 apply,避免用占位 mic/mode 组合误亮;shadow 置为全灯灯电平便于首包 set_* 时 apply 与端口一致。 unsigned led_shadow = 0xF; - unsigned mode_led_color_idx = 1; + unsigned mode_led_color_idx = C1_MODE_VALUE_DEFAULT; unsigned mic_mute_switch = 1; c1_panel_leds_force_all_off_hw();