# HG changeset patch
# User Jacob Alexander <haata@kiibohd.com>
# Date 1414878175 25200
# Node ID 02cdd66d8856391baeeeb1adf71ef39c4ea03b43
# Parent  68d2e5c96e72097b8a511297d37a3499aa397230
Fixing pjrc bug affecting Mac OSX CDC driver

- Also updating usbMuxUart header with most recent keyboard defines

diff -r 68d2e5c96e72 -r 02cdd66d8856 Output/pjrcUSB/arm/usb_desc.c
--- 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
diff -r 68d2e5c96e72 -r 02cdd66d8856 Output/usbMuxUart/output_com.h
--- 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;