diff options
Diffstat (limited to 'Demos/Device/ClassDriver/AudioInput')
4 files changed, 9 insertions, 7 deletions
diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.c b/Demos/Device/ClassDriver/AudioInput/AudioInput.c index 867a09eef4..953ecf8b68 100644 --- a/Demos/Device/ClassDriver/AudioInput/AudioInput.c +++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.c @@ -94,7 +94,7 @@ void SetupHardware(void) USB_Init(); /* Start the ADC conversion in free running mode */ - ADC_StartReading(ADC_REFERENCE_AVCC | ADC_RIGHT_ADJUSTED | MIC_IN_ADC_MUX_MASK); + ADC_StartReading(ADC_REFERENCE_AVCC | ADC_RIGHT_ADJUSTED | ADC_GET_CHANNEL_MASK(MIC_IN_ADC_CHANNEL)); } /** ISR to handle the reloading of the data endpoint with the next sample. */ diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.h b/Demos/Device/ClassDriver/AudioInput/AudioInput.h index 6bf5e882a3..fb5e69c8bc 100644 --- a/Demos/Device/ClassDriver/AudioInput/AudioInput.h +++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.h @@ -49,14 +49,9 @@ #include <LUFA/Drivers/USB/USB.h> #include "Descriptors.h" + #include "Config/AppConfig.h" /* Macros: */ - /** ADC channel number for the microphone input. */ - #define MIC_IN_ADC_CHANNEL 2 - - /** ADC channel MUX mask for the microphone input. */ - #define MIC_IN_ADC_MUX_MASK ADC_CHANNEL2 - /** Maximum audio sample value for the microphone input. */ #define SAMPLE_MAX_RANGE 0xFFFF diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.txt b/Demos/Device/ClassDriver/AudioInput/AudioInput.txt index 17b476e24a..654536c80b 100644 --- a/Demos/Device/ClassDriver/AudioInput/AudioInput.txt +++ b/Demos/Device/ClassDriver/AudioInput/AudioInput.txt @@ -72,6 +72,11 @@ * <td><b>Description:</b></td> * </tr> * <tr> + * <td>MIC_IN_ADC_CHANNEL</td> + * <td>AppConfig.h</td> + * <td>Sets the ADC channel used by the demo for the input audio samples from an attached microphone.</td> + * </tr> + * <tr> * <td>USE_TEST_TONE</td> * <td>AppConfig.h</td> * <td>When defined, this alters the demo to produce a square wave test tone when the first board button is pressed diff --git a/Demos/Device/ClassDriver/AudioInput/Config/AppConfig.h b/Demos/Device/ClassDriver/AudioInput/Config/AppConfig.h index 01101649a8..7702e259a7 100644 --- a/Demos/Device/ClassDriver/AudioInput/Config/AppConfig.h +++ b/Demos/Device/ClassDriver/AudioInput/Config/AppConfig.h @@ -43,6 +43,8 @@ #ifndef _APP_CONFIG_H_ #define _APP_CONFIG_H_ + #define MIC_IN_ADC_CHANNEL 2 + #define MICROPHONE_BIASED_TO_HALF_RAIL #define USE_TEST_TONE |