Fix broken Endpoint/Pipe stream templates.

[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 dd880b4..28e57c4 100644 (file)
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
@@ -195,9 +195,12 @@ void USB_Audio_Task(void)
                /* Clear the sample reload timer */\r
                TIFR0 |= (1 << OCF0A);\r
 \r
                /* Clear the sample reload timer */\r
                TIFR0 |= (1 << OCF0A);\r
 \r

-               /* Retrieve the signed 16-bit left and right audio samples */\r
-               int16_t LeftSample_16Bit  = (int16_t)Endpoint_Read_Word_LE();\r
-               int16_t RightSample_16Bit = (int16_t)Endpoint_Read_Word_LE();\r
+               /* Retrieve the signed 16-bit left and right audio samples, convert to 8-bit */\r
+               int8_t  LeftSample_8Bit   = ((int16_t)Endpoint_Read_Word_LE() >> 8);\r
+               int8_t  RightSample_8Bit  = ((int16_t)Endpoint_Read_Word_LE() >> 8);\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
                /* Check to see if the bank is now empty */\r
                if (!(Endpoint_IsReadWriteAllowed()))\r
 \r
                /* Check to see if the bank is now empty */\r
                if (!(Endpoint_IsReadWriteAllowed()))\r


@@ -206,23 +209,13 @@ void USB_Audio_Task(void)
                        Endpoint_ClearOUT();\r
                }\r
 \r
                        Endpoint_ClearOUT();\r
                }\r
 \r

-               /* Massage signed 16-bit left and right audio samples into signed 8-bit */\r
-               int8_t  LeftSample_8Bit   = (LeftSample_16Bit  >> 8);\r
-               int8_t  RightSample_8Bit  = (RightSample_16Bit >> 8);\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
 #if defined(AUDIO_OUT_MONO)\r
                /* Load the sample into the PWM timer channel */\r

-               OCR3A = ((uint8_t)MixedSample_8Bit ^ (1 << 7));\r
+               OCR3A = (MixedSample_8Bit ^ (1 << 7));\r

 #elif defined(AUDIO_OUT_STEREO)\r
                /* Load the dual 8-bit samples into the PWM timer channels */\r
 #elif defined(AUDIO_OUT_STEREO)\r
                /* Load the dual 8-bit samples into the PWM timer channels */\r

-               OCR3A = ((uint8_t)LeftSample_8Bit  ^ (1 << 7));\r
-               OCR3B = ((uint8_t)RightSample_8Bit ^ (1 << 7));\r
+               OCR3A = (LeftSample_8Bit  ^ (1 << 7));\r
+               OCR3B = (RightSample_8Bit ^ (1 << 7));\r

 #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


@@ -231,15 +224,15 @@ void USB_Audio_Task(void)
                uint8_t LEDMask = LEDS_NO_LEDS;\r
 \r
                /* Turn on LEDs as the sample amplitude increases */\r
                uint8_t LEDMask = LEDS_NO_LEDS;\r
 \r
                /* Turn on LEDs as the sample amplitude increases */\r

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

                  LEDMask = (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4);\r
                  LEDMask = (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4);\r

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

                  LEDMask = (LEDS_LED1 | LEDS_LED2 | LEDS_LED3);\r
                  LEDMask = (LEDS_LED1 | LEDS_LED2 | LEDS_LED3);\r

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

                  LEDMask = (LEDS_LED1 | LEDS_LED2);\r
                  LEDMask = (LEDS_LED1 | LEDS_LED2);\r

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

                  LEDMask = (LEDS_LED1);\r
                  LEDMask = (LEDS_LED1);\r

-                 \r
+\r

                LEDs_SetAllLEDs(LEDMask);\r
        }\r
 }\r
                LEDs_SetAllLEDs(LEDMask);\r
        }\r
 }\r