3 files changed, 54 insertions, 23 deletions
diff --git a/Demos/AudioOutput/AudioOutput.c b/Demos/AudioOutput/AudioOutput.c
index 87afd3606..0f390f001 100644
--- a/Demos/AudioOutput/AudioOutput.c
+++ b/Demos/AudioOutput/AudioOutput.c
@@ -34,13 +34,6 @@
  *  is responsible for the initial application hardware configuration.
  */
  
-/* ---   Project Configuration (Choose ONE)   --- */
-//#define AUDIO_OUT_MONO
-#define AUDIO_OUT_STEREO
-//#define AUDIO_OUT_LEDS
-//#define AUDIO_OUT_PORTC
-/* --- --- --- --- --- --- --- ---  ---  ---  --- */
-
 #include "AudioOutput.h"
 
 /* Project Tags, for reading out using the ButtLoad project */
diff --git a/Demos/AudioOutput/AudioOutput.txt b/Demos/AudioOutput/AudioOutput.txt
index ce7d4ed94..0638c47f9 100644
--- a/Demos/AudioOutput/AudioOutput.txt
+++ b/Demos/AudioOutput/AudioOutput.txt
@@ -5,7 +5,38 @@
  */
  
 /** \mainpage Audio Output Device Demo
- *  
+ *
+ *  \section SSec_Info USB Information:
+ *
+ *  The following table gives a rundown of the USB utilization of this demo.
+ *
+ *  <table>
+ *   <tr>
+ *    <td><b>USB Mode:</b></td>
+ *    <td>Device</td>
+ *   </tr>
+ *   <tr>
+ *    <td><b>USB Class:</b></td>
+ *    <td>Audio Class</td>
+ *   </tr>
+ *   <tr> 
+ *    <td><b>USB Subclass:</b></td>
+ *    <td>Standard Audio Device</td>
+ *   </tr>
+ *   <tr>
+ *    <td><b>Relevant Standards:</b></td>
+ *    <td>USBIF Audio Class Specification</td>
+ *    <td>USBIF Audio Class Terminal Types Specification</td>
+ *    <td>USBIF Audio Data Formats Specification</td>
+ *   </tr>
+ *   <tr>
+ *    <td><b>Usable Speeds:</b></td>
+ *    <td>Full Speed Mode</td>
+ *   </tr>
+ *  </table>
+ *
+ *  \section SSec_Description Project Description: 
+ *
  *  Audio demonstration application. This gives a simple reference
  *  application for implementing a USB Audio Output device using the
  *  basic USB Audio drivers in all modern OSes (i.e. no special drivers
@@ -21,30 +52,37 @@
  *  
  *  Under Windows, if a driver request dialogue pops up, select the option
  *  to automatically install the appropriate drivers.
- *  
+ *
+ *  \section SSec_Options Project Options
+ *
+ *  The following defines can be found in this demo, which can control the demo behaviour when defined, or changed in value.
  *
  *  <table>
  *   <tr>
- *    <td><b>USB Mode:</b></td>
- *    <td>Device</td>
+ *    <td><b>Define Name:</b></td>
+ *    <td><b>Location:</b></td>
+ *    <td><b>Description:</b></td>
  *   </tr>
  *   <tr>
- *    <td><b>USB Class:</b></td>
- *    <td>Audio Class</td>
+ *    <td>AUDIO_OUT_STEREO</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>When defined, this outputs the audio samples in stereo to the timer output pins of the microcontroller.</td>
  *   </tr>
- *   <tr> 
- *    <td><b>USB Subclass:</b></td>
- *    <td>Standard Audio Device</td>
+ *   <tr>
+ *    <td>AUDIO_OUT_MONO</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>When defined, this outputs the audio samples in mono to the timer output pin of the microcontroller.</td>
  *   </tr>
  *   <tr>
- *    <td><b>Relevant Standards:</b></td>
- *    <td>USBIF Audio Class Specification</td>
- *    <td>USBIF Audio Class Terminal Types Specification</td>
- *    <td>USBIF Audio Data Formats Specification</td>
+ *    <td>AUDIO_OUT_LEDS</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>When defined, this outputs the audio samples in stereo to the board LEDs.</td>
  *   </tr>
  *   <tr>
- *    <td><b>Usable Speeds:</b></td>
- *    <td>Full Speed Mode</td>
+ *    <td>AUDIO_OUT_PORTC</td>
+ *    <td>Makefile CDEFS</td>
+ *    <td>When defined, this outputs the audio samples in mono to port C of the microcontroller, for connection to an
+ *        external DAC.</td>
  *   </tr>
  *  </table>
  */
 \ No newline at end of file
diff --git a/Demos/AudioOutput/makefile b/Demos/AudioOutput/makefile
index 3584d55f9..af99358f5 100644
--- a/Demos/AudioOutput/makefile
+++ b/Demos/AudioOutput/makefile
@@ -176,7 +176,7 @@ CSTANDARD = -std=gnu99
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
 CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY
 CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
-
+CDEFS += -DAUDIO_OUT_STEREO
 
 # Place -D or -U options here for ASM sources
 ADEFS = -DF_CPU=$(F_CPU)