summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2012-07-02 11:53:11 +0900
committertmk <nobody@nowhere>2012-07-02 11:56:33 +0900
commitab89bfce03e7c792c92a2be1ccf0fbc1e379ed94 (patch)
treef43cd6b4b56587d616904bc63d8e511996edce67
parentfca518f90dfc7f72132ff7950b000cfbd5709807 (diff)
Fix LUFA descriptor of Extra for Windows
- worked on Linux but not on Windows (logica/usage MINIMUM must start at 0x001)
l---------keyboard/hbkb/Makefile1
-rw-r--r--keyboard/hhkb/config.h2
-rw-r--r--protocol/lufa/descriptor.c8
3 files changed, 5 insertions, 6 deletions
diff --git a/keyboard/hbkb/Makefile b/keyboard/hbkb/Makefile
deleted file mode 120000
index f00d036da3..0000000000
--- a/keyboard/hbkb/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.lufa \ No newline at end of file
diff --git a/keyboard/hhkb/config.h b/keyboard/hhkb/config.h
index 91446466fe..a8cefd5edc 100644
--- a/keyboard/hhkb/config.h
+++ b/keyboard/hhkb/config.h
@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xCAFF
+#define PRODUCT_ID 0xCAFE
#define DEVICE_VER 0x0101
#define MANUFACTURER t.m.k.
#define PRODUCT HHKB mod
diff --git a/protocol/lufa/descriptor.c b/protocol/lufa/descriptor.c
index d3f740bfe6..3c98819ff7 100644
--- a/protocol/lufa/descriptor.c
+++ b/protocol/lufa/descriptor.c
@@ -155,9 +155,9 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM ExtraReport[] =
HID_RI_USAGE(8, 0x80), /* System Control */
HID_RI_COLLECTION(8, 0x01), /* Application */
HID_RI_REPORT_ID(8, REPORT_ID_SYSTEM),
- HID_RI_LOGICAL_MINIMUM(16, 0x0081),
+ HID_RI_LOGICAL_MINIMUM(16, 0x0001),
HID_RI_LOGICAL_MAXIMUM(16, 0x00B7),
- HID_RI_USAGE_MINIMUM(16, 0x0081), /* System Power Down */
+ HID_RI_USAGE_MINIMUM(16, 0x0001), /* System Power Down */
HID_RI_USAGE_MAXIMUM(16, 0x00B7), /* System Display LCD Autoscale */
HID_RI_REPORT_SIZE(8, 16),
HID_RI_REPORT_COUNT(8, 1),
@@ -168,9 +168,9 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM ExtraReport[] =
HID_RI_USAGE(8, 0x01), /* Consumer Control */
HID_RI_COLLECTION(8, 0x01), /* Application */
HID_RI_REPORT_ID(8, REPORT_ID_CONSUMER),
- HID_RI_LOGICAL_MINIMUM(16, 0x0010),
+ HID_RI_LOGICAL_MINIMUM(16, 0x0001),
HID_RI_LOGICAL_MAXIMUM(16, 0x029C),
- HID_RI_USAGE_MINIMUM(16, 0x0010), /* +10 */
+ HID_RI_USAGE_MINIMUM(16, 0x0001), /* +10 */
HID_RI_USAGE_MAXIMUM(16, 0x029C), /* AC Distribute Vertically */
HID_RI_REPORT_SIZE(8, 16),
HID_RI_REPORT_COUNT(8, 1),