Steven/3d_audio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delay dsp core

Browse Source
This commit is contained in:
Steven Dan
2026-03-25 10:36:36 +08:00
parent 5c6f64de8e
commit 041a8aeea6
3 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sw_usb_audio/app_usb_aud_phaten_golden_6ch/CMakeLists.txt
View File

@@ -77,10 +77,10 @@ set(SW_USB_FACT_FLAGS ${EXTRA_BUILD_FLAGS} -Os
LINK_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/../../lib_dnr/lib_dnr) LINK_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/../../lib_dnr/lib_dnr)
set(APP_COMPILER_FLAGS_fact ${SW_USB_FACT_FLAGS} -DI2S_CHANS_DAC=2 set(APP_COMPILER_FLAGS_fact ${SW_USB_FACT_FLAGS} -DI2S_CHANS_DAC=2
-DI2S_CHANS_ADC=0 -DI2S_CHANS_ADC=0
-DMIN_FREQ=48000 -DMIN_FREQ=48000
-DMAX_FREQ=48000 -DMAX_FREQ=48000
-DF1_MUSIC_UAC2=1 -DF1_MUSIC_UAC2=1
#-DUSE_EX3D #-DUSE_EX3D
-DMIXER=0 -DMIXER=0
@@ -102,10 +102,10 @@ set(APP_COMPILER_FLAGS_fact ${SW_USB_FACT_FLAGS} -DI2S_CHANS_DAC=2
set(APP_COMPILER_FLAGS_f1_music_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 set(APP_COMPILER_FLAGS_f1_music_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2
-DI2S_CHANS_ADC=2 -DI2S_CHANS_ADC=2
-DMIN_FREQ=48000 -DMIN_FREQ=48000
-DMAX_FREQ=192000 -DMAX_FREQ=192000
-DF1_MUSIC_UAC2=1 -DF1_MUSIC_UAC2=1
#-DUSE_EX3D #-DUSE_EX3D
-DMIXER=0 -DMIXER=0
@@ -126,10 +126,10 @@ set(APP_COMPILER_FLAGS_f1_music_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC
-DHID_CONTROLS=1) -DHID_CONTROLS=1)
set(APP_COMPILER_FLAGS_f3_f4_fps_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 set(APP_COMPILER_FLAGS_f3_f4_fps_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2
-DI2S_CHANS_ADC=2 -DI2S_CHANS_ADC=2
-DMIN_FREQ=48000 -DMIN_FREQ=48000
-DMAX_FREQ=48000 -DMAX_FREQ=48000
-DUSE_EX3D=1 -DUSE_EX3D=1
-DF3_F4_FPS_UAC2=1 -DF3_F4_FPS_UAC2=1
-DMIXER=0 -DMIXER=0
@@ -150,10 +150,10 @@ set(APP_COMPILER_FLAGS_f3_f4_fps_uac2 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2
-DIR_SWITCHING_MODE -DIR_SWITCHING_MODE
-DHID_CONTROLS=1) -DHID_CONTROLS=1)
set(APP_COMPILER_FLAGS_f5_music_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 set(APP_COMPILER_FLAGS_f5_music_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2
-DI2S_CHANS_ADC=2 -DI2S_CHANS_ADC=2
-DMIN_FREQ=48000 -DMIN_FREQ=48000
-DMAX_FREQ=48000 -DMAX_FREQ=48000
-DUAC1_MODE=1 -DUAC1_MODE=1
-DF5_MUSIC_UAC1=1 -DF5_MUSIC_UAC1=1
-DUSE_EX3D -DUSE_EX3D
@@ -174,11 +174,11 @@ set(APP_COMPILER_FLAGS_f5_music_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC
-DIR_SWITCHING_MODE -DIR_SWITCHING_MODE
-DHID_CONTROLS=1) -DHID_CONTROLS=1)
set(APP_COMPILER_FLAGS_f6_f7_fps_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 set(APP_COMPILER_FLAGS_f6_f7_fps_uac1 ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2
-DI2S_CHANS_ADC=2 -DI2S_CHANS_ADC=2
-DAUDIO_CLASS=1 -DAUDIO_CLASS=1
-DMIN_FREQ=48000 -DMIN_FREQ=48000
-DMAX_FREQ=48000 -DMAX_FREQ=48000
-DUAC1_MODE=1 -DUAC1_MODE=1
-DUSE_EX3D=1 -DUSE_EX3D=1
-DF6_F7_FPS_UAC1=1 -DF6_F7_FPS_UAC1=1

26
sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/audiohw.xc
View File

@@ -697,10 +697,11 @@ void button_task(chanend c_hidSendData, chanend cc_mic_level, chanend c_uac_vol)
if (button_music_mode == 0) { if (button_music_mode == 0) {
if (push_button_music_mode_state_old == 1) { if (push_button_music_mode_state_old == 1) {
#if USE_EX3D == 1 #if (F3_F4_FPS_UAC2 == 1)
// FPS firmware: switching to music needs different USB config // FPS firmware: switching to music needs different USB config
active_mode = 1; active_mode = 1;
need_reboot = 1; need_reboot = 1;
SetRoleSwitchFlag(MODE_F1_MUSIC_UAC2);
#else #else
// Music-only firmware: toggle music LED locally // Music-only firmware: toggle music LED locally
active_mode = (active_mode == 1) ? 0 : 1; active_mode = (active_mode == 1) ? 0 : 1;
@@ -712,14 +713,16 @@ void button_task(chanend c_hidSendData, chanend cc_mic_level, chanend c_uac_vol)
if (button_ai71_onoff == 0) { if (button_ai71_onoff == 0) {
if (push_button_ai71_onoff_state_old == 1) { if (push_button_ai71_onoff_state_old == 1) {
#if USE_EX3D == 1 #if (F1_MUSIC_UAC2 == 1)
// FPS firmware: switch algorithm locally (toggle off or activate)
active_mode = (active_mode == 3) ? 0 : 3;
mode_btn_change = 1;
#else
// Music-only firmware: AI7.1 needs FPS firmware // Music-only firmware: AI7.1 needs FPS firmware
active_mode = 3; active_mode = 3;
need_reboot = 1; need_reboot = 1;
SetRoleSwitchFlag(MODE_F3_F4_FPS_UAC2);
#else
// FPS firmware: switch algorithm locally (toggle off or activate)
active_mode = (active_mode == 3) ? 0 : 3;
mode_btn_change = 1;
#endif #endif
} }
} }
@@ -727,14 +730,15 @@ void button_task(chanend c_hidSendData, chanend cc_mic_level, chanend c_uac_vol)
if (button_game_mode == 0) { if (button_game_mode == 0) {
if (push_button_game_mode_state_old == 1) { if (push_button_game_mode_state_old == 1) {
#if USE_EX3D == 1 #if F1_MUSIC_UAC2 == 1
// FPS firmware: switch algorithm locally (toggle off or activate)
active_mode = (active_mode == 2) ? 0 : 2;
mode_btn_change = 1;
#else
// Music-only firmware: game needs FPS firmware // Music-only firmware: game needs FPS firmware
active_mode = 2; active_mode = 2;
need_reboot = 1; need_reboot = 1;
SetRoleSwitchFlag(MODE_F3_F4_FPS_UAC2);
#else
// FPS firmware: switch algorithm locally (toggle off or activate)
active_mode = (active_mode == 2) ? 0 : 2;
mode_btn_change = 1;
#endif #endif
} }
} }

2
sw_usb_audio/app_usb_aud_phaten_golden_6ch/src/extensions/dsp_core0.xc
View File

@@ -53,7 +53,7 @@ void dsp_core0(void)
// EQ Flash存储初始化标志 // EQ Flash存储初始化标志
delay_milliseconds(100); delay_milliseconds(300);
unsigned windows_detect_done; unsigned windows_detect_done;
GET_SHARED_GLOBAL(windows_detect_done, g_windows_detect_done); GET_SHARED_GLOBAL(windows_detect_done, g_windows_detect_done);
while (windows_detect_done == 0) { while (windows_detect_done == 0) {