Combined Mouse, MouseViaInt and MouseFullInt demos into a single unified demo.

Corrections to Keyboard demo.

Removed AVRISP_Programmer project due to code quality concerns.

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 */

Demos/AudioOutput/AudioOutput.txt

@@ -5,23 +5,10 @@
  */
  
 /** \mainpage Audio Output Device Demo
- *  
- *  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
- *  required).
- *  
- *  On startup the system will automatically enumerate and function
- *  as a USB speaker. Incomming audio will output in 8-bit PWM onto
- *  the timer output (timer 3 for the AT90USBXXX6/7 USB AVRs, timer 1 for
- *  the AT90USBXXX2 controller AVRs) compare channel A for AUDIO_OUT_MONO
- *  mode, on channels A and B for AUDIO_OUT_STEREO and on the board LEDs
- *  for AUDIO_OUT_LEDS mode. Decouple audio outputs with a capacitor and
- *  attach to a speaker to hear the audio.
- *  
- *  Under Windows, if a driver request dialogue pops up, select the option
- *  to automatically install the appropriate drivers.
- *  
+ *
+ *  \section SSec_Info USB Information:
+ *
+ *  The following table gives a rundown of the USB utilization of this demo.
  *
  *  <table>
  *   <tr>
@@ -47,4 +34,55 @@
  *    <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
+ *  required).
+ *  
+ *  On startup the system will automatically enumerate and function
+ *  as a USB speaker. Incomming audio will output in 8-bit PWM onto
+ *  the timer output (timer 3 for the AT90USBXXX6/7 USB AVRs, timer 1 for
+ *  the AT90USBXXX2 controller AVRs) compare channel A for AUDIO_OUT_MONO
+ *  mode, on channels A and B for AUDIO_OUT_STEREO and on the board LEDs
+ *  for AUDIO_OUT_LEDS mode. Decouple audio outputs with a capacitor and
+ *  attach to a speaker to hear the audio.
+ *  
+ *  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>Define Name:</b></td>
+ *    <td><b>Location:</b></td>
+ *    <td><b>Description:</b></td>
+ *   </tr>
+ *   <tr>
+ *    <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>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>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>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>
  */

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)