From a0bf96ac86ea61e02442f0472dfd4d7f77bd7654 Mon Sep 17 00:00:00 2001 From: Steven Dan Date: Wed, 25 Mar 2026 12:25:02 +0800 Subject: [PATCH] update role flag --- .../CMakeLists.txt | 71 +++++++++++-------- .../gen_factory.bat | 4 +- .../src/extensions/audiohw.xc | 15 ++-- 3 files changed, 51 insertions(+), 39 deletions(-) diff --git a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt index c45d8f1..05eff18 100644 --- a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt +++ b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt @@ -77,17 +77,51 @@ set(SW_USB_FACT_FLAGS ${EXTRA_BUILD_FLAGS} -Os LINK_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/../../lib_dnr/lib_dnr) +set(APP_COMPILER_FLAGS_f5_music_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 + -DI2S_CHANS_ADC=2 + -DAUDIO_CLASS=1 + -DMIN_FREQ=48000 + -DMAX_FREQ=48000 + -DUAC1_MODE=1 + -DF5_MUSIC_UAC1=1 + -DUSE_EX3D + -DMIXER=0 + #-ldnr_50ms + #-DDNR_ENABLE=1 + -llib_ex3d_all + -DEQ_EN=1 + -DEX3D_SF_NUM=3 + -DNUM_USB_CHAN_OUT=8 + -DNUM_USB_CHAN_OUT_FS=2 + -DNUM_USB_CHAN_IN=2 + -DSTREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS=16 + -DSTREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS=16 + -DSTREAM_FORMAT_OUTPUT_3_RESOLUTION_BITS=16 + -DSTREAM_FORMAT_INPUT_1_RESOLUTION_BITS=16 + -DSTREAM_FORMAT_INPUT_2_RESOLUTION_BITS=16 + -DSTREAM_FORMAT_INPUT_3_RESOLUTION_BITS=16 + -DNUM_EX3D_CHAN_OUT=2 + -DMIN_VOLUME=0xE000 + -DINPUT_VOLUME_CONTROL=1 + -DOUTPUT_VOLUME_CONTROL=1 + -DDEBUG_MEMORY_LOG_ENABLED=1 + -DXUA_DFU_EN=0 + -DIR_SWITCHING_MODE + -DHID_CONTROLS=0) + + + set(APP_COMPILER_FLAGS_fact ${SW_USB_FACT_FLAGS} -DI2S_CHANS_DAC=2 -DI2S_CHANS_ADC=0 -DMIN_FREQ=48000 -DMAX_FREQ=48000 - -DF1_MUSIC_UAC2=1 + -DFACT=1 #-DUSE_EX3D -DMIXER=0 -DUAC2_MODE=1 #-ldnr_50ms #-llib_ex3d_all - -DEQ_EN=1 + #-DEQ_EN=1 #-DEX3D_SF_NUM=3 -DNUM_USB_CHAN_OUT=2 -DNUM_USB_CHAN_IN=0 @@ -149,31 +183,6 @@ set(APP_COMPILER_FLAGS_f3_f4_fps_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 -DXUA_DFU_EN=1 -DIR_SWITCHING_MODE -DHID_CONTROLS=1) - -set(APP_COMPILER_FLAGS_f5_music_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 - -DI2S_CHANS_ADC=2 - -DMIN_FREQ=48000 - -DMAX_FREQ=48000 - -DUAC1_MODE=1 - -DF5_MUSIC_UAC1=1 - -DUSE_EX3D - -DMIXER=0 - -ldnr_50ms - -DDNR_ENABLE=1 - -llib_ex3d_all - -DEQ_EN=1 - -DEX3D_SF_NUM=3 - -DNUM_USB_CHAN_OUT=8 - -DNUM_USB_CHAN_IN=2 - -DNUM_EX3D_CHAN_OUT=2 - -DMIN_VOLUME=0xE000 - -DINPUT_VOLUME_CONTROL=1 - -DOUTPUT_VOLUME_CONTROL=1 - #-DDEBUG_MEMORY_LOG_ENABLED=1 - -DXUA_DFU_EN=1 - -DIR_SWITCHING_MODE - -DHID_CONTROLS=1) - set(APP_COMPILER_FLAGS_f6_f7_fps_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 -DI2S_CHANS_ADC=2 -DAUDIO_CLASS=1 @@ -226,10 +235,10 @@ set(TARGET_XN ${CMAKE_CURRENT_LIST_DIR}/src/core/synido.xn) add_custom_target(factory_bin COMMAND ${CMAKE_COMMAND} -E echo "xflash ${XE_FACT} --loader ${LOADER_OBJ} --upgrade 1 ${XE_F3F4} --upgrade 2 ${XE_F5} --upgrade 3 ${XE_F1} --upgrade 4 ${XE_F6F7} -o ${CMAKE_CURRENT_LIST_DIR}/factory_${APP_BASE}_${FW_VERSION}.bin" COMMAND xflash ${XE_FACT} --loader ${LOADER_OBJ} - --upgrade 1 ${XE_F3F4} --upgrade 2 ${XE_F5} --upgrade 3 ${XE_F1} - #--upgrade 4 ${XE_F6F7} + --upgrade 1 ${XE_F3F4} + --upgrade 4 ${XE_F6F7} -o ${CMAKE_CURRENT_LIST_DIR}/factory_${APP_BASE}_${FW_VERSION}.bin #DEPENDS f1_music_uac2 f3_f4_fps_uac2 f5_music_uac1 f6_f7_fps_uac1 COMMENT "Generating factory image: factory_${APP_BASE}_${FW_VERSION}.bin" @@ -240,10 +249,10 @@ add_custom_target(factory_bin add_custom_target(update_bin COMMAND ${CMAKE_COMMAND} -E echo "xflash --factory-version 15.2 --target-file ${TARGET_XN} --upgrade 1 ${XE_F3F4} --upgrade 2 ${XE_F5} --upgrade 3 ${XE_F1} --upgrade 4 ${XE_F6F7} -o ${CMAKE_CURRENT_LIST_DIR}/update_${APP_BASE}_${FW_VERSION}.bin" COMMAND xflash --factory-version 15.2 --target-file ${TARGET_XN} - --upgrade 1 ${XE_F3F4} --upgrade 2 ${XE_F5} --upgrade 3 ${XE_F1} - #--upgrade 4 ${XE_F6F7} + --upgrade 1 ${XE_F3F4} + --upgrade 4 ${XE_F6F7} -o ${CMAKE_CURRENT_LIST_DIR}/update_${APP_BASE}_${FW_VERSION}.bin #DEPENDS f1_music_uac2 f3_f4_fps_uac2 f5_music_uac1 f6_f7_fps_uac1 COMMENT "Generating update image: update_${APP_BASE}_${FW_VERSION}.bin" diff --git a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/gen_factory.bat b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/gen_factory.bat index 3a2f0e7..d4acc08 100644 --- a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/gen_factory.bat +++ b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/gen_factory.bat @@ -1 +1,3 @@ -xflash bin/factory/fact.xe --loader loader.o --upgrade 2 bin\ex3d_UAC1\app_usb_aud_phaten_gs_ex3d_UAC1.xe --upgrade 4 bin/ex3d_stereo_2k/app_usb_aud_phaten_gs_ex3d_stereo_2k.xe --upgrade 1 bin\ex3d_71_game\app_usb_aud_phaten_gs_ex3d_71_game.xe --upgrade 3 bin\ex3d_71_movie\app_usb_aud_phaten_gs_ex3d_71_movie.xe -o %1 +xflash bin/fact/app_usb_aud_sy102_fact.xe --loader loader.o --upgrade 2 bin/f5_music_uac1/app_usb_aud_sy102_f5_music_uac1.xe --upgrade 3 bin/f1_music_uac2/app_usb_aud_sy102_f1_music_uac2.xe --upgrade 1 bin/f3_f4_fps_uac2/app_usb_aud_sy102_f3_f4_fps_uac2.xe -o %1 + +rem --upgrade 4 bin/f6_f7_fps_uac1/app_usb_aud_sy102_f6_f7_fps_uac1.xe diff --git a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc index ab6d08a..c38fae2 100644 --- a/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc +++ b/sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc @@ -129,9 +129,9 @@ unsigned g_led_blink_is_white = 0; enum { OS_WIN = 1, OS_OTHERS = 2 }; // 改动原因：定义模式切换标志值，用于在SPATIAL_GAME、STEREO_8K、STEREO_2K、UAC1之间循环切换 #define MODE_F3_F4_FPS_UAC2 COAX_IN_FLAG //1 SPATIAL_GAME模式标志 -#define MODE_F5_MUSIC_UAC1 UAC1_IN_FLAG // 2 UAC1模式标志 -#define MODE_F1_MUSIC_UAC2 OPT_IN_FLAG // 3 STEREO_8K模式标志 -#define MODE_F6_F7_FPS_UAC1 USB_IN_FLAG // 4 STEREO_2K模式标志 +#define MODE_F5_MUSIC_UAC1 USB_IN_FLAG // 2 F5 MUSIC +#define MODE_F1_MUSIC_UAC2 OPT_IN_FLAG // 3 F1 MUSIC +#define MODE_F6_F7_FPS_UAC1 UAC1_IN_FLAG // 4 STEREO_2K模式标志 /* All on tile[0] */ port p_scl = PORT_I2C_SCL; @@ -359,15 +359,16 @@ void button_task(chanend c_hidSendData, chanend cc_mic_level, chanend c_uac_vol) unsigned /* char */ saved_mode; unsigned char saved_uac1_mode = 0; unsigned char path[] = "game_mode"; - unsigned host_os; - GET_SHARED_GLOBAL(host_os, g_host_os); + + delay_milliseconds(10); saved_mode = load_value(path); debug_printf("Loaded game_mode from flash: %d\n", saved_mode); #if defined(UAC1_MODE) delay_milliseconds(300); + GET_SHARED_GLOBAL(host_os, g_host_os); if (saved_mode == 255) { #if defined(F5_MUSIC_UAC1) saved_mode = 1; // f5: default music mode @@ -619,8 +620,8 @@ void button_task(chanend c_hidSendData, chanend cc_mic_level, chanend c_uac_vol) debug_printf("Set role switch flag: 0x%04X, switching firmware, rebooting...\n", mode_flag); SetRoleSwitchFlag(mode_flag); delay_milliseconds(20); - // device_reboot(); - // while (1); + device_reboot(); + while (1); } else { debug_printf("Same firmware mode (0x%04X), updating mode and algorithm state without reboot\n", mode_flag);