Mercurial > louis > kiibohd-controller

changeset 245:02cdd66d8856

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing pjrc bug affecting Mac OSX CDC driver - Also updating usbMuxUart header with most recent keyboard defines
author Jacob Alexander <haata@kiibohd.com>
date Sat, 01 Nov 2014 14:42:55 -0700
parents 68d2e5c96e72
children f23f6cff7ef8
files Output/pjrcUSB/arm/usb_desc.c Output/usbMuxUart/output_com.h
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Output/pjrcUSB/arm/usb_desc.c	Mon Oct 27 00:26:17 2014 -0700
+++ b/Output/pjrcUSB/arm/usb_desc.c	Sat Nov 01 14:42:55 2014 -0700
@@ -435,7 +435,7 @@
         0x24,                                   // bDescriptorType
         0x01,                                   // bDescriptorSubtype
         0x01,                                   // bmCapabilities
-        1,                                      // bDataInterface
+        CDC_DATA_INTERFACE,                     // bDataInterface
 // - 4 bytes -
         // Abstract Control Management Functional Descriptor, CDC Spec 5.2.3.3, Table 28
         4,                                      // bFunctionLength
--- a/Output/usbMuxUart/output_com.h	Mon Oct 27 00:26:17 2014 -0700
+++ b/Output/usbMuxUart/output_com.h	Sat Nov 01 14:42:55 2014 -0700
@@ -50,8 +50,10 @@
 	USBKeyChangeState_Modifiers     = 0x01,
 	USBKeyChangeState_MainKeys      = 0x02,
 	USBKeyChangeState_SecondaryKeys = 0x04,
-	USBKeyChangeState_System        = 0x08,
-	USBKeyChangeState_Consumer      = 0x10,
+	USBKeyChangeState_TertiaryKeys  = 0x08,
+	USBKeyChangeState_System        = 0x10,
+	USBKeyChangeState_Consumer      = 0x20,
+	USBKeyChangeState_All           = 0x3F,
 } USBKeyChangeState;