From 9a04475c23b56a7176c985c020eea054a6c350f2 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 14 Oct 2012 11:51:57 +0000 Subject: [PATCH] Fixed incorrect definitions of HID_KEYBOARD_LED_KANA, HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN and HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN_AS400 and added a missing definition for HID_KEYBOARD_SC_APPLICATION (thanks to David Monro). --- LUFA/DoxygenPages/ChangeLog.txt | 6 ++++-- LUFA/DoxygenPages/LUFAPoweredProjects.txt | 1 + LUFA/DoxygenPages/MigrationInformation.txt | 12 +++++++++++- LUFA/Drivers/USB/Class/Common/HIDClassCommon.h | 12 ++++++++---- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index bb6621f1fe..1337d911b1 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -12,10 +12,10 @@ * - Added support for the Arduino Leonardo board * - Added support for the Atmel UC3-A3 Xplained board * - Added support for the Xevelabs USB2AX revision 3.1 board - * - Added new doxygen_upgrade and doxygen_create targets to the DOXYGEN build system module + * - Added new \c doxygen_upgrade and \c doxygen_create targets to the DOXYGEN build system module * - Library Applications: * - Added a different device serial number when the AVRISP-MKII Clone project is in libUSB compatibility mode, so that - * both the libUSB and Jungo drivers can be installed at the same time + * both the libUSB and Jungo drivers can be installed at the same time without having to use a filter driver * * Changed: * - Core: @@ -32,6 +32,8 @@ * configuration token set * - Fixed possible rounding in the VERSION_BCD() macros for some 0.01 step increments (thanks to Oliver Zander) * - Fixed incorrect Dataflash functionality in the USBKEY board if the driver is modified for a single Dataflash chip (thanks to Jonathan Oakley) + * - Fixed incorrect definitions of \c HID_KEYBOARD_LED_KANA, \c HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN and \c HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN_AS400 + * and added a missing definition for \c HID_KEYBOARD_SC_APPLICATION (thanks to David Monro) * - Library Applications: * - Fixed broken RESET_TOGGLES_LIBUSB_COMPAT compile time option in the AVRISP-MKII project * - Fixed incompatibility in the CDC class bootloader on some systems (thanks to Sylvain Munaut) diff --git a/LUFA/DoxygenPages/LUFAPoweredProjects.txt b/LUFA/DoxygenPages/LUFAPoweredProjects.txt index c3e786b1e3..7a9b941e5b 100644 --- a/LUFA/DoxygenPages/LUFAPoweredProjects.txt +++ b/LUFA/DoxygenPages/LUFAPoweredProjects.txt @@ -132,6 +132,7 @@ * \li Userial, a USB to Serial converter with SPI, I2C and other protocols: http://www.tty1.net/userial/ * \li Wii Classic Controller to USB converter: https://github.com/crazyiop/wii-classic-2-usb * \li Wireless MIDI Guitar system: http://www.ise.pw.edu.pl/~wzab/wireless_guitar_system/ + * \li XBOX 360 Statup Sound Changer: http://www.homebrew-connection.org/change-your-xbox-360-startup-sounds-yourself/ * \li Xnormidi, a C MIDI library: http://x37v.info/projects/xnormidi * \li XUM1541, a Commodore 64 floppy drive to USB adapter: http://www.root.org/~nate/c64/xum1541/ * \li Zeus, a touch screen computer for music manipulation: http://www.benbengler.com/developments_zeus.html diff --git a/LUFA/DoxygenPages/MigrationInformation.txt b/LUFA/DoxygenPages/MigrationInformation.txt index a9030bf46f..061b292def 100644 --- a/LUFA/DoxygenPages/MigrationInformation.txt +++ b/LUFA/DoxygenPages/MigrationInformation.txt @@ -11,7 +11,17 @@ * areas relevant to making older projects compatible with the API changes of each new release. * * \section Sec_MigrationXXXXXX Migrating from 120730 to XXXXXX - * - No Migration Information. + * Device Mode + * - The \ref HID_KEYBOARD_LED_KANA macro was previously misspelled as \c HID_KEYBOARD_LED_KATANA, and had an incorrect value. User applications requiring this + * constant should use the new name, and remove any workarounds for the previously incorrect macro definition. + * - The \c HID_KEYBOARD_SC_EQUAL_SIGN macro has been renamed to \ref HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN, and the previous definition of + * \c HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN has been renamed \ref HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN_AS400 to conform to the definitions in the HID specification. + * + * Host Mode + * - The \ref HID_KEYBOARD_LED_KANA macro was previously misspelled as \c HID_KEYBOARD_LED_KATANA, and had an incorrect value. User applications requiring this + * constant should use the new name, and remove any workarounds for the previously incorrect macro definition. + * - The \c HID_KEYBOARD_SC_EQUAL_SIGN macro has been renamed to \ref HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN, and the previous definition of + * \c HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN has been renamed \ref HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN_AS400 to conform to the definitions in the HID specification. * * \section Sec_Migration120730 Migrating from 120219 to 120730 * Device Mode diff --git a/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h b/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h index 4e114f0c65..ec345af9ee 100644 --- a/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h @@ -103,8 +103,11 @@ /** Constant for a keyboard output report LED byte, indicating that the host's SCROLL LOCK mode is currently set. */ #define HID_KEYBOARD_LED_SCROLLLOCK (1 << 2) - /** Constant for a keyboard output report LED byte, indicating that the host's KATANA mode is currently set. */ - #define HID_KEYBOARD_LED_KATANA (1 << 3) + /** Constant for a keyboard output report LED byte, indicating that the host's COMPOSE mode is currently set. */ + #define HID_KEYBOARD_LED_COMPOSE (1 << 3) + + /** Constant for a keyboard output report LED byte, indicating that the host's KANA mode is currently set. */ + #define HID_KEYBOARD_LED_KANA (1 << 4) //@} /** \name Keyboard Standard Report Key Scan-codes */ @@ -209,8 +212,9 @@ #define HID_KEYBOARD_SC_KEYPAD_0_AND_INSERT 0x62 #define HID_KEYBOARD_SC_KEYPAD_DOT_AND_DELETE 0x63 #define HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE 0x64 + #define HID_KEYBOARD_SC_APPLICATION 0x65 #define HID_KEYBOARD_SC_POWER 0x66 - #define HID_KEYBOARD_SC_EQUAL_SIGN 0x67 + #define HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN 0x67 #define HID_KEYBOARD_SC_F13 0x68 #define HID_KEYBOARD_SC_F14 0x69 #define HID_KEYBOARD_SC_F15 0x6A @@ -241,7 +245,7 @@ #define HID_KEYBOARD_SC_LOCKING_NUM_LOCK 0x83 #define HID_KEYBOARD_SC_LOCKING_SCROLL_LOCK 0x84 #define HID_KEYBOARD_SC_KEYPAD_COMMA 0x85 - #define HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN 0x86 + #define HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN_AS400 0x86 #define HID_KEYBOARD_SC_INTERNATIONAL1 0x87 #define HID_KEYBOARD_SC_INTERNATIONAL2 0x88 #define HID_KEYBOARD_SC_INTERNATIONAL3 0x89