Adding basic mouse button support

[kiibohd-controller.git] / Output / pjrcUSB / arm / usb_desc.c

diff --git a/Output/pjrcUSB/arm/usb_desc.c b/Output/pjrcUSB/arm/usb_desc.c
index b7cb7357692d7f020df89f92d03bfc1326d2d23e..02ffd5da224bdea56379570425a38a5b5ee18b77 100644 (file)
--- a/Output/pjrcUSB/arm/usb_desc.c
+++ b/Output/pjrcUSB/arm/usb_desc.c
@@ -1,7 +1,7 @@
 /* Teensyduino Core Library
  * http://www.pjrc.com/teensy/
  * Copyright (c) 2013 PJRC.COM, LLC.
- * Modified by Jacob Alexander (2013-2015)
+ * Modified by Jacob Alexander (2013-2016)
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -314,22 +314,17 @@ static uint8_t mouse_report_desc[] = {
        0xa1, 0x02,        //   Collection (Logical)
        0x09, 0x01,        //     Usage (Pointer)
 
-       // Buttons (5 bits)
+       // Buttons (8 bits)
        0xa1, 0x00,        //     Collection (Physical) - Buttons
        0x05, 0x09,        //       Usage Page (Button)
        0x19, 0x01,        //       Usage Minimum (Button 1)
-       0x29, 0x05,        //       Usage Maximum (Button 5)
+       0x29, 0x08,        //       Usage Maximum (Button 8)
        0x15, 0x00,        //       Logical Minimum (0)
        0x25, 0x01,        //       Logical Maximum (1)
        0x75, 0x01,        //       Report Size (1)
-       0x95, 0x05,        //       Report Count (5)
+       0x95, 0x08,        //       Report Count (8)
        0x81, 0x02,        //       Input (Data,Var,Abs)
 
-       // Padding (3 bits)
-       0x75, 0x03,        //       Report Size (3)
-       0x95, 0x01,        //       Report Count (1)
-       0x81, 0x03,        //       Input (Cnst,Var,Abs)
-
        // Pointer (16 bits)
        0x05, 0x01,        //       Usage PAGE (Generic Desktop)
        0x09, 0x30,        //       Usage (X)
@@ -451,7 +446,7 @@ static uint8_t config_descriptor[CONFIG_DESC_SIZE] = {
        1,                                      // bConfigurationValue
        0,                                      // iConfiguration
        0xA0,                                   // bmAttributes
-       250,                                    // bMaxPower
+       250,                                    // bMaxPower - Entry Index 8
 
 // --- Keyboard HID --- Boot Mode Keyboard Interface
 // - 9 bytes -
@@ -695,6 +690,8 @@ static uint8_t config_descriptor[CONFIG_DESC_SIZE] = {
        SYS_CTRL_INTERVAL,                      // bInterval
 };
 
+uint8_t *usb_bMaxPower = &config_descriptor[8];
+
 
 
 // ----- String Descriptors -----