* 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
Audio_Device_USBTask(&Speaker_Audio_Interface);\r
USB_USBTask();\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
- 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
/* 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
+ /* 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
- /* Make mixed sample value positive (absolute) */\r
- if (MixedSample_8Bit < 0)\r
- MixedSample_8Bit = -MixedSample_8Bit;\r
+ uint8_t LEDMask = LEDS_NO_LEDS;\r
\r
- if (MixedSample_8Bit > ((128 / 8) * 1))\r
+ if (MixedSample_8Bit_Abs > 2)\r
LEDMask |= LEDS_LED1;\r
\r
- if (MixedSample_8Bit > ((128 / 8) * 2))\r
+ if (MixedSample_8Bit_Abs > 4)\r
LEDMask |= LEDS_LED2;\r
\r
- if (MixedSample_8Bit > ((128 / 8) * 3))\r
+ if (MixedSample_8Bit_Abs > 8)\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
-#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
\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
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
- Audio_Device_ProcessControlPacket(&Speaker_Audio_Interface);\r
+ Audio_Device_ProcessControlRequest(&Speaker_Audio_Interface);\r
}\r
projects / pub / USBasp.git / blobdiff