Make both LowLevel and ClassDriver AudioOutput demos always output to board LEDs...

diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
index 2caf6fa..9a8804a 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
@@ -103,10 +103,11 @@ void ProcessNextSample(void)
                int8_t  LeftSample_8Bit   = (LeftSample_16Bit  >> 8);\r
                int8_t  RightSample_8Bit  = (RightSample_16Bit >> 8);\r
 \r
                int8_t  LeftSample_8Bit   = (LeftSample_16Bit  >> 8);\r
                int8_t  RightSample_8Bit  = (RightSample_16Bit >> 8);\r
 \r

-#if !defined(AUDIO_OUT_STEREO)\r

                /* Mix the two channels together to produce a mono, 8-bit sample */\r
                int8_t  MixedSample_8Bit  = (((int16_t)LeftSample_8Bit + (int16_t)RightSample_8Bit) >> 1);\r
                /* Mix the two channels together to produce a mono, 8-bit sample */\r
                int8_t  MixedSample_8Bit  = (((int16_t)LeftSample_8Bit + (int16_t)RightSample_8Bit) >> 1);\r

-#endif\r
+\r
+               /* Get absolute value of mixed sample value */\r
+               uint8_t MixedSample_8Bit_Abs = abs(MixedSample_8Bit);\r

 \r
 #if defined(AUDIO_OUT_MONO)\r
                /* Load the sample into the PWM timer channel */\r
 \r
 #if defined(AUDIO_OUT_MONO)\r
                /* Load the sample into the PWM timer channel */\r


@@ -118,26 +119,23 @@ void ProcessNextSample(void)
 #elif defined(AUDIO_OUT_PORTC)\r
                /* Load the 8-bit mixed sample into PORTC */\r
                PORTC = MixedSample_8Bit;\r
 #elif defined(AUDIO_OUT_PORTC)\r
                /* Load the 8-bit mixed sample into PORTC */\r
                PORTC = MixedSample_8Bit;\r

-#else\r
-               uint8_t LEDMask = LEDS_NO_LEDS;\r
+#endif\r

 \r
 \r

-               /* Make mixed sample value positive (absolute) */\r
-               MixedSample_8Bit = abs(MixedSample_8Bit);\r
+               uint8_t LEDMask = LEDS_NO_LEDS;\r

 \r
 \r

-               if (MixedSample_8Bit > 2)\r
+               if (MixedSample_8Bit_Abs > 2)\r

                  LEDMask |= LEDS_LED1;\r
                  \r
                  LEDMask |= LEDS_LED1;\r
                  \r

-               if (MixedSample_8Bit > 4)\r
+               if (MixedSample_8Bit_Abs > 4)\r

                  LEDMask |= LEDS_LED2;\r
                  \r
                  LEDMask |= LEDS_LED2;\r
                  \r

-               if (MixedSample_8Bit > 8)\r
+               if (MixedSample_8Bit_Abs > 8)\r

                  LEDMask |= LEDS_LED3;\r
 \r
                  LEDMask |= LEDS_LED3;\r
 \r

-               if (MixedSample_8Bit > 16)\r
+               if (MixedSample_8Bit_Abs > 16)\r

                  LEDMask |= LEDS_LED4;\r
 \r
                LEDs_SetAllLEDs(LEDMask);\r
                  LEDMask |= LEDS_LED4;\r
 \r
                LEDs_SetAllLEDs(LEDMask);\r

-#endif\r

        }\r
 }\r
 \r
        }\r
 }\r
 \r

diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
index ffae9ed..96d241c 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
@@ -53,11 +53,11 @@
  *  required).\r
  *  \r
  *  On start-up the system will automatically enumerate and function\r
  *  required).\r
  *  \r
  *  On start-up the system will automatically enumerate and function\r

