/*\r
LUFA Library\r
- Copyright (C) Dean Camera, 2009.\r
+ Copyright (C) Dean Camera, 2010.\r
\r
dean [at] fourwalledcubicle [dot] com\r
www.fourwalledcubicle.com\r
*/\r
\r
/*\r
- Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
- Permission to use, copy, modify, and distribute this software\r
- and its documentation for any purpose and without fee is hereby\r
- granted, provided that the above copyright notice appear in all\r
- copies and that both that the copyright notice and this\r
- permission notice and warranty disclaimer appear in supporting\r
- documentation, and that the name of the author not be used in\r
- advertising or publicity pertaining to distribution of the\r
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+ Permission to use, copy, modify, distribute, and sell this \r
+ software and its documentation for any purpose is hereby granted\r
+ without fee, provided that the above copyright notice appear in \r
+ all copies and that both that the copyright notice and this\r
+ permission notice and warranty disclaimer appear in supporting \r
+ documentation, and that the name of the author not be used in \r
+ advertising or publicity pertaining to distribution of the \r
software without specific, written prior permission.\r
\r
The author disclaim all warranties with regard to this\r
* passed to all Audio Class driver functions, so that multiple instances of the same class\r
* within a device can be differentiated from one another.\r
*/\r
-USB_ClassInfo_Audio_t Speaker_Audio_Interface =\r
+USB_ClassInfo_Audio_Device_t Speaker_Audio_Interface =\r
{\r
- .StreamingInterfaceNumber = 1,\r
+ .Config =\r
+ {\r
+ .StreamingInterfaceNumber = 1,\r
\r
- .DataOUTEndpointNumber = AUDIO_STREAM_EPNUM,\r
- .DataOUTEndpointSize = AUDIO_STREAM_EPSIZE,\r
+ .DataOUTEndpointNumber = AUDIO_STREAM_EPNUM,\r
+ .DataOUTEndpointSize = AUDIO_STREAM_EPSIZE,\r
+ },\r
};\r
\r
/** Main program entry point. This routine contains the overall program flow, including initial\r
\r
for (;;)\r
{\r
- if (Speaker_Audio_Interface.InterfaceEnabled)\r
- ProcessNextSample();\r
+ ProcessNextSample();\r
\r
- USB_Audio_USBTask(&Speaker_Audio_Interface);\r
+ Audio_Device_USBTask(&Speaker_Audio_Interface);\r
USB_USBTask();\r
}\r
}\r
*/\r
void ProcessNextSample(void)\r
{\r
- if ((TIFR0 & (1 << OCF0A)) && USB_Audio_IsSampleReceived(&Speaker_Audio_Interface))\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)USB_Audio_ReadSample16();\r
- int16_t RightSample_16Bit = (int16_t)USB_Audio_ReadSample16();\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
+ /* Retrieve the signed 16-bit left and right audio samples, convert to 8-bit */\r
+ int8_t LeftSample_8Bit = (Audio_Device_ReadSample16(&Speaker_Audio_Interface) >> 8);\r
+ int8_t RightSample_8Bit = (Audio_Device_ReadSample16(&Speaker_Audio_Interface) >> 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
#if defined(AUDIO_OUT_MONO)\r
/* Load the sample into the PWM timer channel */\r
- OCRxA = ((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
- OCRxA = ((uint8_t)LeftSample_8Bit ^ (1 << 7));\r
- OCRxB = ((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
-#else\r
- uint8_t LEDMask = LEDS_NO_LEDS;\r
-\r
- /* Make mixed sample value positive (absolute) */\r
- if (MixedSample_8Bit < 0)\r
- MixedSample_8Bit = -MixedSample_8Bit;\r
+#endif\r
\r
- if (MixedSample_8Bit > ((128 / 8) * 1))\r
- LEDMask |= LEDS_LED1;\r
- \r
- if (MixedSample_8Bit > ((128 / 8) * 2))\r
- LEDMask |= LEDS_LED2;\r
- \r
- if (MixedSample_8Bit > ((128 / 8) * 3))\r
- LEDMask |= LEDS_LED3;\r
+ uint8_t LEDMask = LEDS_NO_LEDS;\r
\r
- if (MixedSample_8Bit > ((128 / 8) * 4))\r
- LEDMask |= LEDS_LED4;\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
LEDs_SetAllLEDs(LEDMask);\r
-#endif\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
/* 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
- 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) || 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 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
#if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO))\r
/* Stop the PWM generation timer */\r
- TCCRxB = 0;\r
+ TCCR3B = 0;\r
#endif\r
\r
#if defined(AUDIO_OUT_MONO)\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
- if (!(USB_Audio_ConfigureEndpoints(&Speaker_Audio_Interface)))\r
+ if (!(Audio_Device_ConfigureEndpoints(&Speaker_Audio_Interface)))\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
- USB_Audio_ProcessControlPacket(&Speaker_Audio_Interface);\r
+ Audio_Device_ProcessControlRequest(&Speaker_Audio_Interface);\r
}\r
projects / pub / USBasp.git / blobdiff