From ebe8f1249e04795da8720091c8141ec4518960e5 Mon Sep 17 00:00:00 2001 From: Dan-guanghua Date: Wed, 17 Dec 2025 11:56:02 +0800 Subject: [PATCH] simple version --- .../app_usb_aud_phaten_golden/CMakeLists.txt | 2 +- .../src/core/xua_conf.h | 4 ++++ .../src/extensions/dsp.c | 16 ++++++++-------- sw_usb_audio/shared/version.h | 6 +++++- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/sw_usb_audio/app_usb_aud_phaten_golden/CMakeLists.txt b/sw_usb_audio/app_usb_aud_phaten_golden/CMakeLists.txt index 72299d8..3237304 100644 --- a/sw_usb_audio/app_usb_aud_phaten_golden/CMakeLists.txt +++ b/sw_usb_audio/app_usb_aud_phaten_golden/CMakeLists.txt @@ -54,7 +54,7 @@ set(SW_USB_AUDIO_FLAGS ${EXTRA_BUILD_FLAGS} -O3 LINK_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/../../lib_dnr/lib_dnr) set(APP_COMPILER_FLAGS_ex3d_stereo_2k ${SW_USB_AUDIO_FLAGS} -DI2S_CHANS_DAC=2 -DI2S_CHANS_ADC=2 - -DAUDIO_CLASS=1 + #-DAUDIO_CLASS=1 -DMIN_FREQ=48000 -DMAX_FREQ=48000 -DUSE_EX3D diff --git a/sw_usb_audio/app_usb_aud_phaten_golden/src/core/xua_conf.h b/sw_usb_audio/app_usb_aud_phaten_golden/src/core/xua_conf.h index b280001..2fb85fe 100644 --- a/sw_usb_audio/app_usb_aud_phaten_golden/src/core/xua_conf.h +++ b/sw_usb_audio/app_usb_aud_phaten_golden/src/core/xua_conf.h @@ -133,8 +133,12 @@ /*** Defines relating to USB descriptor strings and ID's ***/ #define VENDOR_ID (0x20B1) /* XMOS Vendor ID*/ #ifndef PID_AUDIO_2 +#if defined (STEREO_2K) +#define PID_AUDIO_2 (0x0017) +#else #define PID_AUDIO_2 (0x0016) #endif +#endif #ifndef PID_AUDIO_1 #define PID_AUDIO_1 (0x0017) #endif diff --git a/sw_usb_audio/app_usb_aud_phaten_golden/src/extensions/dsp.c b/sw_usb_audio/app_usb_aud_phaten_golden/src/extensions/dsp.c index 3578744..77d1536 100644 --- a/sw_usb_audio/app_usb_aud_phaten_golden/src/extensions/dsp.c +++ b/sw_usb_audio/app_usb_aud_phaten_golden/src/extensions/dsp.c @@ -107,7 +107,7 @@ void UserBufferManagementInit(unsigned sampFreq) float fLevel[NUM_USB_CHAN_OUT] = {0,}; enum {UBM_A3D_OFF=0, UBM_A3D_VON=1, UBM_A3D_ON=2}; extern void buffer_exchange(chanend_t c_data, unsigned sampsFromUsbToAudio[]); - +extern unsigned int is_eq_disabled(void); void UserBufferManagement(unsigned sampsFromUsbToAudio[], unsigned sampsFromAudioToUsb[]) { uint32_t is_3d; @@ -202,7 +202,9 @@ void UserBufferManagement(unsigned sampsFromUsbToAudio[], unsigned sampsFromAudi #endif } #if EQ_EN + if (!is_eq_disabled()) { buffer_exchange(uc_eq_data, sampsFromUsbToAudio); + } #endif sampsFromAudioToUsb[0] = sampsFromUsbToAudio[0]; sampsFromAudioToUsb[1] = sampsFromUsbToAudio[1]; @@ -764,16 +766,14 @@ void hid_button_task(chanend_t cc_mic_level, chanend_t c_hidRcvData, chanend_t c printf("3d off\n"); } else { if (is_3d_on == A3D_OFF) { - is_3d_on = A3D_VON; - //ver2 - leds2_val |= (1<