\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
/** 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
#if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))\r
/* PWM speaker timer initialization */\r
- TCCRxA = ((1 << WGMx0) | (1 << COMxA1) | (1 << COMxA0)\r
- | (1 << COMxB1) | (1 << COMxB0)); // Set on match, clear on TOP\r
- TCCRxB = ((1 << WGMx2) | (1 << CSx0)); // Fast 8-Bit PWM, Fcpu speed\r
+ TCCR3A = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)\r
+ | (1 << COM3B1) | (1 << COM3B0)); // Set on match, clear on TOP\r
+ TCCR3B = ((1 << WGM32) | (1 << CS30)); // Fast 8-Bit PWM, Fcpu speed\r
#endif \r
}\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
#if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))\r
- TCCRxB = 0;\r
+ TCCR3B = 0;\r
#endif \r
\r
#if defined(AUDIO_OUT_MONO)\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
}\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
-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
/* Check if the host is enabling the audio interface (setting AlternateSetting to 1) */\r
StreamingAudioInterfaceSelected = ((USB_ControlRequest.wValue) != 0);\r
\r
- /* Acknowledge status stage */\r
- while (!(Endpoint_IsINReady()));\r
- Endpoint_ClearIN();\r
+ Endpoint_ClearStatusStage();\r
}\r
\r
break;\r
void USB_Audio_Task(void)\r
{\r
/* Device must be connected and configured for the task to run */\r
- if (!(USB_IsConnected) || !(USB_ConfigurationNumber))\r
+ if (USB_DeviceState != DEVICE_STATE_Configured)\r
return;\r
\r
/* Check to see if the streaming interface is selected, if not the host is not receiving audio */\r
int8_t LeftSample_8Bit = (LeftSample_16Bit >> 8);\r
int8_t RightSample_8Bit = (RightSample_16Bit >> 8);\r
\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
+ /* 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
- OCRxA = ((uint8_t)MixedSample_8Bit ^ (1 << 7));\r
+ OCR3A = ((uint8_t)MixedSample_8Bit ^ (1 << 7));\r
#elif defined(AUDIO_OUT_STEREO)\r
/* Load the dual 8-bit samples into the PWM timer channels */\r
- OCRxA = ((uint8_t)LeftSample_8Bit ^ (1 << 7));\r
- OCRxB = ((uint8_t)RightSample_8Bit ^ (1 << 7));\r
+ OCR3A = ((uint8_t)LeftSample_8Bit ^ (1 << 7));\r
+ OCR3B = ((uint8_t)RightSample_8Bit ^ (1 << 7));\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
-#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
- /* Make right channel positive (absolute) */\r
- if (RightSample_8Bit < 0)\r
- RightSample_8Bit = -RightSample_8Bit;\r
+ uint8_t LEDMask = LEDS_NO_LEDS;\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
+ if (MixedSample_8Bit_Abs > 2)\r
LEDMask |= LEDS_LED1;\r
+ \r
+ if (MixedSample_8Bit_Abs > 4)\r
+ LEDMask |= LEDS_LED2;\r
+ \r
+ if (MixedSample_8Bit_Abs > 8)\r
+ LEDMask |= LEDS_LED3;\r
\r
- /* Set second LED based on sample value */\r
- if (RightSample_8Bit < ((128 / 8) * 1))\r
+ if (MixedSample_8Bit_Abs > 16)\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
-#endif\r
}\r
}\r
projects / pub / USBasp.git / blobdiff