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

Merge branch 'master' into DEV_IMP_FB

Browse Source
This commit is contained in:
Ross Owen
2015-01-09 17:19:51 +00:00
parent 8d2b65127e f5a822d42d
commit 465b0fe7d3
12 changed files with 1206 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
module_usb_audio/devicedefines.h
View File

@@ -76,8 +76,13 @@
#error I2S_CHANS_DAC not defined
#define I2S_CHANS_DAC 2 /* Define anyway for doxygen */
#else
#ifdef I2S_MODE_TDM
#define I2S_WIRES_DAC (I2S_CHANS_DAC >> 3)
#else
#define I2S_WIRES_DAC (I2S_CHANS_DAC >> 1)
#endif
#endif
/**
* @brief Number of I2S channels from ADC/CODEC. Must be a multiple of 2.
@@ -88,8 +93,27 @@
#error I2S_CHANS_ADC not defined
#define I2S_CHANS_ADC 2 /* Define anyway for doxygen */
#else
#ifdef I2S_MODE_TDM
#define I2S_WIRES_ADC (I2S_CHANS_ADC >> 3)
#else
#define I2S_WIRES_ADC (I2S_CHANS_ADC >> 1)
#endif
#endif
/**
* @brief Channels per I2S frame. *
*
* Default: 2 i.e standard stereo I2S (8 if using TDM i.e. I2S_MODE_TDM).
*
**/
#ifndef I2S_CHANS_PER_FRAME
#ifdef I2S_MODE_TDM
#define I2S_CHANS_PER_FRAME 8
#else
#define I2S_CHANS_PER_FRAME 2
#endif
#endif
/**
* @brief Max supported sample frequency for device (Hz). Default: 192000
@@ -406,7 +430,7 @@
* @brief Device firmware version number in Binary Coded Decimal format: 0xJJMN where JJ: major, M: minor, N: sub-minor version number.
*/
#ifndef BCD_DEVICE_M
#define BCD_DEVICE_M 10
#define BCD_DEVICE_M 11
#endif
/**
@@ -975,7 +999,7 @@
#else
#if defined(MIXER)
// Enabled by default
#define OUT_VOLUME_IN_MIXER
//#define OUT_VOLUME_IN_MIXER
#endif
#endif
@@ -995,7 +1019,7 @@
#else
#if defined(MIXER)
/* Enabled by default */
#define IN_VOLUME_IN_MIXER
//#define IN_VOLUME_IN_MIXER
#endif
#endif