Commit 6d2a08f1 authored by Dean Camera's avatar Dean Camera
Browse files

Fixed incorrect signature in the CDC and DFU class bootloaders for the ATMEGA8U2.

Minor documentation cleanups.

Modify the incomplete AudioInputHost demo for mono audio output.
parent 68468e0a
......@@ -83,11 +83,11 @@
#elif defined(__AVR_ATmega8U2__)
#define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x93
#define AVR_SIGNATURE_3 0x82
#define AVR_SIGNATURE_3 0x89
#elif defined(__AVR_AT90USB82__)
#define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x93
#define AVR_SIGNATURE_3 0x89
#define AVR_SIGNATURE_2 0x94
#define AVR_SIGNATURE_3 0x82
#else
#error The selected AVR part is not currently supported by this bootloader.
#endif
......
......@@ -117,12 +117,12 @@
#define PRODUCT_ID_CODE 0x2FF7
#define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x93
#define AVR_SIGNATURE_3 0x82
#define AVR_SIGNATURE_3 0x89
#elif defined(__AVR_AT90USB82__)
#define PRODUCT_ID_CODE 0x2FEE
#define AVR_SIGNATURE_1 0x1E
#define AVR_SIGNATURE_2 0x93
#define AVR_SIGNATURE_3 0x89
#define AVR_SIGNATURE_2 0x94
#define AVR_SIGNATURE_3 0x82
#else
#error The selected AVR part is not currently supported by this bootloader.
#endif
......
......@@ -216,8 +216,7 @@ void Audio_Task(void)
DDRC |= (1 << 6);
/* PWM speaker timer initialization */
TCCR3A = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)
| (1 << COM3B1) | (1 << COM3B0)); // Set on match, clear on TOP
TCCR3A = ((1 << WGM30) | (1 << COM3A1) | (1 << COM3A0)); // Set on match, clear on TOP
TCCR3B = ((1 << WGM32) | (1 << CS30)); // Fast 8-Bit PWM, F_CPU speed
puts_P(PSTR("Microphone Enumerated.\r\n"));
......@@ -225,6 +224,7 @@ void Audio_Task(void)
USB_HostState = HOST_STATE_Configured;
break;
case HOST_STATE_Configured:
/* Do nothing - audio stream is handled by the timer interrupt routine */
break;
}
}
......@@ -269,6 +269,5 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
}
Pipe_Freeze();
Pipe_SelectPipe(PrevPipe);
}
......@@ -218,6 +218,7 @@ void Audio_Task(void)
USB_HostState = HOST_STATE_Configured;
break;
case HOST_STATE_Configured:
/* Do nothing - audio stream is handled by the timer interrupt routine */
break;
}
}
......
......@@ -361,7 +361,7 @@ uint8_t MS_Host_GetMaxLUN(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
if ((ErrorCode = USB_Host_SendControlRequest(MaxLUNIndex)) != HOST_SENDCONTROL_Successful)
{
*MaxLUNIndex = 0;
ErrorCode = HOST_SENDCONTROL_Successful;
ErrorCode = HOST_SENDCONTROL_Successful;
}
return ErrorCode;
......
......@@ -33,7 +33,7 @@
* - Core:
* - <i>None</i>
* - Library Applications:
* - <i>None</i>
* - Fixed incorrect signature in the CDC and DFU class bootloaders for the ATMEGA8U2
*
* \section Sec_ChangeLog110528 Version 110528
* <b>New:</b>
......
......@@ -34,6 +34,7 @@
* -# Add class driver support for Test and Measurement class
* -# Fix up Audio class support - add support for mixers, etc., add support for GET/SET commands
* - Ports
* -# Complete AVR32 port for existing devices, add UC3C support
* -# Atmel ARM7 series microcontrollers
* -# Other (commercial) C compilers
*/
......
......@@ -92,6 +92,8 @@
* - <b>StillImageHost</b> - Still Image Camera host demo, using the low level LUFA APIs to implement the USB Still Image class
* - <b>VirtualSerialHost</b> - Virtual Serial Port host demo, using the low level LUFA APIs to implement the USB CDC class
* - <b>Incomplete</b>
* - <b>AudioInputHost</b> - Incomplete Audio Input host demo, using the low level LUFA APIs to implement a USB microphone host
* - <b>AudioOutputHost</b> - Incomplete Audio Output host demo, using the low level LUFA APIs to implement a USB speaker host
* - <b>BluetoothHost</b> - Incomplete Bluetooth host demo, using the low level LUFA APIs to implement the USB Bluetooth class
* - <b>DualRole</b>
* - <b>ClassDriver</b>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment