Renamed USB_Device_SetHighSpeed() to USB_Device_SetFullSpeed() so that the correct...

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

diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
index bbcd2fd..2caf6fa 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
+++ b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.c
@@ -46,8 +46,8 @@ USB_ClassInfo_Audio_Device_t Speaker_Audio_Interface =
                        {\r
                                .StreamingInterfaceNumber = 1,\r
 \r
-                               .DataINEndpointNumber     = AUDIO_STREAM_EPNUM,\r
-                               .DataINEndpointSize       = AUDIO_STREAM_EPSIZE,\r
+                               .DataOUTEndpointNumber    = AUDIO_STREAM_EPNUM,\r
+                               .DataOUTEndpointSize      = AUDIO_STREAM_EPSIZE,\r
                        },\r
        };\r
 \r
@@ -62,8 +62,7 @@ int main(void)
        \r
        for (;;)\r
        {\r
-               if (Speaker_Audio_Interface.State.InterfaceEnabled)\r
-                 ProcessNextSample();\r
+               ProcessNextSample();\r
 \r
                Audio_Device_USBTask(&Speaker_Audio_Interface);\r
                USB_USBTask();\r
@@ -90,21 +89,24 @@ void SetupHardware(void)
  */\r
 void ProcessNextSample(void)\r
 {\r
+       /* Check if the sample reload timer period has elapsed, and that the USB bus is ready for a new sample */\r
        if ((TIFR0 & (1 << OCF0A)) && Audio_Device_IsSampleReceived(&Speaker_Audio_Interface))\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)Audio_Device_ReadSample16();\r
-               int16_t RightSample_16Bit = (int16_t)Audio_Device_ReadSample16();\r
+               int16_t LeftSample_16Bit  = Audio_Device_ReadSample16(&Speaker_Audio_Interface);\r
+               int16_t RightSample_16Bit = Audio_Device_ReadSample16(&Speaker_Audio_Interface);\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
+#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
+#endif\r
 \r
 #if defined(AUDIO_OUT_MONO)\r
                /* Load the sample into the PWM timer channel */\r
@@ -122,16 +124,16 @@ void ProcessNextSample(void)
                /* Make mixed sample value positive (absolute) */\r
                MixedSample_8Bit = abs(MixedSample_8Bit);\r
 \r
-               if (MixedSample_8Bit > ((128 / 8) * 1))\r
+               if (MixedSample_8Bit > 2)\r
                  LEDMask |= LEDS_LED1;\r
                  \r
-               if (MixedSample_8Bit > ((128 / 8) * 2))\r
+               if (MixedSample_8Bit > 4)\r
                  LEDMask |= LEDS_LED2;\r
                  \r
-               if (MixedSample_8Bit > ((128 / 8) * 3))\r
+               if (MixedSample_8Bit > 8)\r
                  LEDMask |= LEDS_LED3;\r
 \r
-               if (MixedSample_8Bit > ((128 / 8) * 4))\r
+               if (MixedSample_8Bit > 16)\r
                  LEDMask |= LEDS_LED4;\r
 \r
                LEDs_SetAllLEDs(LEDMask);\r