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

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