preonic/rev3{,_drop}: Fix layouts with 2u keys (#21114)

Apparently layouts with 2u keys were not correctly converted into the
`info.json` format (the old C layout macros used the arguments for such
keys multiple times to cover all possible 1u locations; this is not
supported in `info.json`, and the single matrix location for 2u keys was
chosen incorrectly in some cases).  Fix the layout definitions to match
the real PCB wiring.
master
Sergey Vlasov 2023-06-18 14:38:09 +03:00 committed by GitHub
parent 884be6c1ba
commit b520b352f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -90,7 +90,7 @@
{"matrix": [8, 2], "x": 2, "y": 4}, {"matrix": [8, 2], "x": 2, "y": 4},
{"matrix": [9, 3], "x": 3, "y": 4}, {"matrix": [9, 3], "x": 3, "y": 4},
{"matrix": [9, 4], "x": 4, "y": 4}, {"matrix": [9, 4], "x": 4, "y": 4},
{"matrix": [9, 5], "x": 5, "y": 4, "w": 2}, {"matrix": [9, 0], "x": 5, "y": 4, "w": 2},
{"matrix": [9, 1], "x": 7, "y": 4}, {"matrix": [9, 1], "x": 7, "y": 4},
{"matrix": [9, 2], "x": 8, "y": 4}, {"matrix": [9, 2], "x": 8, "y": 4},
{"matrix": [8, 3], "x": 9, "y": 4}, {"matrix": [8, 3], "x": 9, "y": 4},
@ -223,7 +223,7 @@
{"matrix": [8, 1], "x": 1, "y": 4}, {"matrix": [8, 1], "x": 1, "y": 4},
{"matrix": [8, 2], "x": 2, "y": 4}, {"matrix": [8, 2], "x": 2, "y": 4},
{"matrix": [9, 3], "x": 3, "y": 4}, {"matrix": [9, 3], "x": 3, "y": 4},
{"matrix": [9, 4], "x": 4, "y": 4, "w": 2}, {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
{"matrix": [9, 0], "x": 6, "y": 4}, {"matrix": [9, 0], "x": 6, "y": 4},
{"matrix": [9, 1], "x": 7, "y": 4}, {"matrix": [9, 1], "x": 7, "y": 4},
{"matrix": [9, 2], "x": 8, "y": 4}, {"matrix": [9, 2], "x": 8, "y": 4},
@ -290,8 +290,8 @@
{"matrix": [8, 1], "x": 1, "y": 4}, {"matrix": [8, 1], "x": 1, "y": 4},
{"matrix": [8, 2], "x": 2, "y": 4}, {"matrix": [8, 2], "x": 2, "y": 4},
{"matrix": [9, 3], "x": 3, "y": 4}, {"matrix": [9, 3], "x": 3, "y": 4},
{"matrix": [9, 4], "x": 4, "y": 4, "w": 2}, {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
{"matrix": [9, 0], "x": 6, "y": 4, "w": 2}, {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
{"matrix": [9, 2], "x": 8, "y": 4}, {"matrix": [9, 2], "x": 8, "y": 4},
{"matrix": [8, 3], "x": 9, "y": 4}, {"matrix": [8, 3], "x": 9, "y": 4},
{"matrix": [8, 4], "x": 10, "y": 4}, {"matrix": [8, 4], "x": 10, "y": 4},

View File

@ -89,7 +89,7 @@
{"matrix": [8, 2], "x": 2, "y": 4}, {"matrix": [8, 2], "x": 2, "y": 4},
{"matrix": [9, 3], "x": 3, "y": 4}, {"matrix": [9, 3], "x": 3, "y": 4},
{"matrix": [9, 4], "x": 4, "y": 4}, {"matrix": [9, 4], "x": 4, "y": 4},
{"matrix": [9, 5], "x": 5, "y": 4, "w": 2}, {"matrix": [9, 0], "x": 5, "y": 4, "w": 2},
{"matrix": [9, 1], "x": 7, "y": 4}, {"matrix": [9, 1], "x": 7, "y": 4},
{"matrix": [9, 2], "x": 8, "y": 4}, {"matrix": [9, 2], "x": 8, "y": 4},
{"matrix": [8, 3], "x": 9, "y": 4}, {"matrix": [8, 3], "x": 9, "y": 4},
@ -290,7 +290,7 @@
{"matrix": [8, 2], "x": 2, "y": 4}, {"matrix": [8, 2], "x": 2, "y": 4},
{"matrix": [9, 3], "x": 3, "y": 4}, {"matrix": [9, 3], "x": 3, "y": 4},
{"matrix": [9, 5], "x": 4, "y": 4, "w": 2}, {"matrix": [9, 5], "x": 4, "y": 4, "w": 2},
{"matrix": [9, 0], "x": 6, "y": 4, "w": 2}, {"matrix": [9, 1], "x": 6, "y": 4, "w": 2},
{"matrix": [9, 2], "x": 8, "y": 4}, {"matrix": [9, 2], "x": 8, "y": 4},
{"matrix": [8, 3], "x": 9, "y": 4}, {"matrix": [8, 3], "x": 9, "y": 4},
{"matrix": [8, 4], "x": 10, "y": 4}, {"matrix": [8, 4], "x": 10, "y": 4},