Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
8a58ad27a2
2 changed files with 1 additions and 3 deletions
|
@ -120,7 +120,6 @@
|
||||||
"matrix": [4, 7]
|
"matrix": [4, 7]
|
||||||
},
|
},
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"main": "matrix_grid",
|
|
||||||
"matrix_pins": {
|
"matrix_pins": {
|
||||||
"right": {
|
"right": {
|
||||||
"cols": ["GP7", "GP8", "GP9", "GP11", "GP12", "GP13", "GP14", "GP15"],
|
"cols": ["GP7", "GP8", "GP9", "GP11", "GP12", "GP13", "GP14", "GP15"],
|
||||||
|
|
|
@ -45,8 +45,7 @@
|
||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"split": {
|
"split": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
"soft_serial_pin": "D2",
|
"soft_serial_pin": "D2"
|
||||||
"main": "eeprom"
|
|
||||||
},
|
},
|
||||||
"development_board": "promicro",
|
"development_board": "promicro",
|
||||||
"layouts": {
|
"layouts": {
|
||||||
|
|
Loading…
Reference in a new issue