AppConfigHeaders: Move out the last of the demo/app configurations into new AppConfig.h header files.

2012-05-13 21:01:23 +00:00
parent ae6a514929
commit e9e6730d49
57 changed files with 664 additions and 162 deletions
@@ -77,7 +77,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));
 }

 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs, and
@@ -52,12 +52,6 @@
 		#include <LUFA/Drivers/Peripheral/ADC.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

@@ -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