X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/2440ca268ac444c1aed2441cefe9e25a767d961a..d1e52660368d34d693131f6aff3c8fd8584162e5:/Demos/Device/AudioInput/AudioInput.c?ds=inline diff --git a/Demos/Device/AudioInput/AudioInput.c b/Demos/Device/AudioInput/AudioInput.c index ecd8cdda8..bcfb04be1 100644 --- a/Demos/Device/AudioInput/AudioInput.c +++ b/Demos/Device/AudioInput/AudioInput.c @@ -28,26 +28,32 @@ this software. */ -/** \file - * - * Main source file for the Audio Input demo. This file contains the main tasks of the demo and - * is responsible for the initial application hardware configuration. - */ - #include "AudioInput.h" -/* Scheduler Task List */ -TASK_LIST +USB_ClassInfo_Audio_t Microphone_Audio_Interface = + { + .InterfaceNumber = 0, + + .DataINEndpointNumber = AUDIO_STREAM_EPNUM, + .DataINEndpointSize = AUDIO_STREAM_EPSIZE, + }; + +int main(void) { - { .Task = USB_USBTask , .TaskStatus = TASK_STOP }, - { .Task = USB_Audio_Task , .TaskStatus = TASK_STOP }, -}; + SetupHardware(); + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); + + for (;;) + { + if (Microphone_Audio_Interface.InterfaceEnabled) + ProcessNextSample(); -/** Main program entry point. This routine configures the hardware required by the application, then - * starts the scheduler to run the application tasks. - */ -int main(void) + USB_USBTask(); + } +} + +void SetupHardware(void) { /* Disable watchdog if enabled by bootloader/fuses */ MCUSR &= ~(1 << WDRF); @@ -58,35 +64,35 @@ int main(void) /* Hardware Initialization */ LEDs_Init(); + USB_Init(); ADC_Init(ADC_FREE_RUNNING | ADC_PRESCALE_32); ADC_SetupChannel(MIC_IN_ADC_CHANNEL); /* Start the ADC conversion in free running mode */ ADC_StartReading(ADC_REFERENCE_AVCC | ADC_RIGHT_ADJUSTED | MIC_IN_ADC_CHANNEL); - - /* Indicate USB not ready */ - UpdateStatus(Status_USBNotReady); - - /* Initialize Scheduler so that it can be used */ - Scheduler_Init(); +} - /* Initialize USB Subsystem */ - USB_Init(); +void ProcessNextSample(void) +{ + if ((TIFR0 & (1 << OCF0A)) && USB_Audio_IsReadyForNextSample(&Microphone_Audio_Interface)) + { + TIFR0 |= (1 << OCF0A); + + /* Audio sample is ADC value scaled to fit the entire range */ + int16_t AudioSample = ((SAMPLE_MAX_RANGE / ADC_MAX_RANGE) * ADC_GetResult()); + +#if defined(MICROPHONE_BIASED_TO_HALF_RAIL) + /* Microphone is biased to half rail voltage, subtract the bias from the sample value */ + AudioSample -= (SAMPLE_MAX_RANGE / 2)); +#endif - /* Scheduling - routine never returns, so put this last in the main function */ - Scheduler_Start(); + USB_Audio_WriteSample16(AudioSample); + } } -/** 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. - */ void EVENT_USB_Connect(void) { - /* Start USB management task */ - Scheduler_SetTaskMode(USB_USBTask, TASK_RUN); - - /* Indicate USB enumerating */ - UpdateStatus(Status_USBEnumerating); + LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING); /* Sample reload timer initialization */ OCR0A = (F_CPU / AUDIO_SAMPLE_FREQUENCY) - 1; @@ -94,127 +100,23 @@ void EVENT_USB_Connect(void) TCCR0B = (1 << CS00); // Fcpu speed } -/** 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 EVENT_USB_Disconnect(void) { /* Stop the sample reload timer */ TCCR0B = 0; - /* 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); + LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY); } -/** 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 EVENT_USB_ConfigurationChanged(void) { - /* Setup audio stream endpoint */ - Endpoint_ConfigureEndpoint(AUDIO_STREAM_EPNUM, EP_TYPE_ISOCHRONOUS, - ENDPOINT_DIR_IN, 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 EVENT_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 AudioInput_StatusCodes_t enum - */ -void UpdateStatus(uint8_t CurrentStatus) -{ - 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(&Microphone_Audio_Interface))) + LEDs_SetAllLEDs(LEDMASK_USB_ERROR); } -/** Task to manage the Audio interface, reading in ADC samples from the microphone, and them to the host. */ -TASK(USB_Audio_Task) +void EVENT_USB_UnhandledControlPacket(void) { - /* Select the audio stream endpoint */ - Endpoint_SelectEndpoint(AUDIO_STREAM_EPNUM); - - /* Check if the current endpoint can be written to and that the next sample should be stored */ - if (Endpoint_IsINReady() && (TIFR0 & (1 << OCF0A))) - { - /* Clear the sample reload timer */ - TIFR0 |= (1 << OCF0A); - - /* Audio sample is ADC value scaled to fit the entire range */ - int16_t AudioSample = ((SAMPLE_MAX_RANGE / ADC_MAX_RANGE) * ADC_GetResult()); - -#if defined(MICROPHONE_BIASED_TO_HALF_RAIL) - /* Microphone is biased to half rail voltage, subtract the bias from the sample value */ - AudioSample -= (SAMPLE_MAX_RANGE / 2)); -#endif - - /* Write the sample to the buffer */ - Endpoint_Write_Word_LE(AudioSample); - - /* Check to see if the bank is now full */ - if (!(Endpoint_IsReadWriteAllowed())) - { - /* Send the full packet to the host */ - Endpoint_ClearIN(); - } - } + USB_Audio_ProcessControlPacket(&Microphone_Audio_Interface); }