simple version
This commit is contained in:
@@ -54,7 +54,7 @@ set(SW_USB_AUDIO_FLAGS ${EXTRA_BUILD_FLAGS} -O3
|
|||||||
LINK_DIRECTORIES(${CMAKE_CURRENT_LIST_DIR}/../../lib_dnr/lib_dnr)
|
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
|
set(APP_COMPILER_FLAGS_ex3d_stereo_2k ${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
|
||||||
-DUSE_EX3D
|
-DUSE_EX3D
|
||||||
|
|||||||
@@ -133,8 +133,12 @@
|
|||||||
/*** Defines relating to USB descriptor strings and ID's ***/
|
/*** Defines relating to USB descriptor strings and ID's ***/
|
||||||
#define VENDOR_ID (0x20B1) /* XMOS Vendor ID*/
|
#define VENDOR_ID (0x20B1) /* XMOS Vendor ID*/
|
||||||
#ifndef PID_AUDIO_2
|
#ifndef PID_AUDIO_2
|
||||||
|
#if defined (STEREO_2K)
|
||||||
|
#define PID_AUDIO_2 (0x0017)
|
||||||
|
#else
|
||||||
#define PID_AUDIO_2 (0x0016)
|
#define PID_AUDIO_2 (0x0016)
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
#ifndef PID_AUDIO_1
|
#ifndef PID_AUDIO_1
|
||||||
#define PID_AUDIO_1 (0x0017)
|
#define PID_AUDIO_1 (0x0017)
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ void UserBufferManagementInit(unsigned sampFreq)
|
|||||||
float fLevel[NUM_USB_CHAN_OUT] = {0,};
|
float fLevel[NUM_USB_CHAN_OUT] = {0,};
|
||||||
enum {UBM_A3D_OFF=0, UBM_A3D_VON=1, UBM_A3D_ON=2};
|
enum {UBM_A3D_OFF=0, UBM_A3D_VON=1, UBM_A3D_ON=2};
|
||||||
extern void buffer_exchange(chanend_t c_data, unsigned sampsFromUsbToAudio[]);
|
extern void buffer_exchange(chanend_t c_data, unsigned sampsFromUsbToAudio[]);
|
||||||
|
extern unsigned int is_eq_disabled(void);
|
||||||
void UserBufferManagement(unsigned sampsFromUsbToAudio[], unsigned sampsFromAudioToUsb[])
|
void UserBufferManagement(unsigned sampsFromUsbToAudio[], unsigned sampsFromAudioToUsb[])
|
||||||
{
|
{
|
||||||
uint32_t is_3d;
|
uint32_t is_3d;
|
||||||
@@ -202,7 +202,9 @@ void UserBufferManagement(unsigned sampsFromUsbToAudio[], unsigned sampsFromAudi
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#if EQ_EN
|
#if EQ_EN
|
||||||
|
if (!is_eq_disabled()) {
|
||||||
buffer_exchange(uc_eq_data, sampsFromUsbToAudio);
|
buffer_exchange(uc_eq_data, sampsFromUsbToAudio);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
sampsFromAudioToUsb[0] = sampsFromUsbToAudio[0];
|
sampsFromAudioToUsb[0] = sampsFromUsbToAudio[0];
|
||||||
sampsFromAudioToUsb[1] = sampsFromUsbToAudio[1];
|
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");
|
printf("3d off\n");
|
||||||
} else {
|
} else {
|
||||||
if (is_3d_on == A3D_OFF) {
|
if (is_3d_on == A3D_OFF) {
|
||||||
is_3d_on = A3D_VON;
|
|
||||||
//ver2
|
|
||||||
leds2_val |= (1<<LED_3D_PIN); // Blue LED off
|
|
||||||
leds1_val &= (~1); // Red LED on
|
|
||||||
audio_ex3d_onoff(1);
|
|
||||||
printf("3d FPS on\n");
|
|
||||||
} else {
|
|
||||||
is_3d_on = A3D_ON;
|
is_3d_on = A3D_ON;
|
||||||
|
#if defined (STEREO_2K)
|
||||||
|
leds1_val &= (~1); // Red LED on
|
||||||
|
leds2_val |= (1<<LED_3D_PIN); // Blue LED off
|
||||||
|
#else
|
||||||
leds2_val &= (~(1<<LED_3D_PIN)); // Blue LED on
|
leds2_val &= (~(1<<LED_3D_PIN)); // Blue LED on
|
||||||
leds1_val |= 1; // Red LED off
|
leds1_val |= 1; // Red LED off
|
||||||
|
#endif
|
||||||
audio_ex3d_onoff(1);
|
audio_ex3d_onoff(1);
|
||||||
printf("3d on\n");
|
printf("3d on\n");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,11 @@
|
|||||||
#define BCD_DEVICE_M (1)
|
#define BCD_DEVICE_M (1)
|
||||||
#endif
|
#endif
|
||||||
#ifndef BCD_DEVICE_N
|
#ifndef BCD_DEVICE_N
|
||||||
#define BCD_DEVICE_N (0)
|
#if defined (STEREO_2K)
|
||||||
|
#define BCD_DEVICE_N (1)
|
||||||
|
#else
|
||||||
|
#define BCD_DEVICE_N (2)
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
Reference in New Issue
Block a user