Browse Source

Fixing pjrc bug affecting Mac OSX CDC driver

- Also updating usbMuxUart header with most recent keyboard defines
simple
Jacob Alexander 9 years ago
parent
commit
e251a8be50
2 changed files with 5 additions and 3 deletions
  1. 1
    1
      Output/pjrcUSB/arm/usb_desc.c
  2. 4
    2
      Output/usbMuxUart/output_com.h

+ 1
- 1
Output/pjrcUSB/arm/usb_desc.c View File

@@ -435,7 +435,7 @@ static uint8_t config_descriptor[CONFIG_DESC_SIZE] = {
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

+ 4
- 2
Output/usbMuxUart/output_com.h View File

@@ -50,8 +50,10 @@ typedef enum USBKeyChangeState {
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;