- *  as a USB speaker. Incoming audio will output in 8-bit PWM onto\r
- *  the timer output (timer 3 for the AT90USBXXX6/7 USB AVRs, timer 1 for\r
- *  the AT90USBXXX2 controller AVRs) compare channel A for AUDIO_OUT_MONO\r
- *  mode, on channels A and B for AUDIO_OUT_STEREO and on the board LEDs\r
- *  for AUDIO_OUT_LEDS mode. Decouple audio outputs with a capacitor and\r
+ *  as a USB speaker. Outgoing audio will output in 8-bit PWM onto\r
+ *  the timer 3 output compare channel A for AUDIO_OUT_MONO mode, on\r
+ *  timer 3 channels A and B for AUDIO_OUT_STEREO and on PORTC as a signed\r
+ *  mono sample for AUDIO_OUT_PORTC. Audio output will also be indicated on\r
+ *  the board LEDs in all modes. Decouple audio outputs with a capacitor and\r

  *  attach to a speaker to hear the audio.\r
  *  \r
  *  Under Windows, if a driver request dialogue pops up, select the option\r
  *  attach to a speaker to hear the audio.\r
  *  \r
  *  Under Windows, if a driver request dialogue pops up, select the option\r


@@ -84,11 +84,6 @@
  *    <td>When defined, this outputs the audio samples in mono to the timer output pin of the microcontroller.</td>\r
  *   </tr>\r
  *   <tr>\r
  *    <td>When defined, this outputs the audio samples in mono to the timer output pin of the microcontroller.</td>\r
  *   </tr>\r
  *   <tr>\r

- *    <td>AUDIO_OUT_LEDS</td>\r
- *    <td>Makefile CDEFS</td>\r
- *    <td>When defined, this outputs the audio samples in stereo to the board LEDs.</td>\r
- *   </tr>\r
- *   <tr>\r

  *    <td>AUDIO_OUT_PORTC</td>\r
  *    <td>Makefile CDEFS</td>\r
  *    <td>When defined, this outputs the audio samples in mono to port C of the microcontroller, for connection to an\r
  *    <td>AUDIO_OUT_PORTC</td>\r
  *    <td>Makefile CDEFS</td>\r
  *    <td>When defined, this outputs the audio samples in mono to port C of the microcontroller, for connection to an\r

diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
index 352d074..7dde84b 100644 (file)
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
@@ -210,10 +210,11 @@ void USB_Audio_Task(void)
                int8_t  LeftSample_8Bit   = (LeftSample_16Bit  >> 8);\r
                int8_t  RightSample_8Bit  = (RightSample_16Bit >> 8);\r
                        \r
                int8_t  LeftSample_8Bit   = (LeftSample_16Bit  >> 8);\r
                int8_t  RightSample_8Bit  = (RightSample_16Bit >> 8);\r
                        \r

-#if !defined(AUDIO_OUT_STEREO)\r

                /* Mix the two channels together to produce a mono, 8-bit sample */\r
                int8_t  MixedSample_8Bit  = (((int16_t)LeftSample_8Bit + (int16_t)RightSample_8Bit) >> 1);\r
                /* Mix the two channels together to produce a mono, 8-bit sample */\r
                int8_t  MixedSample_8Bit  = (((int16_t)LeftSample_8Bit + (int16_t)RightSample_8Bit) >> 1);\r

-#endif\r
+\r
+               /* Get absolute value of mixed sample value */\r
+               uint8_t MixedSample_8Bit_Abs = abs(MixedSample_8Bit);\r

 \r
 #if defined(AUDIO_OUT_MONO)\r
                /* Load the sample into the PWM timer channel */\r
 \r
 #if defined(AUDIO_OUT_MONO)\r
                /* Load the sample into the PWM timer channel */\r


@@ -225,25 +226,22 @@ void USB_Audio_Task(void)
 #elif defined(AUDIO_OUT_PORTC)\r
                /* Load the 8-bit mixed sample into PORTC */\r
                PORTC = MixedSample_8Bit;\r
 #elif defined(AUDIO_OUT_PORTC)\r
                /* Load the 8-bit mixed sample into PORTC */\r
                PORTC = MixedSample_8Bit;\r

-#else\r
-               uint8_t LEDMask = LEDS_NO_LEDS;\r
+#endif\r

 \r
 \r

