forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed misspelled HID_KEYBOARD_MODIFIER_* macros in the HID class driver (thanks to Laszlo Monda).

Browse Source
pull/1469/head
Dean Camera 13 years ago
parent dc09ccab8b
commit 3e04487279
10 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File

2
Demos/Device/ClassDriver/Keyboard/Keyboard.c
Unescape View File

@ -169,7 +169,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
KeyboardReport->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_F; KeyboardReport->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_F;
if (UsedKeyCodes) if (UsedKeyCodes)
KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT; KeyboardReport->Modifier = HID_KEYBOARD_MODIFIER_LEFTSHIFT;
*ReportSize = sizeof(USB_KeyboardReport_Data_t); *ReportSize = sizeof(USB_KeyboardReport_Data_t);
return false; return false;

2
Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
Unescape View File

@ -183,7 +183,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
if (!(ButtonStatus_LCL & BUTTONS_BUTTON1)) if (!(ButtonStatus_LCL & BUTTONS_BUTTON1))
return 0; return 0;
KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT; KeyboardReport->Modifier = HID_KEYBOARD_MODIFIER_LEFTSHIFT;
if (JoyStatus_LCL & JOY_UP) if (JoyStatus_LCL & JOY_UP)
KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_A; KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_A;

2
Demos/Device/ClassDriver/KeyboardMouseMultiReport/KeyboardMouseMultiReport.c
Unescape View File

