Fixed Mass Storage Host Class driver and Low Level demo not clearing the error condit...

[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 9b2bb39..b9c306c 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


@@ -73,15 +73,15 @@ void SetupHardware(void)
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs, and\r
  *  configures the sample update and PWM timers.\r
  */\r
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs, and\r
  *  configures the sample update and PWM timers.\r
  */\r

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

 {\r
        /* Indicate USB enumerating */\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
        \r
        /* Sample reload timer initialization */\r
 {\r
        /* Indicate USB enumerating */\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
        \r
        /* Sample reload timer initialization */\r

-       OCR0A   = (F_CPU / AUDIO_SAMPLE_FREQUENCY) - 1;\r
+       OCR0A   = (F_CPU / 8 / AUDIO_SAMPLE_FREQUENCY) - 1;\r

        TCCR0A  = (1 << WGM01);  // CTC mode\r
        TCCR0A  = (1 << WGM01);  // CTC mode\r

-       TCCR0B  = (1 << CS00);   // Fcpu speed\r
+       TCCR0B  = (1 << CS01);   // Fcpu/8 speed\r

                        \r
 #if defined(AUDIO_OUT_MONO)\r
        /* Set speaker as output */\r
                        \r
 #if defined(AUDIO_OUT_MONO)\r
        /* Set speaker as output */\r


@@ -105,7 +105,7 @@ void EVENT_USB_Connect(void)
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
  *  the status LEDs, disables the sample update and PWM output timers and stops the USB and Audio management tasks.\r
  */\r
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
  *  the status LEDs, disables the sample update and PWM output timers and stops the USB and Audio management tasks.\r
  */\r

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

 {\r
        /* Stop the timers */\r
        TCCR0B = 0;\r
 {\r
        /* Stop the timers */\r
        TCCR0B = 0;\r


@@ -134,7 +134,7 @@ void EVENT_USB_Disconnect(void)
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration\r
  *  of the USB device after enumeration - the device endpoints are configured.\r
  */\r
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration\r
  *  of the USB device after enumeration - the device endpoints are configured.\r
  */\r

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

 {\r
        /* Indicate USB connected and ready */\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 {\r
        /* Indicate USB connected and ready */\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r


@@ -148,11 +148,11 @@ void EVENT_USB_ConfigurationChanged(void)
        }\r
 }\r
 \r
        }\r
 }\r
 \r

-/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific\r
+/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific\r

  *  control requests that are not handled internally by the USB library (including the Audio class-specific\r
  *  requests) so that they can be handled appropriately for the application.\r
  */\r
  *  control requests that are not handled internally by the USB library (including the Audio class-specific\r
  *  requests) so that they can be handled appropriately for the application.\r
  */\r

-void EVENT_USB_UnhandledControlPacket(void)\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r

 {\r
        /* Process General and Audio specific control requests */\r
        switch (USB_ControlRequest.bRequest)\r
 {\r
        /* Process General and Audio specific control requests */\r
        switch (USB_ControlRequest.bRequest)\r


@@ -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,53 +209,30 @@ 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

 #if defined(AUDIO_OUT_MONO)\r
 #if defined(AUDIO_OUT_MONO)\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

                /* Load the sample into the PWM timer channel */\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
 #elif defined(AUDIO_OUT_PORTC)\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
+               /* Load the 8-bit mixed sample into PORTC */\r

                PORTC = MixedSample_8Bit;\r
                PORTC = MixedSample_8Bit;\r

-#else\r
-               uint8_t LEDMask = LEDS_NO_LEDS;\r
-\r
-               /* Make left channel positive (absolute) */\r
-               if (LeftSample_8Bit < 0)\r
-                 LeftSample_8Bit = -LeftSample_8Bit;\r
+#endif\r

 \r
 \r

-               /* Make right channel positive (absolute) */\r
-               if (RightSample_8Bit < 0)\r
-                 RightSample_8Bit = -RightSample_8Bit;\r
+               uint8_t LEDMask = LEDS_NO_LEDS;\r

 \r
 \r

-               /* Set first LED based on sample value */\r
-               if (LeftSample_8Bit < ((128 / 8) * 1))\r
-                 LEDMask |= LEDS_LED2;\r
-               else if (LeftSample_8Bit < ((128 / 8) * 3))\r
-                 LEDMask |= (LEDS_LED1 | LEDS_LED2);\r
-               else\r
-                 LEDMask |= LEDS_LED1;\r
+               /* Turn on LEDs as the sample amplitude increases */\r
+               if (MixedSample_8Bit > 16)\r
+                 LEDMask = (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4);\r
+               else if (MixedSample_8Bit > 8)\r
+                 LEDMask = (LEDS_LED1 | LEDS_LED2 | LEDS_LED3);\r
+               else if (MixedSample_8Bit > 4)\r
+                 LEDMask = (LEDS_LED1 | LEDS_LED2);\r
+               else if (MixedSample_8Bit > 2)\r
+                 LEDMask = (LEDS_LED1);\r

 \r
 \r

-               /* Set second LED based on sample value */\r
-               if (RightSample_8Bit < ((128 / 8) * 1))\r
-                 LEDMask |= LEDS_LED4;\r
-               else if (RightSample_8Bit < ((128 / 8) * 3))\r
-                 LEDMask |= (LEDS_LED3 | LEDS_LED4);\r
-               else\r
-                 LEDMask |= LEDS_LED3;\r
-                 \r

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

-#endif\r

        }\r
 }\r
        }\r
 }\r