sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into develop

Browse Source
This commit is contained in:
fauxpark
2021-01-01 05:09:50 +11:00
parent da8423ca97 53e9213a22
commit e3da93e658
33 changed files with 1071 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c
View File

@@ -83,7 +83,7 @@ UDC_DESC_STORAGE usb_dev_desc_t udc_device_desc = {.bLength = sizeof(usb
#ifdef USB_DEVICE_PRODUCT_NAME
.iProduct = 2,
#else
.iProduct = 0, // No product string
.iProduct = 0, // No product string
#endif
#if (defined USB_DEVICE_SERIAL_NAME || defined USB_DEVICE_GET_SERIAL_NAME_POINTER)
.iSerialNumber = 3,