@ -151,7 +151,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
{ {
USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData; USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;
KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT; KeyboardReport->Modifier = HID_KEYBOARD_MODIFIER_LEFTSHIFT;
if (JoyStatus_LCL & JOY_UP) if (JoyStatus_LCL & JOY_UP)
KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_A; KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_A;

2
Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
Unescape View File

@ -195,7 +195,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
uint8_t JoyStatus_LCL = Joystick_GetStatus(); uint8_t JoyStatus_LCL = Joystick_GetStatus();
uint8_t ButtonStatus_LCL = Buttons_GetStatus(); uint8_t ButtonStatus_LCL = Buttons_GetStatus();
KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT; KeyboardReport->Modifier = HID_KEYBOARD_MODIFIER_LEFTSHIFT;
if (JoyStatus_LCL & JOY_UP) if (JoyStatus_LCL & JOY_UP)
KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_A; KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_A;

2
Demos/Device/LowLevel/Keyboard/Keyboard.c
Unescape View File

@ -251,7 +251,7 @@ void CreateKeyboardReport(USB_KeyboardReport_Data_t* const ReportData)
memset(ReportData, 0, sizeof(USB_KeyboardReport_Data_t)); memset(ReportData, 0, sizeof(USB_KeyboardReport_Data_t));
/* Make sent key uppercase by indicating that the left shift key is pressed */ /* Make sent key uppercase by indicating that the left shift key is pressed */
ReportData->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT; ReportData->Modifier = HID_KEYBOARD_MODIFIER_LEFTSHIFT;
if (JoyStatus_LCL & JOY_UP) if (JoyStatus_LCL & JOY_UP)
ReportData->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_A; ReportData->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_A;

2
Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
Unescape View File

@ -219,7 +219,7 @@ void Keyboard_HID_Task(void)
if (!(Buttons_GetStatus() & BUTTONS_BUTTON1)) if (!(Buttons_GetStatus() & BUTTONS_BUTTON1))
{ {
/* Make sent key uppercase by indicating that the left shift key is pressed */ /* Make sent key uppercase by indicating that the left shift key is pressed */
KeyboardReportData.Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT; KeyboardReportData.Modifier = HID_KEYBOARD_MODIFIER_LEFTSHIFT;
if (JoyStatus_LCL & JOY_UP) if (JoyStatus_LCL & JOY_UP)
KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_A; KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_A;

1
LUFA/DoxygenPages/ChangeLog.txt
Unescape View File

@ -27,6 +27,7 @@
* - Fixed ring buffer size limited to 255 elements, instead of the intended 65535 elements. * - Fixed ring buffer size limited to 255 elements, instead of the intended 65535 elements.
* - Fixed CDC class drivers not saving and sending all 16-bits of the control line states (thanks to Matthew Swabey) * - Fixed CDC class drivers not saving and sending all 16-bits of the control line states (thanks to Matthew Swabey)
* - Fixed race conditions in the CDC, HID and Mass Storage class drivers when processing some control requests * - Fixed race conditions in the CDC, HID and Mass Storage class drivers when processing some control requests
* - Fixed misspelled HID_KEYBOARD_MODIFIER_* macros in the HID class driver (thanks to Laszlo Monda)
* - Library Applications: * - Library Applications:
* - Added reliability patches to the AVRISP-MKII Clone project's PDI/TPI protocols (thanks to Justin Mattair) * - Added reliability patches to the AVRISP-MKII Clone project's PDI/TPI protocols (thanks to Justin Mattair)
* - Fixed AVRISP-MKII Clone compile warning on AVR8 U4 targets even when NO_VTARGET_DETECT is enabled * - Fixed AVRISP-MKII Clone compile warning on AVR8 U4 targets even when NO_VTARGET_DETECT is enabled

1
LUFA/DoxygenPages/LUFAPoweredProjects.txt
Unescape View File

@ -93,6 +93,7 @@
* - SmartportVHD Apple II Mass Storage adapter: http://pcedric3.free.fr/SmartportVHD/ * - SmartportVHD Apple II Mass Storage adapter: http://pcedric3.free.fr/SmartportVHD/
* - Single LED Matrix Display: http://guysoft.wordpress.com/2009/10/08/bumble-b/ * - Single LED Matrix Display: http://guysoft.wordpress.com/2009/10/08/bumble-b/
* - Stripe Snoop, a Magnetic Card reader: http://www.ossguy.com/ss_usb/ * - Stripe Snoop, a Magnetic Card reader: http://www.ossguy.com/ss_usb/
* - Stylophone, with USB MIDI connectivity: http://www.waitingforfriday.com/index.php/Stylophone_Studio_5
* - Teensy SD Card .WAV file player: http://elasticsheep.com/2010/04/teensy2-usb-wav-player-part-1/ * - Teensy SD Card .WAV file player: http://elasticsheep.com/2010/04/teensy2-usb-wav-player-part-1/
* - Touchscreen Input Device: http://capnstech.blogspot.com/2010/07/touchscreen-update.html * - Touchscreen Input Device: http://capnstech.blogspot.com/2010/07/touchscreen-update.html
* - Universal USB AVR Module: http://usbavr.bplaced.net/ * - Universal USB AVR Module: http://usbavr.bplaced.net/

4
LUFA/DoxygenPages/MigrationInformation.txt
Unescape View File

@ -11,7 +11,9 @@
* areas relevant to making older projects compatible with the API changes of each new release. * areas relevant to making older projects compatible with the API changes of each new release.
* *
* \section Sec_MigrationXXXXXX Migrating from 111009 to XXXXXX * \section Sec_MigrationXXXXXX Migrating from 111009 to XXXXXX
* None * <b>USB Core</b>
* - The HID_KEYBOARD_MODIFER_* macros in the HID class driver have been corrected to HID_KEYBOARD_MODIFIER_* (note the spelling of "modifier").
* Existing applications should switch over to the correctly spelled macro names.
* *
* \section Sec_Migration111009 Migrating from 110528 to 111009 * \section Sec_Migration111009 Migrating from 110528 to 111009
* <b>Non-USB Library Components</b> * <b>Non-USB Library Components</b>

16
LUFA/Drivers/USB/Class/Common/HID.h
Unescape View File

@ -68,28 +68,28 @@
/** \name Keyboard Standard Report Modifier Masks */ /** \name Keyboard Standard Report Modifier Masks */
//@{ //@{
/** Constant for a keyboard report modifier byte, indicating that the keyboard's left control key is currently pressed. */ /** Constant for a keyboard report modifier byte, indicating that the keyboard's left control key is currently pressed. */
#define HID_KEYBOARD_MODIFER_LEFTCTRL (1 << 0) #define HID_KEYBOARD_MODIFIER_LEFTCTRL (1 << 0)
/** Constant for a keyboard report modifier byte, indicating that the keyboard's left shift key is currently pressed. */ /** Constant for a keyboard report modifier byte, indicating that the keyboard's left shift key is currently pressed. */
#define HID_KEYBOARD_MODIFER_LEFTSHIFT (1 << 1) #define HID_KEYBOARD_MODIFIER_LEFTSHIFT (1 << 1)
/** Constant for a keyboard report modifier byte, indicating that the keyboard's left alt key is currently pressed. */ /** Constant for a keyboard report modifier byte, indicating that the keyboard's left alt key is currently pressed. */
#define HID_KEYBOARD_MODIFER_LEFTALT (1 << 2) #define HID_KEYBOARD_MODIFIER_LEFTALT (1 << 2)
/** Constant for a keyboard report modifier byte, indicating that the keyboard's left GUI key is currently pressed. */ /** Constant for a keyboard report modifier byte, indicating that the keyboard's left GUI key is currently pressed. */
#define HID_KEYBOARD_MODIFER_LEFTGUI (1 << 3) #define HID_KEYBOARD_MODIFIER_LEFTGUI (1 << 3)
/** Constant for a keyboard report modifier byte, indicating that the keyboard's right control key is currently pressed. */ /** Constant for a keyboard report modifier byte, indicating that the keyboard's right control key is currently pressed. */
#define HID_KEYBOARD_MODIFER_RIGHTCTRL (1 << 4) #define HID_KEYBOARD_MODIFIER_RIGHTCTRL (1 << 4)
/** Constant for a keyboard report modifier byte, indicating that the keyboard's right shift key is currently pressed. */ /** Constant for a keyboard report modifier byte, indicating that the keyboard's right shift key is currently pressed. */
#define HID_KEYBOARD_MODIFER_RIGHTSHIFT (1 << 5) #define HID_KEYBOARD_MODIFIER_RIGHTSHIFT (1 << 5)
/** Constant for a keyboard report modifier byte, indicating that the keyboard's right alt key is currently pressed. */ /** Constant for a keyboard report modifier byte, indicating that the keyboard's right alt key is currently pressed. */
#define HID_KEYBOARD_MODIFER_RIGHTALT (1 << 6) #define HID_KEYBOARD_MODIFIER_RIGHTALT (1 << 6)
/** Constant for a keyboard report modifier byte, indicating that the keyboard's right GUI key is currently pressed. */ /** Constant for a keyboard report modifier byte, indicating that the keyboard's right GUI key is currently pressed. */
#define HID_KEYBOARD_MODIFER_RIGHTGUI (1 << 7) #define HID_KEYBOARD_MODIFIER_RIGHTGUI (1 << 7)
//@} //@}
/** \name Keyboard Standard Report LED Masks */ /** \name Keyboard Standard Report LED Masks */

Write Preview
Loading…
Cancel
Save