Make LowLevel AudioOutput demo work in the same way as the ClassDriver AudioOutput...

[pub/USBasp.git] / Demos / Device / LowLevel / AudioOutput / AudioOutput.c

diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
index 9b2bb39..2b2cdcb 100644 (file)
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
@@ -210,10 +210,10 @@ 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_MONO)\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
 \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
 \r

+#if defined(AUDIO_OUT_MONO)\r

                /* Load the sample into the PWM timer channel */\r
                OCR3A = ((uint8_t)MixedSample_8Bit ^ (1 << 7));\r
 #elif defined(AUDIO_OUT_STEREO)\r
                /* Load the sample into the PWM timer channel */\r
                OCR3A = ((uint8_t)MixedSample_8Bit ^ (1 << 7));\r
 #elif defined(AUDIO_OUT_STEREO)\r


@@ -221,36 +221,25 @@ void USB_Audio_Task(void)
                OCR3A = ((uint8_t)LeftSample_8Bit  ^ (1 << 7));\r
                OCR3B = ((uint8_t)RightSample_8Bit ^ (1 << 7));\r
 #elif defined(AUDIO_OUT_PORTC)\r
                OCR3A = ((uint8_t)LeftSample_8Bit  ^ (1 << 7));\r
                OCR3B = ((uint8_t)RightSample_8Bit ^ (1 << 7));\r
 #elif defined(AUDIO_OUT_PORTC)\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
-\r
+               /* Load the 8-bit mixed sample into PORTC */\r

                PORTC = MixedSample_8Bit;\r
 #else\r
                uint8_t LEDMask = LEDS_NO_LEDS;\r
 \r
                PORTC = MixedSample_8Bit;\r
 #else\r
                uint8_t LEDMask = LEDS_NO_LEDS;\r
 \r

-               /* Make left channel positive (absolute) */\r
-               if (LeftSample_8Bit < 0)\r
-                 LeftSample_8Bit = -LeftSample_8Bit;\r
-\r
-               /* Make right channel positive (absolute) */\r
-               if (RightSample_8Bit < 0)\r
-                 RightSample_8Bit = -RightSample_8Bit;\r
+               /* Make mixed sample value positive (absolute) */\r
+               MixedSample_8Bit = abs(MixedSample_8Bit);\r

 \r
 \r

-               /* Set first LED based on sample value */\r
-               if (LeftSample_8Bit < ((128 / 8) * 1))\r
-                 LEDMask |= LEDS_LED2;\r
-               else if (LeftSample_8Bit < ((128 / 8) * 3))\r
-                 LEDMask |= (LEDS_LED1 | LEDS_LED2);\r
-               else\r
+               if (MixedSample_8Bit > ((128 / 8) * 1))\r

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

+                 \r
+               if (MixedSample_8Bit > ((128 / 8) * 2))\r
+                 LEDMask |= LEDS_LED2;\r
+                 \r
+               if (MixedSample_8Bit > ((128 / 8) * 3))\r
+                 LEDMask |= LEDS_LED3;\r

 \r
 \r

-               /* Set second LED based on sample value */\r
-               if (RightSample_8Bit < ((128 / 8) * 1))\r
+               if (MixedSample_8Bit > ((128 / 8) * 4))\r

                  LEDMask |= LEDS_LED4;\r
                  LEDMask |= LEDS_LED4;\r

-               else if (RightSample_8Bit < ((128 / 8) * 3))\r
-                 LEDMask |= (LEDS_LED3 | LEDS_LED4);\r
-               else\r
-                 LEDMask |= LEDS_LED3;\r

                  \r
                LEDs_SetAllLEDs(LEDMask);\r
 #endif\r
                  \r
                LEDs_SetAllLEDs(LEDMask);\r
 #endif\r