-               /* Make mixed sample value positive (absolute) */\r
-               MixedSample_8Bit = abs(MixedSample_8Bit);\r
+               uint8_t LEDMask = LEDS_NO_LEDS;\r

 \r
 \r

-               if (MixedSample_8Bit > 2)\r
+               if (MixedSample_8Bit_Abs > 2)\r

                  LEDMask |= LEDS_LED1;\r
                  \r
                  LEDMask |= LEDS_LED1;\r
                  \r

-               if (MixedSample_8Bit > 4)\r
+               if (MixedSample_8Bit_Abs > 4)\r

                  LEDMask |= LEDS_LED2;\r
                  \r
                  LEDMask |= LEDS_LED2;\r
                  \r

-               if (MixedSample_8Bit > 8)\r
+               if (MixedSample_8Bit_Abs > 8)\r

                  LEDMask |= LEDS_LED3;\r
 \r
                  LEDMask |= LEDS_LED3;\r
 \r

-               if (MixedSample_8Bit > 16)\r
+               if (MixedSample_8Bit_Abs > 16)\r

                  LEDMask |= LEDS_LED4;\r
                  \r
                LEDs_SetAllLEDs(LEDMask);\r
                  LEDMask |= LEDS_LED4;\r
                  \r
                LEDs_SetAllLEDs(LEDMask);\r

-#endif\r

        }\r
 }\r
        }\r
 }\r

diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt b/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
index ffae9ed..96d241c 100644 (file)
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
@@ -53,11 +53,11 @@
  *  required).\r
  *  \r
  *  On start-up the system will automatically enumerate and function\r
  *  required).\r
  *  \r
  *  On start-up the system will automatically enumerate and function\r

- *  as a USB speaker. Incoming audio will output in 8-bit PWM onto\r
- *  the timer output (timer 3 for the AT90USBXXX6/7 USB AVRs, timer 1 for\r
- *  the AT90USBXXX2 controller AVRs) compare channel A for AUDIO_OUT_MONO\r
- *  mode, on channels A and B for AUDIO_OUT_STEREO and on the board LEDs\r
- *  for AUDIO_OUT_LEDS mode. Decouple audio outputs with a capacitor and\r
+ *  as a USB speaker. Outgoing audio will output in 8-bit PWM onto\r
+ *  the timer 3 output compare channel A for AUDIO_OUT_MONO mode, on\r
+ *  timer 3 channels A and B for AUDIO_OUT_STEREO and on PORTC as a signed\r
+ *  mono sample for AUDIO_OUT_PORTC. Audio output will also be indicated on\r
+ *  the board LEDs in all modes. Decouple audio outputs with a capacitor and\r

  *  attach to a speaker to hear the audio.\r
  *  \r
  *  Under Windows, if a driver request dialogue pops up, select the option\r
  *  attach to a speaker to hear the audio.\r
  *  \r
  *  Under Windows, if a driver request dialogue pops up, select the option\r


@@ -84,11 +84,6 @@
  *    <td>When defined, this outputs the audio samples in mono to the timer output pin of the microcontroller.</td>\r
  *   </tr>\r
  *   <tr>\r
  *    <td>When defined, this outputs the audio samples in mono to the timer output pin of the microcontroller.</td>\r
  *   </tr>\r
  *   <tr>\r

- *    <td>AUDIO_OUT_LEDS</td>\r
- *    <td>Makefile CDEFS</td>\r
- *    <td>When defined, this outputs the audio samples in stereo to the board LEDs.</td>\r
- *   </tr>\r
- *   <tr>\r

  *    <td>AUDIO_OUT_PORTC</td>\r
  *    <td>Makefile CDEFS</td>\r
  *    <td>When defined, this outputs the audio samples in mono to port C of the microcontroller, for connection to an\r
  *    <td>AUDIO_OUT_PORTC</td>\r
  *    <td>Makefile CDEFS</td>\r
  *    <td>When defined, this outputs the audio samples in mono to port C of the microcontroller, for connection to an\r