X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/eee252603be67c539f9986cde76454f756e55d95..961da384f985f81e7e0127d4f271ad8bf4817917:/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h

diff --git a/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h b/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h
index 4e114f0c6..b51b217d7 100644
--- a/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h
+++ b/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -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
@@ -367,7 +371,7 @@
 					HID_RI_PHYSICAL_MINIMUM(16, MinPhysicalVal), \
 					HID_RI_PHYSICAL_MAXIMUM(16, MaxPhysicalVal), \
 					HID_RI_REPORT_COUNT(8, 3),              \
-					HID_RI_REPORT_SIZE(8, ((((MinAxisVal >= -0xFF) && (MaxAxisVal <= 0xFF)) ? 8 : 16))), \
+					HID_RI_REPORT_SIZE(8, (((MinAxisVal >= -128) && (MaxAxisVal <= 127)) ? 8 : 16)), \
 					HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), \
 				HID_RI_END_COLLECTION(0),                   \
 				HID_RI_USAGE_PAGE(8, 0x09),                 \
@@ -424,10 +428,10 @@
 				HID_RI_REPORT_SIZE(8, 0x03),                \
 				HID_RI_OUTPUT(8, HID_IOF_CONSTANT),         \
 				HID_RI_LOGICAL_MINIMUM(8, 0x00),            \
-				HID_RI_LOGICAL_MAXIMUM(8, 0x65),            \
+				HID_RI_LOGICAL_MAXIMUM(8, 0xFF),            \
 				HID_RI_USAGE_PAGE(8, 0x07),                 \
 				HID_RI_USAGE_MINIMUM(8, 0x00),              \
-				HID_RI_USAGE_MAXIMUM(8, 0x65),              \
+				HID_RI_USAGE_MAXIMUM(8, 0xFF),              \
 				HID_RI_REPORT_COUNT(8, MaxKeys),            \
 				HID_RI_REPORT_SIZE(8, 0x08),                \
 				HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE), \
@@ -482,7 +486,7 @@
 					HID_RI_PHYSICAL_MINIMUM(16, MinPhysicalVal), \
 					HID_RI_PHYSICAL_MAXIMUM(16, MaxPhysicalVal), \
 					HID_RI_REPORT_COUNT(8, 0x02),           \
-					HID_RI_REPORT_SIZE(8, ((((MinAxisVal >= -0xFF) && (MaxAxisVal <= 0xFF)) ? 8 : 16))), \
+					HID_RI_REPORT_SIZE(8, (((MinAxisVal >= -128) && (MaxAxisVal <= 127)) ? 8 : 16)), \
 					HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | (AbsoluteCoords ? HID_IOF_ABSOLUTE : HID_IOF_RELATIVE)), \
 				HID_RI_END_COLLECTION(0),                   \
 			HID_RI_END_COLLECTION(0)