diff options
| author | Takuya Urakawa <urkwtky@gmail.com> | 2019-03-13 03:48:17 +0900 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-03-12 11:48:17 -0700 |
| commit | 2f3dbb1253839fad1bb2e20db8ef7b88c5fd331a (patch) | |
| tree | 8c59947425e86f8432479d18de9cefe1768088d4 /tmk_core | |
| parent | 37932c293c15011f883a91e91ee02631ead44a2e (diff) | |
| download | qmk_firmware-2f3dbb1253839fad1bb2e20db8ef7b88c5fd331a.tar.gz qmk_firmware-2f3dbb1253839fad1bb2e20db8ef7b88c5fd331a.zip | |
Add new keyboard Plaid and ATMEGA328p support (#5379)
* add plaid
* Change usb vid/pid to free id from vusb
Trivial fix for vusb core
* update readme
* update info.json default keymap
* fix typo
* Replace copyright
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/protocol/vusb/usbdrv/usbdrv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/protocol/vusb/usbdrv/usbdrv.c b/tmk_core/protocol/vusb/usbdrv/usbdrv.c index 2e8dd8756..30cdc9dcf 100644 --- a/tmk_core/protocol/vusb/usbdrv/usbdrv.c +++ b/tmk_core/protocol/vusb/usbdrv/usbdrv.c | |||
| @@ -95,7 +95,7 @@ const PROGMEM int usbDescriptorStringDevice[] = { | |||
| 95 | #if USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER == 0 && USB_CFG_SERIAL_NUMBER_LEN | 95 | #if USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER == 0 && USB_CFG_SERIAL_NUMBER_LEN |
| 96 | #undef USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER | 96 | #undef USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER |
| 97 | #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER sizeof(usbDescriptorStringSerialNumber) | 97 | #define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER sizeof(usbDescriptorStringSerialNumber) |
| 98 | PROGMEM int usbDescriptorStringSerialNumber[] = { | 98 | const PROGMEM int usbDescriptorStringSerialNumber[] = { |
| 99 | USB_STRING_DESCRIPTOR_HEADER(USB_CFG_SERIAL_NUMBER_LEN), | 99 | USB_STRING_DESCRIPTOR_HEADER(USB_CFG_SERIAL_NUMBER_LEN), |
| 100 | USB_CFG_SERIAL_NUMBER | 100 | USB_CFG_SERIAL_NUMBER |
| 101 | }; | 101 | }; |