Commit for the 090810 release.

[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 9a63af6..d7de7d5 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
                        {\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
                        },\r
        };\r
 \r


@@ -62,8 +62,7 @@ int main(void)
        \r
        for (;;)\r
        {\r
        \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
 \r
                Audio_Device_USBTask(&Speaker_Audio_Interface);\r
                USB_USBTask();\r


@@ -90,23 +89,25 @@ void SetupHardware(void)
  */\r
 void ProcessNextSample(void)\r
 {\r
  */\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
        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
 \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
                /* 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


@@ -118,31 +119,28 @@ void ProcessNextSample(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
 /** Event handler for the library USB Connection event. */\r
        }\r
 }\r
 \r
 /** Event handler for the library USB Connection event. */\r

-void EVENT_USB_Connect(void)\r
+void EVENT_USB_Device_Connect(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
        \r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
        \r


@@ -171,7 +169,7 @@ void EVENT_USB_Connect(void)
 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r
 }\r
 \r
 /** Event handler for the library USB Disconnection event. */\r

-void EVENT_USB_Disconnect(void)\r
+void EVENT_USB_Device_Disconnect(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r


@@ -196,7 +194,7 @@ void EVENT_USB_Disconnect(void)
 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r
 }\r
 \r
 /** Event handler for the library USB Configuration Changed event. */\r

-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\r

 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
        \r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
        \r


@@ -204,8 +202,8 @@ void EVENT_USB_ConfigurationChanged(void)
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \r
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \r

-/** Event handler for the library USB Unhandled Control Packet event. */\r
-void EVENT_USB_UnhandledControlPacket(void)\r
+/** Event handler for the library USB Unhandled Control Request event. */\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r

 {\r
 {\r

-       Audio_Device_ProcessControlPacket(&Speaker_Audio_Interface);\r
+       Audio_Device_ProcessControlRequest(&Speaker_Audio_Interface);\r

 }\r
 }\r