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

diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.c b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
index efa6ad0..2072e77 100644 (file)
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.c
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
@@ -169,7 +169,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
          KeyboardReport->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_F;
 
        if (UsedKeyCodes)
          KeyboardReport->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_F;
 
        if (UsedKeyCodes)

-         KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;
+         KeyboardReport->Modifier = HID_KEYBOARD_MODIFIER_LEFTSHIFT;

 
        *ReportSize = sizeof(USB_KeyboardReport_Data_t);
        return false;
 
        *ReportSize = sizeof(USB_KeyboardReport_Data_t);
        return false;

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
index ed9056d..b6a2bd7 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
@@ -183,7 +183,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
                if (!(ButtonStatus_LCL & BUTTONS_BUTTON1))
                  return 0;
 
                if (!(ButtonStatus_LCL & BUTTONS_BUTTON1))
                  return 0;
 

-               KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;
+               KeyboardReport->Modifier = HID_KEYBOARD_MODIFIER_LEFTSHIFT;

 
                if (JoyStatus_LCL & JOY_UP)
                  KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_A;
 
                if (JoyStatus_LCL & JOY_UP)
                  KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_A;

diff --git a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/KeyboardMouseMultiReport.c b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/KeyboardMouseMultiReport.c
index 727f232..a3c0abe 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/KeyboardMouseMultiReport.c
+++ b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/KeyboardMouseMultiReport.c
@@ -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)
                  KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_A;
 
                if (JoyStatus_LCL & JOY_UP)
                  KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_A;

diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
index d96fd2b..26f0034 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
@@ -195,7 +195,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
        uint8_t JoyStatus_LCL    = Joystick_GetStatus();
        uint8_t ButtonStatus_LCL = Buttons_GetStatus();
 
        uint8_t JoyStatus_LCL    = Joystick_GetStatus();
        uint8_t ButtonStatus_LCL = Buttons_GetStatus();
 

-       KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;
+       KeyboardReport->Modifier = HID_KEYBOARD_MODIFIER_LEFTSHIFT;

 
        if (JoyStatus_LCL & JOY_UP)
          KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_A;
 
        if (JoyStatus_LCL & JOY_UP)
          KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_A;

diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.c b/Demos/Device/LowLevel/Keyboard/Keyboard.c
index 2d5e366..260d091 100644 (file)
--- a/Demos/Device/LowLevel/Keyboard/Keyboard.c
+++ b/Demos/Device/LowLevel/Keyboard/Keyboard.c
@@ -251,7 +251,7 @@ void CreateKeyboardReport(USB_KeyboardReport_Data_t* const ReportData)
        memset(ReportData, 0, sizeof(USB_KeyboardReport_Data_t));
 
        /* Make sent key uppercase by indicating that the left shift key is pressed */
        memset(ReportData, 0, sizeof(USB_KeyboardReport_Data_t));
 
        /* 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)
          ReportData->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_A;
 
        if (JoyStatus_LCL & JOY_UP)
          ReportData->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_A;

diff --git a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
index 3dcf9df..fba8f2f 100644 (file)
--- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
@@ -219,7 +219,7 @@ void Keyboard_HID_Task(void)
        if (!(Buttons_GetStatus() & BUTTONS_BUTTON1))
        {
                /* Make sent key uppercase by indicating that the left shift key is pressed */
        if (!(Buttons_GetStatus() & BUTTONS_BUTTON1))
        {
                /* 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)
                  KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_A;
 
                if (JoyStatus_LCL & JOY_UP)
                  KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_A;

diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index 3835937..340fa6b 100644 (file)
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -27,6 +27,7 @@
   *   - 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 race conditions in the CDC, HID and Mass Storage class drivers when processing some control requests
   *   - 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 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:
   *   - 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
   *  - Library Applications:
   *   - 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

diff --git a/LUFA/DoxygenPages/LUFAPoweredProjects.txt b/LUFA/DoxygenPages/LUFAPoweredProjects.txt
index b0a89dd..6dc9f02 100644 (file)
--- a/LUFA/DoxygenPages/LUFAPoweredProjects.txt
+++ b/LUFA/DoxygenPages/LUFAPoweredProjects.txt
@@ -93,6 +93,7 @@
  *  - SmartportVHD Apple II Mass Storage adapter: http://pcedric3.free.fr/SmartportVHD/
  *  - 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/
  *  - SmartportVHD Apple II Mass Storage adapter: http://pcedric3.free.fr/SmartportVHD/
  *  - 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/

+ *  - 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/
  *  - Touchscreen Input Device: http://capnstech.blogspot.com/2010/07/touchscreen-update.html
  *  - Universal USB AVR Module: http://usbavr.bplaced.net/
  *  - 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
  *  - Universal USB AVR Module: http://usbavr.bplaced.net/

diff --git a/LUFA/DoxygenPages/MigrationInformation.txt b/LUFA/DoxygenPages/MigrationInformation.txt
index 14ac86b..de7da5d 100644 (file)
--- a/LUFA/DoxygenPages/MigrationInformation.txt
+++ b/LUFA/DoxygenPages/MigrationInformation.txt
@@ -11,7 +11,9 @@
  *  areas relevant to making older projects compatible with the API changes of each new release.
  *
  *  \section Sec_MigrationXXXXXX Migrating from 111009 to XXXXXX
  *  areas relevant to making older projects compatible with the API changes of each new release.
  *
  *  \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
  *  <b>Non-USB Library Components</b>
  *
  *  \section Sec_Migration111009 Migrating from 110528 to 111009
  *  <b>Non-USB Library Components</b>

diff --git a/LUFA/Drivers/USB/Class/Common/HID.h b/LUFA/Drivers/USB/Class/Common/HID.h
index 74012b6..95b3484 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/HID.h
+++ b/LUFA/Drivers/USB/Class/Common/HID.h
@@ -68,28 +68,28 @@
                /** \name Keyboard Standard Report Modifier Masks */
                //@{
                /** Constant for a keyboard report modifier byte, indicating that the keyboard's left control key is currently pressed. */
                /** \name Keyboard Standard Report Modifier Masks */
                //@{
                /** 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 */