X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/2ee9fc707784e115d744dbc229bdc893f4bb6bc1..dc42c5eb6b663b0b117b5660ba5818186744efd5:/Demos/Device/AudioOutput/AudioOutput.c diff --git a/Demos/Device/AudioOutput/AudioOutput.c b/Demos/Device/AudioOutput/AudioOutput.c index 7ec2e3534..8c3bf6188 100644 --- a/Demos/Device/AudioOutput/AudioOutput.c +++ b/Demos/Device/AudioOutput/AudioOutput.c @@ -30,25 +30,46 @@ /** \file * - * Main source file for the Audio Output demo. This file contains the main tasks of the demo and - * is responsible for the initial application hardware configuration. + * Main source file for the AudioOutput demo. This file contains the main tasks of + * the demo and is responsible for the initial application hardware configuration. */ - + #include "AudioOutput.h" -/* Scheduler Task List */ -TASK_LIST -{ - { .Task = USB_USBTask , .TaskStatus = TASK_STOP }, - { .Task = USB_Audio_Task , .TaskStatus = TASK_STOP }, -}; +/** LUFA Audio Class driver interface configuration and state information. This structure is + * passed to all Audio Class driver functions, so that multiple instances of the same class + * within a device can be differentiated from one another. + */ +USB_ClassInfo_Audio_t Speaker_Audio_Interface = + { + .StreamingInterfaceNumber = 1, + .DataOUTEndpointNumber = AUDIO_STREAM_EPNUM, + .DataOUTEndpointSize = AUDIO_STREAM_EPSIZE, + }; -/** Main program entry point. This routine configures the hardware required by the application, then - * starts the scheduler to run the application tasks. +/** Main program entry point. This routine contains the overall program flow, including initial + * setup of all components and the main program loop. */ int main(void) { + SetupHardware(); + + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); + + for (;;) + { + if (Speaker_Audio_Interface.InterfaceEnabled) + ProcessNextSample(); + + USB_Audio_USBTask(&Speaker_Audio_Interface); + USB_USBTask(); + } +} + +/** Configures the board hardware and chip peripherals for the demo's functionality. */ +void SetupHardware(void) +{ /* Disable watchdog if enabled by bootloader/fuses */ MCUSR &= ~(1 << WDRF); wdt_disable(); @@ -58,36 +79,73 @@ int main(void) /* Hardware Initialization */ LEDs_Init(); - - /* Indicate USB not ready */ - UpdateStatus(Status_USBNotReady); - - /* Initialize Scheduler so that it can be used */ - Scheduler_Init(); - - /* Initialize USB Subsystem */ USB_Init(); - - /* Scheduling - routine never returns, so put this last in the main function */ - Scheduler_Start(); } -/** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs, and - * configures the sample update and PWM timers. +/** Processes the next audio sample by reading the last ADC conversion and writing it to the audio + * interface, each time the sample reload timer period elapses to give a constant sample rate. */ -void EventHandler_USB_Connect(void) +void ProcessNextSample(void) { - /* Start USB management task */ - Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); + if ((TIFR0 & (1 << OCF0A)) && USB_Audio_IsSampleReceived(&Speaker_Audio_Interface)) + { + /* Clear the sample reload timer */ + TIFR0 |= (1 << OCF0A); + + /* Retrieve the signed 16-bit left and right audio samples */ + int16_t LeftSample_16Bit = (int16_t)USB_Audio_ReadSample16(); + int16_t RightSample_16Bit = (int16_t)USB_Audio_ReadSample16(); - /* Indicate USB enumerating */ - UpdateStatus(Status_USBEnumerating); + /* Massage signed 16-bit left and right audio samples into signed 8-bit */ + int8_t LeftSample_8Bit = (LeftSample_16Bit >> 8); + int8_t RightSample_8Bit = (RightSample_16Bit >> 8); + + /* Mix the two channels together to produce a mono, 8-bit sample */ + int8_t MixedSample_8Bit = (((int16_t)LeftSample_8Bit + (int16_t)RightSample_8Bit) >> 1); + +#if defined(AUDIO_OUT_MONO) + /* Load the sample into the PWM timer channel */ + OCRxA = ((uint8_t)MixedSample_8Bit ^ (1 << 7)); +#elif defined(AUDIO_OUT_STEREO) + /* Load the dual 8-bit samples into the PWM timer channels */ + OCRxA = ((uint8_t)LeftSample_8Bit ^ (1 << 7)); + OCRxB = ((uint8_t)RightSample_8Bit ^ (1 << 7)); +#elif defined(AUDIO_OUT_PORTC) + PORTC = MixedSample_8Bit; +#else + uint8_t LEDMask = LEDS_NO_LEDS; + + /* Make mixed sample value positive (absolute) */ + if (MixedSample_8Bit < 0) + MixedSample_8Bit = -MixedSample_8Bit; + + if (MixedSample_8Bit > ((128 / 8) * 1)) + LEDMask |= LEDS_LED1; + + if (MixedSample_8Bit > ((128 / 8) * 2)) + LEDMask |= LEDS_LED2; + + if (MixedSample_8Bit > ((128 / 8) * 3)) + LEDMask |= LEDS_LED3; + + if (MixedSample_8Bit > ((128 / 8) * 4)) + LEDMask |= LEDS_LED4; + + LEDs_SetAllLEDs(LEDMask); +#endif + } +} + +/** Event handler for the library USB Connection event. */ +void EVENT_USB_Connect(void) +{ + LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); /* Sample reload timer initialization */ OCR0A = (F_CPU / AUDIO_SAMPLE_FREQUENCY) - 1; TCCR0A = (1 << WGM01); // CTC mode TCCR0B = (1 << CS00); // Fcpu speed - + #if defined(AUDIO_OUT_MONO) /* Set speaker as output */ DDRC |= (1 << 6); @@ -107,14 +165,16 @@ void EventHandler_USB_Connect(void) #endif } -/** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via - * the status LEDs, disables the sample update and PWM output timers and stops the USB and Audio management tasks. - */ -void EventHandler_USB_Disconnect(void) +/** Event handler for the library USB Disconnection event. */ +void EVENT_USB_Disconnect(void) { - /* Stop the timers */ + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); + + /* Stop the sample reload timer */ TCCR0B = 0; + #if (defined(AUDIO_OUT_MONO) || defined(AUDIO_OUT_STEREO)) + /* Stop the PWM generation timer */ TCCRxB = 0; #endif @@ -128,164 +188,19 @@ void EventHandler_USB_Disconnect(void) /* Set PORTC low */ PORTC = 0x00; #endif - - /* Stop running audio and USB management tasks */ - Scheduler_SetTaskMode(USB_Audio_Task, TASK_STOP); - Scheduler_SetTaskMode(USB_USBTask, TASK_STOP); - - /* Indicate USB not ready */ - UpdateStatus(Status_USBNotReady); -} - -/** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration - * of the USB device after enumeration - the device endpoints are configured. - */ -void EventHandler_USB_ConfigurationChanged(void) -{ - /* Setup audio stream endpoint */ - Endpoint_ConfigureEndpoint(AUDIO_STREAM_EPNUM, EP_TYPE_ISOCHRONOUS, - ENDPOINT_DIR_OUT, AUDIO_STREAM_EPSIZE, - ENDPOINT_BANK_DOUBLE); - - /* Indicate USB connected and ready */ - UpdateStatus(Status_USBReady); } -/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific - * control requests that are not handled internally by the USB library (including the Audio class-specific - * requests) so that they can be handled appropriately for the application. - */ -void EventHandler_USB_UnhandledControlPacket(void) -{ - /* Process General and Audio specific control requests */ - switch (USB_ControlRequest.bRequest) - { - case REQ_SetInterface: - /* Set Interface is not handled by the library, as its function is application-specific */ - if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE)) - { - Endpoint_ClearSETUP(); - - /* Check if the host is enabling the audio interface (setting AlternateSetting to 1) */ - if (USB_ControlRequest.wValue) - { - /* Start audio task */ - Scheduler_SetTaskMode(USB_Audio_Task, TASK_RUN); - } - else - { - /* Stop audio task */ - Scheduler_SetTaskMode(USB_Audio_Task, TASK_STOP); - } - - /* Acknowledge status stage */ - while (!(Endpoint_IsINReady())); - Endpoint_ClearIN(); - } - - break; - } -} - -/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to - * log to a serial port, or anything else that is suitable for status updates. - * - * \param CurrentStatus Current status of the system, from the AudioOutput_StatusCodes_t enum - */ -void UpdateStatus(uint8_t CurrentStatus) +/** Event handler for the library USB Configuration Changed event. */ +void EVENT_USB_ConfigurationChanged(void) { - uint8_t LEDMask = LEDS_NO_LEDS; + LEDs_SetAllLEDs(LEDMASK_USB_READY); - /* Set the LED mask to the appropriate LED mask based on the given status code */ - switch (CurrentStatus) - { - case Status_USBNotReady: - LEDMask = (LEDS_LED1); - break; - case Status_USBEnumerating: - LEDMask = (LEDS_LED1 | LEDS_LED2); - break; - case Status_USBReady: - LEDMask = (LEDS_LED2 | LEDS_LED4); - break; - } - - /* Set the board LEDs to the new LED mask */ - LEDs_SetAllLEDs(LEDMask); + if (!(USB_Audio_ConfigureEndpoints(&Speaker_Audio_Interface))) + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); } -/** Task to manage the Audio interface, reading in audio samples from the host, and outputting them to the speakers/LEDs as - * desired. - */ -TASK(USB_Audio_Task) +/** Event handler for the library USB Unhandled Control Packet event. */ +void EVENT_USB_UnhandledControlPacket(void) { - /* Select the audio stream endpoint */ - Endpoint_SelectEndpoint(AUDIO_STREAM_EPNUM); - - /* Check if the current endpoint can be read from (contains a packet) and that the next sample should be read */ - if (Endpoint_IsOUTReceived() && (TIFR0 & (1 << OCF0A))) - { - /* Clear the sample reload timer */ - TIFR0 |= (1 << OCF0A); - - /* Retrieve the signed 16-bit left and right audio samples */ - int16_t LeftSample_16Bit = (int16_t)Endpoint_Read_Word_LE(); - int16_t RightSample_16Bit = (int16_t)Endpoint_Read_Word_LE(); - - /* Check to see if the bank is now empty */ - if (!(Endpoint_IsReadWriteAllowed())) - { - /* Acknowledge the packet, clear the bank ready for the next packet */ - Endpoint_ClearOUT(); - } - - /* Massage signed 16-bit left and right audio samples into signed 8-bit */ - int8_t LeftSample_8Bit = (LeftSample_16Bit >> 8); - int8_t RightSample_8Bit = (RightSample_16Bit >> 8); - -#if defined(AUDIO_OUT_MONO) - /* Mix the two channels together to produce a mono, 8-bit sample */ - int8_t MixedSample_8Bit = (((int16_t)LeftSample_8Bit + (int16_t)RightSample_8Bit) >> 1); - - /* Load the sample into the PWM timer channel */ - OCRxA = ((uint8_t)MixedSample_8Bit ^ (1 << 7)); -#elif defined(AUDIO_OUT_STEREO) - /* Load the dual 8-bit samples into the PWM timer channels */ - OCRxA = ((uint8_t)LeftSample_8Bit ^ (1 << 7)); - OCRxB = ((uint8_t)RightSample_8Bit ^ (1 << 7)); -#elif defined(AUDIO_OUT_PORTC) - /* Mix the two channels together to produce a mono, 8-bit sample */ - int8_t MixedSample_8Bit = (((int16_t)LeftSample_8Bit + (int16_t)RightSample_8Bit) >> 1); - - PORTC = MixedSample_8Bit; -#else - uint8_t LEDMask = LEDS_NO_LEDS; - - /* Make left channel positive (absolute) */ - if (LeftSample_8Bit < 0) - LeftSample_8Bit = -LeftSample_8Bit; - - /* Make right channel positive (absolute) */ - if (RightSample_8Bit < 0) - RightSample_8Bit = -RightSample_8Bit; - - /* Set first LED based on sample value */ - if (LeftSample_8Bit < ((128 / 8) * 1)) - LEDMask |= LEDS_LED2; - else if (LeftSample_8Bit < ((128 / 8) * 3)) - LEDMask |= (LEDS_LED1 | LEDS_LED2); - else - LEDMask |= LEDS_LED1; - - /* Set second LED based on sample value */ - if (RightSample_8Bit < ((128 / 8) * 1)) - LEDMask |= LEDS_LED4; - else if (RightSample_8Bit < ((128 / 8) * 3)) - LEDMask |= (LEDS_LED3 | LEDS_LED4); - else - LEDMask |= LEDS_LED3; - - LEDs_SetAllLEDs(LEDMask); -#endif - } + USB_Audio_ProcessControlPacket(&Speaker_Audio_Interface); }