X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Output%2FpjrcUSB%2Farm%2Fusb_desc.c;h=02ffd5da224bdea56379570425a38a5b5ee18b77;hb=3c9a97d51a2f3b94168e46ff1524ceec63703eff;hp=70ece51ca7345bc5ab52b936fffd28b28c7f7fea;hpb=7e68e81f4757ffff2261ab4a887d4114318aa5b6;p=kiibohd-controller.git

diff --git a/Output/pjrcUSB/arm/usb_desc.c b/Output/pjrcUSB/arm/usb_desc.c
index 70ece51..02ffd5d 100644
--- 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
@@ -297,10 +297,10 @@ static uint8_t sys_ctrl_report_desc[] = {
 	0x75, 0x10,          //   Report Size (16),
 	0x95, 0x01,          //   Report Count (1),
 	0x16, 0x01, 0x00,    //   Logical Minimum (1),
-	0x26, 0x9C, 0x02,    //   Logical Maximum (668),
+	0x26, 0x9D, 0x02,    //   Logical Maximum (669),
 	0x05, 0x0C,          //   Usage Page (Consumer),
 	0x19, 0x01,          //   Usage Minimum (1),
-	0x2A, 0x9C, 0x02,    //   Usage Maximum (668),
+	0x2A, 0x9D, 0x02,    //   Usage Maximum (669),
 	0x81, 0x00,          //   Input (Data, Array),
 	0xc0,                // End Collection - Consumer Control
 };
@@ -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 -----