summaryrefslogtreecommitdiff
path: root/keyboards/omkbd/ergodash/rev1
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-30 01:51:45 +1000
committerGitHub <noreply@github.com>2023-04-30 01:51:45 +1000
commit998a4d744e60d7d769ddabad1bc8653314f02b02 (patch)
tree8040bfd3cd910fb0f6416dc65d88564593e9046b /keyboards/omkbd/ergodash/rev1
parent03328ea7a88995138e0696304738d10942f55129 (diff)
Remove `FLIP_HALF` layouts and move to data driven (#20588)
Diffstat (limited to 'keyboards/omkbd/ergodash/rev1')
-rw-r--r--keyboards/omkbd/ergodash/rev1/info.json789
-rw-r--r--keyboards/omkbd/ergodash/rev1/rev1.c2
-rw-r--r--keyboards/omkbd/ergodash/rev1/rev1.h129
3 files changed, 391 insertions, 529 deletions
diff --git a/keyboards/omkbd/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json
index 8e357b326b..1ec059bd82 100644
--- a/keyboards/omkbd/ergodash/rev1/info.json
+++ b/keyboards/omkbd/ergodash/rev1/info.json
@@ -23,424 +23,415 @@
"ws2812": {
"pin": "D3"
},
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_4key"
+ },
"layouts": {
"LAYOUT_4key": {
"layout": [
- {"x": 0, "y": 0.375},
- {"x": 1, "y": 0.375},
- {"x": 2, "y": 0.125},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0.125},
- {"x": 5, "y": 0.25},
- {"x": 6, "y": 0.75},
-
- {"x": 11.5, "y": 0.75},
- {"x": 12.5, "y": 0.25},
- {"x": 13.5, "y": 0.125},
- {"x": 14.5, "y": 0},
- {"x": 15.5, "y": 0.125},
- {"x": 16.5, "y": 0.375},
- {"x": 17.5, "y": 0.375},
-
- {"x": 0, "y": 1.375},
- {"x": 1, "y": 1.375},
- {"x": 2, "y": 1.125},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1.125},
- {"x": 5, "y": 1.25},
- {"x": 6, "y": 1.75},
-
- {"x": 11.5, "y": 1.75},
- {"x": 12.5, "y": 1.25},
- {"x": 13.5, "y": 1.125},
- {"x": 14.5, "y": 1},
- {"x": 15.5, "y": 1.125},
- {"x": 16.5, "y": 1.375},
- {"x": 17.5, "y": 1.375},
-
- {"x": 0, "y": 2.375},
- {"x": 1, "y": 2.375},
- {"x": 2, "y": 2.125},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2.125},
- {"x": 5, "y": 2.25},
- {"x": 6, "y": 2.75},
-
- {"x": 11.5, "y": 2.75},
- {"x": 12.5, "y": 2.25},
- {"x": 13.5, "y": 2.125},
- {"x": 14.5, "y": 2},
- {"x": 15.5, "y": 2.125},
- {"x": 16.5, "y": 2.375},
- {"x": 17.5, "y": 2.375},
-
- {"x": 0, "y": 3.375},
- {"x": 1, "y": 3.375},
- {"x": 2, "y": 3.125},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3.125},
- {"x": 5, "y": 3.25},
- {"x": 6, "y": 4},
-
- {"x": 11.5, "y": 4},
- {"x": 12.5, "y": 3.25},
- {"x": 13.5, "y": 3.125},
- {"x": 14.5, "y": 3},
- {"x": 15.5, "y": 3.125},
- {"x": 16.5, "y": 3.375},
- {"x": 17.5, "y": 3.375},
-
- {"x": 0, "y": 4.375},
- {"x": 1, "y": 4.375},
- {"x": 2, "y": 4.125},
- {"x": 3, "y": 4},
-
- {"x": 5, "y": 5},
- {"x": 6, "y": 5},
- {"x": 7, "y": 4, "h": 2},
-
- {"x": 10.5, "y": 4, "h": 2},
- {"x": 11.5, "y": 5},
- {"x": 12.5, "y": 5},
-
- {"x": 14.5, "y": 4},
- {"x": 15.5, "y": 4.125},
- {"x": 16.5, "y": 4.375},
- {"x": 17.5, "y": 4.375}
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.75},
+
+ {"matrix": [5, 6], "x": 11.5, "y": 0.75},
+ {"matrix": [5, 5], "x": 12.5, "y": 0.25},
+ {"matrix": [5, 4], "x": 13.5, "y": 0.125},
+ {"matrix": [5, 3], "x": 14.5, "y": 0},
+ {"matrix": [5, 2], "x": 15.5, "y": 0.125},
+ {"matrix": [5, 1], "x": 16.5, "y": 0.375},
+ {"matrix": [5, 0], "x": 17.5, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.75},
+
+ {"matrix": [6, 6], "x": 11.5, "y": 1.75},
+ {"matrix": [6, 5], "x": 12.5, "y": 1.25},
+ {"matrix": [6, 4], "x": 13.5, "y": 1.125},
+ {"matrix": [6, 3], "x": 14.5, "y": 1},
+ {"matrix": [6, 2], "x": 15.5, "y": 1.125},
+ {"matrix": [6, 1], "x": 16.5, "y": 1.375},
+ {"matrix": [6, 0], "x": 17.5, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.75},
+
+ {"matrix": [7, 6], "x": 11.5, "y": 2.75},
+ {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+ {"matrix": [7, 4], "x": 13.5, "y": 2.125},
+ {"matrix": [7, 3], "x": 14.5, "y": 2},
+ {"matrix": [7, 2], "x": 15.5, "y": 2.125},
+ {"matrix": [7, 1], "x": 16.5, "y": 2.375},
+ {"matrix": [7, 0], "x": 17.5, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6, "y": 4},
+
+ {"matrix": [8, 6], "x": 11.5, "y": 4},
+ {"matrix": [8, 5], "x": 12.5, "y": 3.25},
+ {"matrix": [8, 4], "x": 13.5, "y": 3.125},
+ {"matrix": [8, 3], "x": 14.5, "y": 3},
+ {"matrix": [8, 2], "x": 15.5, "y": 3.125},
+ {"matrix": [8, 1], "x": 16.5, "y": 3.375},
+ {"matrix": [8, 0], "x": 17.5, "y": 3.375},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.375},
+ {"matrix": [4, 1], "x": 1, "y": 4.375},
+ {"matrix": [4, 2], "x": 2, "y": 4.125},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 5},
+ {"matrix": [4, 5], "x": 6, "y": 5},
+ {"matrix": [4, 6], "x": 7, "y": 4, "h": 2},
+
+ {"matrix": [9, 6], "x": 10.5, "y": 4, "h": 2},
+ {"matrix": [9, 5], "x": 11.5, "y": 5},
+ {"matrix": [9, 4], "x": 12.5, "y": 5},
+ {"matrix": [9, 3], "x": 14.5, "y": 4},
+ {"matrix": [9, 2], "x": 15.5, "y": 4.125},
+ {"matrix": [9, 1], "x": 16.5, "y": 4.375},
+ {"matrix": [9, 0], "x": 17.5, "y": 4.375}
]
},
"LAYOUT_4key_2u_inner": {
"layout": [
- {"x": 0, "y": 0.375},
- {"x": 1, "y": 0.375},
- {"x": 2, "y": 0.125},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0.125},
- {"x": 5, "y": 0.25},
- {"x": 6, "y": 0.75},
-
- {"x": 11.5, "y": 0.75},
- {"x": 12.5, "y": 0.25},
- {"x": 13.5, "y": 0.125},
- {"x": 14.5, "y": 0},
- {"x": 15.5, "y": 0.125},
- {"x": 16.5, "y": 0.375},
- {"x": 17.5, "y": 0.375},
-
- {"x": 0, "y": 1.375},
- {"x": 1, "y": 1.375},
- {"x": 2, "y": 1.125},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1.125},
- {"x": 5, "y": 1.25},
- {"x": 6, "y": 1.75},
-
- {"x": 11.5, "y": 1.75},
- {"x": 12.5, "y": 1.25},
- {"x": 13.5, "y": 1.125},
- {"x": 14.5, "y": 1},
- {"x": 15.5, "y": 1.125},
- {"x": 16.5, "y": 1.375},
- {"x": 17.5, "y": 1.375},
-
- {"x": 0, "y": 2.375},
- {"x": 1, "y": 2.375},
- {"x": 2, "y": 2.125},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2.125},
- {"x": 5, "y": 2.25},
- {"x": 6, "y": 2.75},
-
- {"x": 11.5, "y": 2.75},
- {"x": 12.5, "y": 2.25},
- {"x": 13.5, "y": 2.125},
- {"x": 14.5, "y": 2},
- {"x": 15.5, "y": 2.125},
- {"x": 16.5, "y": 2.375},
- {"x": 17.5, "y": 2.375},
-
- {"x": 0, "y": 3.375},
- {"x": 1, "y": 3.375},
- {"x": 2, "y": 3.125},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3.125},
- {"x": 5, "y": 3.25},
-
- {"x": 7, "y": 4},
-
- {"x": 10.5, "y": 4},
-
- {"x": 12.5, "y": 3.25},
- {"x": 13.5, "y": 3.125},
- {"x": 14.5, "y": 3},
- {"x": 15.5, "y": 3.125},
- {"x": 16.5, "y": 3.375},
- {"x": 17.5, "y": 3.375},
-
- {"x": 0, "y": 4.375},
- {"x": 1, "y": 4.375},
- {"x": 2, "y": 4.125},
- {"x": 3, "y": 4},
-
- {"x": 5, "y": 5},
- {"x": 6, "y": 4, "h": 2},
- {"x": 7, "y": 5},
-
- {"x": 10.5, "y": 5},
- {"x": 11.5, "y": 4, "h": 2},
- {"x": 12.5, "y": 5},
-
- {"x": 14.5, "y": 4},
- {"x": 15.5, "y": 4.125},
- {"x": 16.5, "y": 4.375},
- {"x": 17.5, "y": 4.375}
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.75},
+
+ {"matrix": [5, 6], "x": 11.5, "y": 0.75},
+ {"matrix": [5, 5], "x": 12.5, "y": 0.25},
+ {"matrix": [5, 4], "x": 13.5, "y": 0.125},
+ {"matrix": [5, 3], "x": 14.5, "y": 0},
+ {"matrix": [5, 2], "x": 15.5, "y": 0.125},
+ {"matrix": [5, 1], "x": 16.5, "y": 0.375},
+ {"matrix": [5, 0], "x": 17.5, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.75},
+
+ {"matrix": [6, 6], "x": 11.5, "y": 1.75},
+ {"matrix": [6, 5], "x": 12.5, "y": 1.25},
+ {"matrix": [6, 4], "x": 13.5, "y": 1.125},
+ {"matrix": [6, 3], "x": 14.5, "y": 1},
+ {"matrix": [6, 2], "x": 15.5, "y": 1.125},
+ {"matrix": [6, 1], "x": 16.5, "y": 1.375},
+ {"matrix": [6, 0], "x": 17.5, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.75},
+
+ {"matrix": [7, 6], "x": 11.5, "y": 2.75},
+ {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+ {"matrix": [7, 4], "x": 13.5, "y": 2.125},
+ {"matrix": [7, 3], "x": 14.5, "y": 2},
+ {"matrix": [7, 2], "x": 15.5, "y": 2.125},
+ {"matrix": [7, 1], "x": 16.5, "y": 2.375},
+ {"matrix": [7, 0], "x": 17.5, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [3, 6], "x": 7, "y": 4},
+
+ {"matrix": [8, 6], "x": 10.5, "y": 4},
+ {"matrix": [8, 5], "x": 12.5, "y": 3.25},
+ {"matrix": [8, 4], "x": 13.5, "y": 3.125},
+ {"matrix": [8, 3], "x": 14.5, "y": 3},
+ {"matrix": [8, 2], "x": 15.5, "y": 3.125},
+ {"matrix": [8, 1], "x": 16.5, "y": 3.375},
+ {"matrix": [8, 0], "x": 17.5, "y": 3.375},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.375},
+ {"matrix": [4, 1], "x": 1, "y": 4.375},
+ {"matrix": [4, 2], "x": 2, "y": 4.125},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 5},
+ {"matrix": [4, 5], "x": 6, "y": 4, "h": 2},
+ {"matrix": [4, 6], "x": 7, "y": 5},
+
+ {"matrix": [9, 6], "x": 10.5, "y": 5},
+ {"matrix": [9, 5], "x": 11.5, "y": 4, "h": 2},
+ {"matrix": [9, 4], "x": 12.5, "y": 5},
+ {"matrix": [9, 3], "x": 14.5, "y": 4},
+ {"matrix": [9, 2], "x": 15.5, "y": 4.125},
+ {"matrix": [9, 1], "x": 16.5, "y": 4.375},
+ {"matrix": [9, 0], "x": 17.5, "y": 4.375}
]
},
"LAYOUT_3key_2us": {
"layout": [
- {"x": 0, "y": 0.375},
- {"x": 1, "y": 0.375},
- {"x": 2, "y": 0.125},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0.125},
- {"x": 5, "y": 0.25},
- {"x": 6, "y": 0.75},
-
- {"x": 11.5, "y": 0.75},
- {"x": 12.5, "y": 0.25},
- {"x": 13.5, "y": 0.125},
- {"x": 14.5, "y": 0},
- {"x": 15.5, "y": 0.125},
- {"x": 16.5, "y": 0.375},
- {"x": 17.5, "y": 0.375},
-
- {"x": 0, "y": 1.375},
- {"x": 1, "y": 1.375},
- {"x": 2, "y": 1.125},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1.125},
- {"x": 5, "y": 1.25},
- {"x": 6, "y": 1.75},
-
- {"x": 11.5, "y": 1.75},
- {"x": 12.5, "y": 1.25},
- {"x": 13.5, "y": 1.125},
- {"x": 14.5, "y": 1},
- {"x": 15.5, "y": 1.125},
- {"x": 16.5, "y": 1.375},
- {"x": 17.5, "y": 1.375},
-
- {"x": 0, "y": 2.375},
- {"x": 1, "y": 2.375},
- {"x": 2, "y": 2.125},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2.125},
- {"x": 5, "y": 2.25},
- {"x": 6, "y": 2.75},
-
- {"x": 11.5, "y": 2.75},
- {"x": 12.5, "y": 2.25},
- {"x": 13.5, "y": 2.125},
- {"x": 14.5, "y": 2},
- {"x": 15.5, "y": 2.125},
- {"x": 16.5, "y": 2.375},
- {"x": 17.5, "y": 2.375},
-
- {"x": 0, "y": 3.375},
- {"x": 1, "y": 3.375},
- {"x": 2, "y": 3.125},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3.125},
- {"x": 5, "y": 3.25},
-
- {"x": 12.5, "y": 3.25},
- {"x": 13.5, "y": 3.125},
- {"x": 14.5, "y": 3},
- {"x": 15.5, "y": 3.125},
- {"x": 16.5, "y": 3.375},
- {"x": 17.5, "y": 3.375},
-
- {"x": 0, "y": 4.375},
- {"x": 1, "y": 4.375},
- {"x": 2, "y": 4.125},
- {"x": 3, "y": 4},
-
- {"x": 5, "y": 5},
- {"x": 6, "y": 4, "h": 2},
- {"x": 7, "y": 4, "h": 2},
-
- {"x": 10.5, "y": 4, "h": 2},
- {"x": 11.5, "y": 4, "h": 2},
- {"x": 12.5, "y": 5},
-
- {"x": 14.5, "y": 4},
- {"x": 15.5, "y": 4.125},
- {"x": 16.5, "y": 4.375},
- {"x": 17.5, "y": 4.375}
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.75},
+
+ {"matrix": [5, 6], "x": 11.5, "y": 0.75},
+ {"matrix": [5, 5], "x": 12.5, "y": 0.25},
+ {"matrix": [5, 4], "x": 13.5, "y": 0.125},
+ {"matrix": [5, 3], "x": 14.5, "y": 0},
+ {"matrix": [5, 2], "x": 15.5, "y": 0.125},
+ {"matrix": [5, 1], "x": 16.5, "y": 0.375},
+ {"matrix": [5, 0], "x": 17.5, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.75},
+
+ {"matrix": [6, 6], "x": 11.5, "y": 1.75},
+ {"matrix": [6, 5], "x": 12.5, "y": 1.25},
+ {"matrix": [6, 4], "x": 13.5, "y": 1.125},
+ {"matrix": [6, 3], "x": 14.5, "y": 1},
+ {"matrix": [6, 2], "x": 15.5, "y": 1.125},
+ {"matrix": [6, 1], "x": 16.5, "y": 1.375},
+ {"matrix": [6, 0], "x": 17.5, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.75},
+
+ {"matrix": [7, 6], "x": 11.5, "y": 2.75},
+ {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+ {"matrix": [7, 4], "x": 13.5, "y": 2.125},
+ {"matrix": [7, 3], "x": 14.5, "y": 2},
+ {"matrix": [7, 2], "x": 15.5, "y": 2.125},
+ {"matrix": [7, 1], "x": 16.5, "y": 2.375},
+ {"matrix": [7, 0], "x": 17.5, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+ {"matrix": [8, 5], "x": 12.5, "y": 3.25},
+ {"matrix": [8, 4], "x": 13.5, "y": 3.125},
+ {"matrix": [8, 3], "x": 14.5, "y": 3},
+ {"matrix": [8, 2], "x": 15.5, "y": 3.125},
+ {"matrix": [8, 1], "x": 16.5, "y": 3.375},
+ {"matrix": [8, 0], "x": 17.5, "y": 3.375},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.375},
+ {"matrix": [4, 1], "x": 1, "y": 4.375},
+ {"matrix": [4, 2], "x": 2, "y": 4.125},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 5},
+ {"matrix": [4, 5], "x": 6, "y": 4, "h": 2},
+ {"matrix": [4, 6], "x": 7, "y": 4, "h": 2},
+
+ {"matrix": [9, 6], "x": 10.5, "y": 4, "h": 2},
+ {"matrix": [9, 5], "x": 11.5, "y": 4, "h": 2},
+ {"matrix": [9, 4], "x": 12.5, "y": 5},
+ {"matrix": [9, 3], "x": 14.5, "y": 4},
+ {"matrix": [9, 2], "x": 15.5, "y": 4.125},
+ {"matrix": [9, 1], "x": 16.5, "y": 4.375},
+ {"matrix": [9, 0], "x": 17.5, "y": 4.375}
]
},
"LAYOUT_3key_1us": {
"layout": [
- {"x": 0, "y": 0.375},
- {"x": 1, "y": 0.375},
- {"x": 2, "y": 0.125},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0.125},
- {"x": 5, "y": 0.25},
- {"x": 6, "y": 0.75},
-
- {"x": 11.5, "y": 0.75},
- {"x": 12.5, "y": 0.25},
- {"x": 13.5, "y": 0.125},
- {"x": 14.5, "y": 0},
- {"x": 15.5, "y": 0.125},
- {"x": 16.5, "y": 0.375},
- {"x": 17.5, "y": 0.375},
-
- {"x": 0, "y": 1.375},
- {"x": 1, "y": 1.375},
- {"x": 2, "y": 1.125},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1.125},
- {"x": 5, "y": 1.25},
- {"x": 6, "y": 1.75},
-
- {"x": 11.5, "y": 1.75},
- {"x": 12.5, "y": 1.25},
- {"x": 13.5, "y": 1.125},
- {"x": 14.5, "y": 1},
- {"x": 15.5, "y": 1.125},
- {"x": 16.5, "y": 1.375},
- {"x": 17.5, "y": 1.375},
-
- {"x": 0, "y": 2.375},
- {"x": 1, "y": 2.375},
- {"x": 2, "y": 2.125},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2.125},
- {"x": 5, "y": 2.25},
- {"x": 6, "y": 2.75},
-
- {"x": 11.5, "y": 2.75},
- {"x": 12.5, "y": 2.25},
- {"x": 13.5, "y": 2.125},
- {"x": 14.5, "y": 2},
- {"x": 15.5, "y": 2.125},
- {"x": 16.5, "y": 2.375},
- {"x": 17.5, "y": 2.375},
-
- {"x": 0, "y": 3.375},
- {"x": 1, "y": 3.375},
- {"x": 2, "y": 3.125},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3.125},
- {"x": 5, "y": 3.25},
- {"x": 6, "y": 4},
-
- {"x": 11.5, "y": 4},
- {"x": 12.5, "y": 3.25},
- {"x": 13.5, "y": 3.125},
- {"x": 14.5, "y": 3},
- {"x": 15.5, "y": 3.125},
- {"x": 16.5, "y": 3.375},
- {"x": 17.5, "y": 3.375},
-
- {"x": 0, "y": 4.375},
- {"x": 1, "y": 4.375},
- {"x": 2, "y": 4.125},
- {"x": 3, "y": 4},
-
- {"x": 5, "y": 5},
- {"x": 6, "y": 5},
-
- {"x": 11.5, "y": 5},
- {"x": 12.5, "y": 5},
-
- {"x": 14.5, "y": 4},
- {"x": 15.5, "y": 4.125},
- {"x": 16.5, "y": 4.375},
- {"x": 17.5, "y": 4.375}
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.75},
+
+ {"matrix": [5, 6], "x": 11.5, "y": 0.75},
+ {"matrix": [5, 5], "x": 12.5, "y": 0.25},
+ {"matrix": [5, 4], "x": 13.5, "y": 0.125},
+ {"matrix": [5, 3], "x": 14.5, "y": 0},
+ {"matrix": [5, 2], "x": 15.5, "y": 0.125},
+ {"matrix": [5, 1], "x": 16.5, "y": 0.375},
+ {"matrix": [5, 0], "x": 17.5, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.75},
+
+ {"matrix": [6, 6], "x": 11.5, "y": 1.75},
+ {"matrix": [6, 5], "x": 12.5, "y": 1.25},
+ {"matrix": [6, 4], "x": 13.5, "y": 1.125},
+ {"matrix": [6, 3], "x": 14.5, "y": 1},
+ {"matrix": [6, 2], "x": 15.5, "y": 1.125},
+ {"matrix": [6, 1], "x": 16.5, "y": 1.375},
+ {"matrix": [6, 0], "x": 17.5, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.75},
+
+ {"matrix": [7, 6], "x": 11.5, "y": 2.75},
+ {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+ {"matrix": [7, 4], "x": 13.5, "y": 2.125},
+ {"matrix": [7, 3], "x": 14.5, "y": 2},
+ {"matrix": [7, 2], "x": 15.5, "y": 2.125},
+ {"matrix": [7, 1], "x": 16.5, "y": 2.375},
+ {"matrix": [7, 0], "x": 17.5, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6, "y": 4},
+
+ {"matrix": [8, 6], "x": 11.5, "y": 4},
+ {"matrix": [8, 5], "x": 12.5, "y": 3.25},
+ {"matrix": [8, 4], "x": 13.5, "y": 3.125},
+ {"matrix": [8, 3], "x": 14.5, "y": 3},
+ {"matrix": [8, 2], "x": 15.5, "y": 3.125},
+ {"matrix": [8, 1], "x": 16.5, "y": 3.375},
+ {"matrix": [8, 0], "x": 17.5, "y": 3.375},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.375},
+ {"matrix": [4, 1], "x": 1, "y": 4.375},
+ {"matrix": [4, 2], "x": 2, "y": 4.125},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 5},
+ {"matrix": [4, 5], "x": 6, "y": 5},
+
+ {"matrix": [9, 5], "x": 11.5, "y": 5},
+ {"matrix": [9, 4], "x": 12.5, "y": 5},
+ {"matrix": [9, 3], "x": 14.5, "y": 4},
+ {"matrix": [9, 2], "x": 15.5, "y": 4.125},
+ {"matrix": [9, 1], "x": 16.5, "y": 4.375},
+ {"matrix": [9, 0], "x": 17.5, "y": 4.375}
]
},
"LAYOUT_2key": {
"layout": [
- {"x": 0, "y": 0.375},
- {"x": 1, "y": 0.375},
- {"x": 2, "y": 0.125},
- {"x": 3, "y": 0},
- {"x": 4, "y": 0.125},
- {"x": 5, "y": 0.25},
- {"x": 6, "y": 0.75},
-
- {"x": 11.5, "y": 0.75},
- {"x": 12.5, "y": 0.25},
- {"x": 13.5, "y": 0.125},
- {"x": 14.5, "y": 0},
- {"x": 15.5, "y": 0.125},
- {"x": 16.5, "y": 0.375},
- {"x": 17.5, "y": 0.375},
-
- {"x": 0, "y": 1.375},
- {"x": 1, "y": 1.375},
- {"x": 2, "y": 1.125},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1.125},
- {"x": 5, "y": 1.25},
- {"x": 6, "y": 1.75},
-
- {"x": 11.5, "y": 1.75},
- {"x": 12.5, "y": 1.25},
- {"x": 13.5, "y": 1.125},
- {"x": 14.5, "y": 1},
- {"x": 15.5, "y": 1.125},
- {"x": 16.5, "y": 1.375},
- {"x": 17.5, "y": 1.375},
-
- {"x": 0, "y": 2.375},
- {"x": 1, "y": 2.375},
- {"x": 2, "y": 2.125},
- {"x": 3, "y": 2},
- {"x": 4, "y": 2.125},
- {"x": 5, "y": 2.25},
- {"x": 6, "y": 2.75},
-
- {"x": 11.5, "y": 2.75},
- {"x": 12.5, "y": 2.25},
- {"x": 13.5, "y": 2.125},
- {"x": 14.5, "y": 2},
- {"x": 15.5, "y": 2.125},
- {"x": 16.5, "y": 2.375},
- {"x": 17.5, "y": 2.375},
-
- {"x": 0, "y": 3.375},
- {"x": 1, "y": 3.375},
- {"x": 2, "y": 3.125},
- {"x": 3, "y": 3},
- {"x": 4, "y": 3.125},
- {"x": 5, "y": 3.25},
-
- {"x": 12.5, "y": 3.25},
- {"x": 13.5, "y": 3.125},
- {"x": 14.5, "y": 3},
- {"x": 15.5, "y": 3.125},
- {"x": 16.5, "y": 3.375},
- {"x": 17.5, "y": 3.375},
-
- {"x": 0, "y": 4.375},
- {"x": 1, "y": 4.375},
- {"x": 2, "y": 4.125},
- {"x": 3, "y": 4},
-
- {"x": 5, "y": 5},
- {"x": 6, "y": 4, "h": 2},
-
- {"x": 11.5, "y": 4, "h": 2},
- {"x": 12.5, "y": 5},
-
- {"x": 14.5, "y": 4},
- {"x": 15.5, "y": 4.125},
- {"x": 16.5, "y": 4.375},
- {"x": 17.5, "y": 4.375}
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.375},
+ {"matrix": [0, 2], "x": 2, "y": 0.125},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.125},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.75},
+
+ {"matrix": [5, 6], "x": 11.5, "y": 0.75},
+ {"matrix": [5, 5], "x": 12.5, "y": 0.25},
+ {"matrix": [5, 4], "x": 13.5, "y": 0.125},
+ {"matrix": [5, 3], "x": 14.5, "y": 0},
+ {"matrix": [5, 2], "x": 15.5, "y": 0.125},
+ {"matrix": [5, 1], "x": 16.5, "y": 0.375},
+ {"matrix": [5, 0], "x": 17.5, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.375},
+ {"matrix": [1, 2], "x": 2, "y": 1.125},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.125},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.75},
+
+ {"matrix": [6, 6], "x": 11.5, "y": 1.75},
+ {"matrix": [6, 5], "x": 12.5, "y": 1.25},
+ {"matrix": [6, 4], "x": 13.5, "y": 1.125},
+ {"matrix": [6, 3], "x": 14.5, "y": 1},
+ {"matrix": [6, 2], "x": 15.5, "y": 1.125},
+ {"matrix": [6, 1], "x": 16.5, "y": 1.375},
+ {"matrix": [6, 0], "x": 17.5, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.375},
+ {"matrix": [2, 2], "x": 2, "y": 2.125},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.125},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.75},
+
+ {"matrix": [7, 6], "x": 11.5, "y": 2.75},
+ {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+ {"matrix": [7, 4], "x": 13.5, "y": 2.125},
+ {"matrix": [7, 3], "x": 14.5, "y": 2},
+ {"matrix": [7, 2], "x": 15.5, "y": 2.125},
+ {"matrix": [7, 1], "x": 16.5, "y": 2.375},
+ {"matrix": [7, 0], "x": 17.5, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.375},
+ {"matrix": [3, 1], "x": 1, "y": 3.375},
+ {"matrix": [3, 2], "x": 2, "y": 3.125},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3.125},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+
+ {"matrix": [8, 5], "x": 12.5, "y": 3.25},
+ {"matrix": [8, 4], "x": 13.5, "y": 3.125},
+ {"matrix": [8, 3], "x": 14.5, "y": 3},
+ {"matrix": [8, 2], "x": 15.5, "y": 3.125},
+ {"matrix": [8, 1], "x": 16.5, "y": 3.375},
+ {"matrix": [8, 0], "x": 17.5, "y": 3.375},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.375},
+ {"matrix": [4, 1], "x": 1, "y": 4.375},
+ {"matrix": [4, 2], "x": 2, "y": 4.125},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 5},
+ {"matrix": [4, 5], "x": 6, "y": 4, "h": 2},
+
+ {"matrix": [9, 5], "x": 11.5, "y": 4, "h": 2},
+ {"matrix": [9, 4], "x": 12.5, "y": 5},
+ {"matrix": [9, 3], "x": 14.5, "y": 4},
+ {"matrix": [9, 2], "x": 15.5, "y": 4.125},
+ {"matrix": [9, 1], "x": 16.5, "y": 4.375},
+ {"matrix": [9, 0], "x": 17.5, "y": 4.375}
]
}
}
diff --git a/keyboards/omkbd/ergodash/rev1/rev1.c b/keyboards/omkbd/ergodash/rev1/rev1.c
index eb794f9ac7..35a313f6fd 100644
--- a/keyboards/omkbd/ergodash/rev1/rev1.c
+++ b/keyboards/omkbd/ergodash/rev1/rev1.c
@@ -1,4 +1,4 @@
-#include "rev1.h"
+#include "quantum.h"
#ifdef AUDIO_ENABLE
float tone_startup[][2] = SONG(STARTUP_SOUND);
diff --git a/keyboards/omkbd/ergodash/rev1/rev1.h b/keyboards/omkbd/ergodash/rev1/rev1.h
deleted file mode 100644
index 4a1ee020e7..0000000000
--- a/keyboards/omkbd/ergodash/rev1/rev1.h
+++ /dev/null
@@ -1,129 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#ifndef FLIP_HALF
-// Standard Keymap
-// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
-# define LAYOUT_4key( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, R35, R34, R33, R32, R31, R30 }, \
- { R46, R45, R44, R43, R42, R41, R40 } \
-}
-
-// Just defined for configurator support, the matrix is identical to LAYOUT_4key
-# define LAYOUT_4key_2u_inner( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, R35, R34, R33, R32, R31, R30 }, \
- { R46, R45, R44, R43, R42, R41, R40 } \
-}
-
-# define LAYOUT_3key_2us( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, XXX }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, R35, R34, R33, R32, R31, XXX }, \
- { R46, R45, R44, R43, R42, R41, R40 } \
-}
-
-# define LAYOUT_3key_1us( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, XXX }, \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, R35, R34, R33, R32, R31, R30 }, \
- { R46, R45, R44, R43, R42, R41, XXX } \
-}
-
-# define LAYOUT_2key( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, R41, R42, R43, R44, R45, R46 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, XXX }, \
- { L40, L41, L42, L43, L44, L45, XXX }, \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { R36, R35, R34, R33, R32, R31, XXX }, \
- { R46, R45, R44, R43, R42, R41, XXX } \
-}
-
-#define LAYOUT LAYOUT_4key
-
-#else
-// Keymap with right side flipped
-// (TRRS jack on both halves are to the right)
-# define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
- L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, L43, L44, L45, L46 }, \
- { R00, R01, R02, R03, R04, R05, R06 }, \
- { R10, R11, R12, R13, R14, R15, R16 }, \
- { R20, R21, R22, R23, R24, R25, R26 }, \
- { R30, R31, R32, R33, R34, R35, R36 }, \
- { R40, R41, R42, R43, R44, R45, R46 } \
-}
-#endif