stable -> master (conficted)

This commit is contained in:
Ross Owen
2016-07-15 10:21:13 +01:00
23 changed files with 552 additions and 284 deletions

View File

@@ -215,6 +215,16 @@
#define NUM_PDM_MICS (0)
#endif
/**
* @brief PDM Microphone first channel index, defines which channels microphones will be input on.
* Note, indexed from 0.
*
* Default: 0 (i.e. channels [0:NUM_PDM_MICS-1])
* */
#ifndef PDM_MIC_INDEX
#define PDM_MIC_INDEX (0)
#endif
/**
* @brief Enable MIDI functionality including buffering, descriptors etc. Default: DISABLED
*/
@@ -230,14 +240,14 @@
* @brief MIDI Rx port width (1 or 4bit). Default: 1
*/
#ifndef MIDI_RX_PORT_WIDTH
#define MIDI_RX_PORT_WIDTH (1)
#define MIDI_RX_PORT_WIDTH (1)
#endif
/**
* @brief Enables SPDIF Tx. Default: 0 (Disabled)
*/
#ifndef SPDIF_TX
#define SPDIF_TX (0)
#define SPDIF_TX (0)
#endif
/* Tidy up old SPDIF usage */
@@ -465,7 +475,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 16
#define BCD_DEVICE_M 19
#endif
/**