Rename TOTAL_NUM_CONFIGURATIONS to FIXED_NUM_CONFIGURATIONS, to match the existing...

[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 2b2cdcb..7dde84b 100644 (file)
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
@@ -30,7 +30,7 @@
 \r
 /** \file\r
  *\r
 \r
 /** \file\r
  *\r

- *  Main source file for the Audio Output demo. This file contains the main tasks of the demo and\r
+ *  Main source file for the AudioOutput demo. This file contains the main tasks of the demo and\r

  *  is responsible for the initial application hardware configuration.\r
  */\r
  \r
  *  is responsible for the initial application hardware configuration.\r
  */\r
  \r


@@ -213,6 +213,9 @@ void USB_Audio_Task(void)
                /* 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

+               /* 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
                OCR3A = ((uint8_t)MixedSample_8Bit ^ (1 << 7));\r
 #if defined(AUDIO_OUT_MONO)\r
                /* Load the sample into the PWM timer channel */\r
                OCR3A = ((uint8_t)MixedSample_8Bit ^ (1 << 7));\r


@@ -223,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 > ((128 / 8) * 1))\r
+               if (MixedSample_8Bit_Abs > 2)\r

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

-               if (MixedSample_8Bit > ((128 / 8) * 2))\r
+               if (MixedSample_8Bit_Abs > 4)\r

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

-               if (MixedSample_8Bit > ((128 / 8) * 3))\r
+               if (MixedSample_8Bit_Abs > 8)\r

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

-               if (MixedSample_8Bit > ((128 / 8) * 4))\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