Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
3a56e973ff
@ -24,7 +24,7 @@
|
||||
"usb": {
|
||||
"vid": "0xD772",
|
||||
"pid": "0x001A",
|
||||
"device_ver": "0x0001"
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT_all": {
|
||||
|
@ -23,7 +23,7 @@
|
||||
},
|
||||
"processor": "atmega32u4",
|
||||
"usb": {
|
||||
"device_ver": "0x0001",
|
||||
"device_version": "0.0.1",
|
||||
"pid": "0x0000",
|
||||
"vid": "0xFEED"
|
||||
},
|
||||
|
@ -16,7 +16,7 @@
|
||||
"usb": {
|
||||
"vid": "0x534E",
|
||||
"pid": "0x3031",
|
||||
"device_ver": "0x0001"
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
|
Loading…
Reference in New Issue
Block a user