laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Removed 32kHz support when PDM mics enabled (lib_mic_array supports integer decimation factors only)

Browse Source
This commit is contained in:
Ross Owen
2015-12-08 15:17:25 +00:00
parent 47e5629acd
commit 2ae99f11e6
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module_usb_audio/endpoint0/audiorequests.xc
View File

@@ -874,7 +874,11 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
} }
#endif #endif
/* Special case for some low sample rates */ /* Special case for some low sample rates */
unsigned lowSampleRateList[] = {8000, 11025, 12000, 16000, 32000}; unsigned lowSampleRateList[] = {8000, 11025, 12000, 16000,
#if (NUM_PDM_MICS == 0)
32000
#endif
};
for (int k = 0; k < sizeof(lowSampleRateList)/sizeof(unsigned); k++) for (int k = 0; k < sizeof(lowSampleRateList)/sizeof(unsigned); k++)
{ {

6
module_usb_audio/endpoint0/descriptors.h
View File

@@ -2227,9 +2227,11 @@ const unsigned num_freqs_a1 = MAX(3, (0
#if(MIN_FREQ <= 16000) && (MAX_FREQ_FS >= 16000) #if(MIN_FREQ <= 16000) && (MAX_FREQ_FS >= 16000)
+1 +1
#endif #endif
#if (NUM_PDM_MICS == 0)
#if(MIN_FREQ <= 32000) && (MAX_FREQ_FS >= 32000) #if(MIN_FREQ <= 32000) && (MAX_FREQ_FS >= 32000)
+1 +1
#endif #endif
#endif
#if (MIN_FREQ <= 44100) && (MAX_FREQ_FS >= 44100) #if (MIN_FREQ <= 44100) && (MAX_FREQ_FS >= 44100)
+1 +1
#endif #endif
@@ -2455,9 +2457,11 @@ unsigned char cfgDesc_Audio1[] =
CHARIFY_SR(16000), /* sampleFreq - 16KHz */ CHARIFY_SR(16000), /* sampleFreq - 16KHz */
#endif #endif
#if (NUM_PDM_MICS == 0)
#if(MIN_FREQ <= 32000) && (MAX_FREQ_FS >= 32000) #if(MIN_FREQ <= 32000) && (MAX_FREQ_FS >= 32000)
CHARIFY_SR(32000), /* sampleFreq - 32KHz */ CHARIFY_SR(32000), /* sampleFreq - 32KHz */
#endif #endif
#endif
#if (MIN_FREQ <= 44100) && (MAX_FREQ_FS >= 44100) #if (MIN_FREQ <= 44100) && (MAX_FREQ_FS >= 44100)
0x44, 0xAC, 0x00, /* sampleFreq - 44.1Khz */ 0x44, 0xAC, 0x00, /* sampleFreq - 44.1Khz */
@@ -2583,9 +2587,11 @@ unsigned char cfgDesc_Audio1[] =
CHARIFY_SR(16000), /* sampleFreq - 32KHz */ CHARIFY_SR(16000), /* sampleFreq - 32KHz */
#endif #endif
#if (NUM_PDM_MICS == 0)
#if(MIN_FREQ <= 32000) && (MAX_FREQ_FS >= 32000) #if(MIN_FREQ <= 32000) && (MAX_FREQ_FS >= 32000)
CHARIFY_SR(32000), /* sampleFreq - 32KHz */ CHARIFY_SR(32000), /* sampleFreq - 32KHz */
#endif #endif
#endif
#if (MIN_FREQ <= 44100) && (MAX_FREQ_FS >= 44100) #if (MIN_FREQ <= 44100) && (MAX_FREQ_FS >= 44100)
0x44, 0xAC, 0x00, /* sampleFreq - 44.1Khz */ 0x44, 0xAC, 0x00, /* sampleFreq - 44.1Khz */