forked from mfulz_github/qmk_firmware
Ensure that the USB_DeviceState variable is properly set upon wakeup events, to the Addressed or Configured state as needed.
Add explicit support for the AT90USB646 to the Teensy bootloader now that PJRC have released the Teensy++ board. Ensure unfinished SideShow demo uses an unallocated PID value within the LUFA range.
This commit is contained in:
parent
7a5d045987
commit
5dbfdaa17d
|
@ -50,7 +50,7 @@
|
|||
#include <LUFA/Drivers/USB/USB.h>
|
||||
|
||||
/* Preprocessor Checks: */
|
||||
#if !defined(__AVR_AT90USB162__)
|
||||
#if !defined(__AVR_AT90USB162__) && !defined(__AVR_AT90USB646__)
|
||||
#error This bootloader is not compatible with the selected AVR model.
|
||||
#endif
|
||||
|
||||
|
|
|
@ -107,7 +107,7 @@ void CheckJoystickMovement(void)
|
|||
char* ReportString = NULL;
|
||||
static bool ActionSent = false;
|
||||
|
||||
char* JoystickStrings[] =
|
||||
char* const JoystickStrings[] =
|
||||
{
|
||||
"Joystick Up\r\n",
|
||||
"Joystick Down\r\n",
|
||||
|
|
|
@ -144,7 +144,7 @@ void CheckJoystickMovement(void)
|
|||
char* ReportString = NULL;
|
||||
static bool ActionSent = false;
|
||||
|
||||
char* JoystickStrings[] =
|
||||
char* const JoystickStrings[] =
|
||||
{
|
||||
"Joystick Up\r\n",
|
||||
"Joystick Down\r\n",
|
||||
|
|
|
@ -42,7 +42,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
|
|||
Endpoint0Size: 8,
|
||||
|
||||
VendorID: 0x03EB,
|
||||
ProductID: 0xDC03,
|
||||
ProductID: 0x2060,
|
||||
ReleaseNumber: 0x0000,
|
||||
|
||||
ManufacturerStrIndex: 0x01,
|
||||
|
|
|
@ -143,7 +143,7 @@ ISR(USB_GEN_vect, ISR_BLOCK)
|
|||
USB_DeviceState = DEVICE_STATE_Powered;
|
||||
EVENT_USB_Connect();
|
||||
#else
|
||||
USB_DeviceState = DEVICE_STATE_Configured;
|
||||
USB_DeviceState = (USB_ConfigurationNumber) ? DEVICE_STATE_Configured : DEVICE_STATE_Addressed;
|
||||
EVENT_USB_WakeUp();
|
||||
#endif
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue