marco/qmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Keyboard] Fix merge error with fave84 board (#19808)

Browse Source
This commit is contained in:
Drashna Jaelre 2023-02-10 20:12:35 -08:00 committed by GitHub
parent 11d49d00e7
commit 34bc896cf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
keyboards/linworks/fave84h/info.json
View File

@ -2,6 +2,7 @@
"manufacturer": "Lx3", "manufacturer": "Lx3",
"keyboard_name": "FAve 84H", "keyboard_name": "FAve 84H",
"maintainer": "ToastyStoemp", "maintainer": "ToastyStoemp",
"processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"diode_direction": "COL2ROW", "diode_direction": "COL2ROW",
"features": { "features": {
@ -18,7 +19,6 @@
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"], "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B0", "B7", "E6"],
"rows": ["B1", "B2", "B3", "D3", "D1", "D0"] "rows": ["B1", "B2", "B3", "D3", "D1", "D0"]
}, },
"processor": "atmega32u4",
"rgb_matrix": { "rgb_matrix": {
"driver": "WS2812", "driver": "WS2812",
"layout": [ "layout": [
@ -156,8 +156,6 @@
"pid": "0x0004", "pid": "0x0004",
"vid": "0x4C58" "vid": "0x4C58"
}, },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": [ "community_layouts": [
"tkl_ansi_tsangan" "tkl_ansi_tsangan"
], ],
@ -180,7 +178,7 @@
{ "matrix": [0, 14], "x": 15.25, "y": 0 }, { "matrix": [0, 14], "x": 15.25, "y": 0 },
{ "matrix": [0, 15], "x": 16.25, "y": 0 }, { "matrix": [0, 15], "x": 16.25, "y": 0 },
{ "matrix": [0, 16], "x": 17.25, "y": 0 }, { "matrix": [0, 16], "x": 17.25, "y": 0 },
{ "matrix": [1, 0], "x": 0, "y": 1.25 }, { "matrix": [1, 0], "x": 0, "y": 1.25 },
{ "matrix": [1, 1], "x": 1, "y": 1.25 }, { "matrix": [1, 1], "x": 1, "y": 1.25 },
{ "matrix": [1, 2], "x": 2, "y": 1.25 }, { "matrix": [1, 2], "x": 2, "y": 1.25 },
@ -276,7 +274,7 @@
{ "matrix": [0, 14], "x": 15.25, "y": 0 }, { "matrix": [0, 14], "x": 15.25, "y": 0 },
{ "matrix": [0, 15], "x": 16.25, "y": 0 }, { "matrix": [0, 15], "x": 16.25, "y": 0 },
{ "matrix": [0, 16], "x": 17.25, "y": 0 }, { "matrix": [0, 16], "x": 17.25, "y": 0 },
{ "matrix": [1, 0], "x": 0, "y": 1.25 }, { "matrix": [1, 0], "x": 0, "y": 1.25 },
{ "matrix": [1, 1], "x": 1, "y": 1.25 }, { "matrix": [1, 1], "x": 1, "y": 1.25 },
{ "matrix": [1, 2], "x": 2, "y": 1.25 }, { "matrix": [1, 2], "x": 2, "y": 1.25 },
@ -340,7 +338,7 @@
{ "matrix": [4, 10], "x": 11.25, "y": 4.25 }, { "matrix": [4, 10], "x": 11.25, "y": 4.25 },
{ "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.25 }, { "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.25 },
{ "matrix": [4, 15], "x": 16.25, "y": 4.25 }, { "matrix": [4, 15], "x": 16.25, "y": 4.25 },
{ "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 }, { "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
{ "matrix": [5, 1], "x": 1.5, "y": 5.25 }, { "matrix": [5, 1], "x": 1.5, "y": 5.25 },
{ "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 }, { "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
@ -354,4 +352,4 @@
] ]
} }
} }
} }