Jacob Alexander
9 years ago
5 changed files with 9 additions and 8 deletions
+ 2
- 1
CMakeLists.txt
View File
| @@ -92,7 +92,8 @@ set( BaseMap "defaultMap" ) | |||
| ##| Layer additonal .kll maps on the BaseMap, layers are in order from 1st to nth | |||
| ##| Can be set to "" | |||
| set( DefaultMap "colemak stdFuncMap" ) | |||
| set( DefaultMap "stdFuncMap" ) | |||
| #set( DefaultMap "colemak stdFuncMap" ) | |||
| ##| ParitalMaps available on top of the BaseMap. See above for syntax on specifying multiple layers vs. layering | |||
| ##| Can be set to "" | |||
+ 2
- 2
Lib/_buildvars.h
View File
| @@ -29,8 +29,8 @@ | |||
| // ----- Defines ----- | |||
| // You can change these to give your code its own name. | |||
| #define STR_MANUFACTURER L"@MANUFACTURER@" | |||
| #define STR_PRODUCT L"Keyboard - @ScanModule@ @MacroModule@ @OutputModule@ @DebugModule@" | |||
| #define STR_MANUFACTURER L"@MANUFACTURER@" | |||
| #define STR_PRODUCT L"Keyboard - @ScanModule@ @MacroModule@ @OutputModule@ @DebugModule@" | |||
| #define STR_SERIAL L"@GitLastCommitDate@" | |||
+ 3
- 3
Output/pjrcUSB/arm/usb_desc.c
View File
| @@ -75,7 +75,7 @@ static uint8_t device_qualifier_descriptor[] = { | |||
| DEVICE_SUBCLASS, // bDeviceSubClass | |||
| DEVICE_PROTOCOL, // bDeviceProtocol | |||
| EP0_SIZE, // bMaxPacketSize0 | |||
| 1, // bNumOtherSpeedConfigurations | |||
| 0, // bNumOtherSpeedConfigurations | |||
| 0 // bReserved | |||
| */ | |||
| }; | |||
| @@ -311,7 +311,7 @@ static uint8_t config_descriptor[CONFIG_DESC_SIZE] = { | |||
| NUM_INTERFACE, // bNumInterfaces | |||
| 1, // bConfigurationValue | |||
| 0, // iConfiguration | |||
| 0xC0, // bmAttributes | |||
| 0xA0, // bmAttributes | |||
| 250, // bMaxPower | |||
| // --- Keyboard HID --- Boot Mode Keyboard Interface | |||
| @@ -386,7 +386,7 @@ static uint8_t config_descriptor[CONFIG_DESC_SIZE] = { | |||
| 0x02, // bFunctionClass | |||
| 0x02, // bFunctionSubClass | |||
| 0x01, // bFunctionProtocol | |||
| 4, // iFunction | |||
| 0, // iFunction | |||
| // --- Serial CDC --- CDC Data Interface | |||
| // - 9 bytes - | |||
+ 1
- 1
Output/pjrcUSB/arm/usb_desc.h
View File
| @@ -51,7 +51,7 @@ | |||
| #define ENDPOINT_TRANSMIT_AND_RECEIVE 0x1D | |||
| #define DEVICE_CLASS 0x03 // 0x03 = HID Class | |||
| #define DEVICE_CLASS 0x00 // Keep 0x00 to indicate each sub device will indicate what it is | |||
| #define DEVICE_SUBCLASS 0x00 | |||
| #define DEVICE_PROTOCOL 0x00 | |||
| #define EP0_SIZE 64 | |||
+ 1
- 1
Output/pjrcUSB/avr/usb_keyboard_serial.h
View File
| @@ -260,7 +260,7 @@ static const uint8_t PROGMEM device_descriptor[] = { | |||
| 18, // bLength | |||
| 1, // bDescriptorType | |||
| 0x00, 0x02, // bcdUSB | |||
| 0x03, // bDeviceClass - 0x03 = HID Class | |||
| 0x00, // bDeviceClass - Composite device, 0x00 is required for Windows | |||
| 0, // bDeviceSubClass | |||
| 0, // bDeviceProtocol | |||
| ENDPOINT0_SIZE, // bMaxPacketSize0 | |||