summaryrefslogtreecommitdiff
path: root/keyboards/omkbd
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-12 13:42:51 +1000
committerGitHub <noreply@github.com>2023-04-12 13:42:51 +1000
commit5bd68e3695a82ff504c358c33445b4530c2a327f (patch)
tree10b245757dcb4f2c3c07796671ed8d284e5f5d6f /keyboards/omkbd
parent941e159a28f1bdbdd913654c4f9a14291f8d5299 (diff)
Move single `LAYOUT`s to data driven (#20365)
Diffstat (limited to 'keyboards/omkbd')
-rw-r--r--keyboards/omkbd/runner3680/3x6/3x6.h17
-rw-r--r--keyboards/omkbd/runner3680/3x6/info.json77
-rw-r--r--keyboards/omkbd/runner3680/3x7/3x7.h17
-rw-r--r--keyboards/omkbd/runner3680/3x7/info.json87
-rw-r--r--keyboards/omkbd/runner3680/3x8/3x8.h17
-rw-r--r--keyboards/omkbd/runner3680/3x8/info.json99
-rw-r--r--keyboards/omkbd/runner3680/4x6/4x6.h20
-rw-r--r--keyboards/omkbd/runner3680/4x6/info.json100
-rw-r--r--keyboards/omkbd/runner3680/4x7/4x7.h20
-rw-r--r--keyboards/omkbd/runner3680/4x7/info.json116
-rw-r--r--keyboards/omkbd/runner3680/4x8/4x8.h20
-rw-r--r--keyboards/omkbd/runner3680/4x8/info.json132
-rw-r--r--keyboards/omkbd/runner3680/5x6/5x6.h23
-rw-r--r--keyboards/omkbd/runner3680/5x6/info.json125
-rw-r--r--keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c2
-rw-r--r--keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h39
-rw-r--r--keyboards/omkbd/runner3680/5x6_5x8/info.json145
-rw-r--r--keyboards/omkbd/runner3680/5x7/5x7.h23
-rw-r--r--keyboards/omkbd/runner3680/5x7/info.json145
-rw-r--r--keyboards/omkbd/runner3680/5x8/5x8.h23
-rw-r--r--keyboards/omkbd/runner3680/5x8/info.json165
21 files changed, 617 insertions, 795 deletions
diff --git a/keyboards/omkbd/runner3680/3x6/3x6.h b/keyboards/omkbd/runner3680/3x6/3x6.h
deleted file mode 100644
index 3d9fd779d8..0000000000
--- a/keyboards/omkbd/runner3680/3x6/3x6.h
+++ /dev/null
@@ -1,17 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT( \
6 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
7 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
8 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \
9 ) \
10 { \
11 { L00, L01, L02, L03, L04, L05 }, \
12 { L10, L11, L12, L13, L14, L15 }, \
13 { L20, L21, L22, L23, L24, L25 }, \
14 { R05, R04, R03, R02, R01, R00 }, \
15 { R15, R14, R13, R12, R11, R10 }, \
16 { R25, R24, R23, R22, R21, R20 } \
17 }
diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json
index 4cd318a2ef..9cb57ec106 100644
--- a/keyboards/omkbd/runner3680/3x6/info.json
+++ b/keyboards/omkbd/runner3680/3x6/info.json
@@ -19,47 +19,50 @@
19 "ws2812": { 19 "ws2812": {
20 "pin": "D3" 20 "pin": "D3"
21 }, 21 },
22 "layouts": { 22 "layouts": {
23 "LAYOUT": { 23 "LAYOUT": {
24 "layout": [ 24 "layout": [
25 {"x":0, "y":0}, 25 {"matrix": [0, 0], "x": 0, "y": 0},
26 {"x":1, "y":0}, 26 {"matrix": [0, 1], "x": 1, "y": 0},
27 {"x":2, "y":0}, 27 {"matrix": [0, 2], "x": 2, "y": 0},
28 {"x":3, "y":0}, 28 {"matrix": [0, 3], "x": 3, "y": 0},
29 {"x":4, "y":0}, 29 {"matrix": [0, 4], "x": 4, "y": 0},
30 {"x":5, "y":0}, 30 {"matrix": [0, 5], "x": 5, "y": 0},
31 {"x":7, "y":0},
32 {"x":8, "y":0},
33 {"x":9, "y":0},
34 {"x":10, "y":0},
35 {"x":11, "y":0},
36 {"x":12, "y":0},
37 31
38 {"x":0, "y":1}, 32 {"matrix": [3, 5], "x": 7, "y": 0},
39 {"x":1, "y":1}, 33 {"matrix": [3, 4], "x": 8, "y": 0},
40 {"x":2, "y":1}, 34 {"matrix": [3, 3], "x": 9, "y": 0},
41 {"x":3, "y":1}, 35 {"matrix": [3, 2], "x": 10, "y": 0},
42 {"x":4, "y":1}, 36 {"matrix": [3, 1], "x": 11, "y": 0},
43 {"x":5, "y":1}, 37 {"matrix": [3, 0], "x": 12, "y": 0},
44 {"x":7, "y":1},
45 {"x":8, "y":1},
46 {"x":9, "y":1},
47 {"x":10, "y":1},
48 {"x":11, "y":1},
49 {"x":12, "y":1},
50 38
51 {"x":0, "y":2}, 39 {"matrix": [1, 0], "x": 0, "y": 1},
52 {"x":1, "y":2}, 40 {"matrix": [1, 1], "x": 1, "y": 1},
53 {"x":2, "y":2}, 41 {"matrix": [1, 2], "x": 2, "y": 1},
54 {"x":3, "y":2}, 42 {"matrix": [1, 3], "x": 3, "y": 1},
55 {"x":4, "y":2}, 43 {"matrix": [1, 4], "x": 4, "y": 1},
56 {"x":5, "y":2}, 44 {"matrix": [1, 5], "x": 5, "y": 1},
57 {"x":7, "y":2}, 45
58 {"x":8, "y":2}, 46 {"matrix": [4, 5], "x": 7, "y": 1},
59 {"x":9, "y":2}, 47 {"matrix": [4, 4], "x": 8, "y": 1},
60 {"x":10, "y":2}, 48 {"matrix": [4, 3], "x": 9, "y": 1},
61 {"x":11, "y":2}, 49 {"matrix": [4, 2], "x": 10, "y": 1},
62 {"x":12, "y":2} 50 {"matrix": [4, 1], "x": 11, "y": 1},
51 {"matrix": [4, 0], "x": 12, "y": 1},
52
53 {"matrix": [2, 0], "x": 0, "y": 2},
54 {"matrix": [2, 1], "x": 1, "y": 2},
55 {"matrix": [2, 2], "x": 2, "y": 2},
56 {"matrix": [2, 3], "x": 3, "y": 2},
57 {"matrix": [2, 4], "x": 4, "y": 2},
58 {"matrix": [2, 5], "x": 5, "y": 2},
59
60 {"matrix": [5, 5], "x": 7, "y": 2},
61 {"matrix": [5, 4], "x": 8, "y": 2},
62 {"matrix": [5, 3], "x": 9, "y": 2},
63 {"matrix": [5, 2], "x": 10, "y": 2},
64 {"matrix": [5, 1], "x": 11, "y": 2},
65 {"matrix": [5, 0], "x": 12, "y": 2}
63 ] 66 ]
64 } 67 }
65 } 68 }
diff --git a/keyboards/omkbd/runner3680/3x7/3x7.h b/keyboards/omkbd/runner3680/3x7/3x7.h
deleted file mode 100644
index db11b19c52..0000000000
--- a/keyboards/omkbd/runner3680/3x7/3x7.h
+++ /dev/null
@@ -1,17 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT( \
6 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
7 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
8 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26 \
9 ) \
10 { \
11 { L00, L01, L02, L03, L04, L05, L06 }, \
12 { L10, L11, L12, L13, L14, L15, L16 }, \
13 { L20, L21, L22, L23, L24, L25, L26 }, \
14 { R06, R05, R04, R03, R02, R01, R00 }, \
15 { R16, R15, R14, R13, R12, R11, R10 }, \
16 { R26, R25, R24, R23, R22, R21, R20 } \
17 }
diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json
index aec7fbcbef..a3cde77a45 100644
--- a/keyboards/omkbd/runner3680/3x7/info.json
+++ b/keyboards/omkbd/runner3680/3x7/info.json
@@ -22,50 +22,53 @@
22 "layouts": { 22 "layouts": {
23 "LAYOUT": { 23 "LAYOUT": {
24 "layout": [ 24 "layout": [
25 {"x":0, "y":0}, 25 {"matrix": [0, 0], "x": 0, "y": 0},
26 {"x":1, "y":0}, 26 {"matrix": [0, 1], "x": 1, "y": 0},
27 {"x":2, "y":0}, 27 {"matrix": [0, 2], "x": 2, "y": 0},
28 {"x":3, "y":0}, 28 {"matrix": [0, 3], "x": 3, "y": 0},
29 {"x":4, "y":0}, 29 {"matrix": [0, 4], "x": 4, "y": 0},
30 {"x":5, "y":0}, 30 {"matrix": [0, 5], "x": 5, "y": 0},
31 {"x":6, "y":0}, 31 {"matrix": [0, 6], "x": 6, "y": 0},
32 {"x":8, "y":0},
33 {"x":9, "y":0},
34 {"x":10, "y":0},
35 {"x":11, "y":0},
36 {"x":12, "y":0},
37 {"x":13, "y":0},
38 {"x":14, "y":0},
39 32
40 {"x":0, "y":1}, 33 {"matrix": [3, 6], "x": 8, "y": 0},
41 {"x":1, "y":1}, 34 {"matrix": [3, 5], "x": 9, "y": 0},
42 {"x":2, "y":1}, 35 {"matrix": [3, 4], "x": 10, "y": 0},
43 {"x":3, "y":1}, 36 {"matrix": [3, 3], "x": 11, "y": 0},
44 {"x":4, "y":1}, 37 {"matrix": [3, 2], "x": 12, "y": 0},
45 {"x":5, "y":1}, 38 {"matrix": [3, 1], "x": 13, "y": 0},
46 {"x":6, "y":1}, 39 {"matrix": [3, 0], "x": 14, "y": 0},
47 {"x":8, "y":1},
48 {"x":9, "y":1},
49 {"x":10, "y":1},
50 {"x":11, "y":1},
51 {"x":12, "y":1},
52 {"x":13, "y":1},
53 {"x":14, "y":1},
54 40
55 {"x":0, "y":2}, 41 {"matrix": [1, 0], "x": 0, "y": 1},
56 {"x":1, "y":2}, 42 {"matrix": [1, 1], "x": 1, "y": 1},
57 {"x":2, "y":2}, 43 {"matrix": [1, 2], "x": 2, "y": 1},
58 {"x":3, "y":2}, 44 {"matrix": [1, 3], "x": 3, "y": 1},
59 {"x":4, "y":2}, 45 {"matrix": [1, 4], "x": 4, "y": 1},
60 {"x":5, "y":2}, 46 {"matrix": [1, 5], "x": 5, "y": 1},
61 {"x":6, "y":2}, 47 {"matrix": [1, 6], "x": 6, "y": 1},
62 {"x":8, "y":2}, 48
63 {"x":9, "y":2}, 49 {"matrix": [4, 6], "x": 8, "y": 1},
64 {"x":10, "y":2}, 50 {"matrix": [4, 5], "x": 9, "y": 1},
65 {"x":11, "y":2}, 51 {"matrix": [4, 4], "x": 10, "y": 1},
66 {"x":12, "y":2}, 52 {"matrix": [4, 3], "x": 11, "y": 1},
67 {"x":13, "y":2}, 53 {"matrix": [4, 2], "x": 12, "y": 1},
68 {"x":14, "y":2} 54 {"matrix": [4, 1], "x": 13, "y": 1},
55 {"matrix": [4, 0], "x": 14, "y": 1},
56
57 {"matrix": [2, 0], "x": 0, "y": 2},
58 {"matrix": [2, 1], "x": 1, "y": 2},
59 {"matrix": [2, 2], "x": 2, "y": 2},
60 {"matrix": [2, 3], "x": 3, "y": 2},
61 {"matrix": [2, 4], "x": 4, "y": 2},
62 {"matrix": [2, 5], "x": 5, "y": 2},
63 {"matrix": [2, 6], "x": 6, "y": 2},
64
65 {"matrix": [5, 6], "x": 8, "y": 2},
66 {"matrix": [5, 5], "x": 9, "y": 2},
67 {"matrix": [5, 4], "x": 10, "y": 2},
68 {"matrix": [5, 3], "x": 11, "y": 2},
69 {"matrix": [5, 2], "x": 12, "y": 2},
70 {"matrix": [5, 1], "x": 13, "y": 2},
71 {"matrix": [5, 0], "x": 14, "y": 2}
69 ] 72 ]
70 } 73 }
71 } 74 }
diff --git a/keyboards/omkbd/runner3680/3x8/3x8.h b/keyboards/omkbd/runner3680/3x8/3x8.h
deleted file mode 100644
index cd3b81d973..0000000000
--- a/keyboards/omkbd/runner3680/3x8/3x8.h
+++ /dev/null
@@ -1,17 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT( \
6 L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
7 L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
8 L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27 \
9 ) \
10 { \
11 { L00, L01, L02, L03, L04, L05, L06, L07 }, \
12 { L10, L11, L12, L13, L14, L15, L16, L17 }, \
13 { L20, L21, L22, L23, L24, L25, L26, L27 }, \
14 { R07, R06, R05, R04, R03, R02, R01, R00 }, \
15 { R17, R16, R15, R14, R13, R12, R11, R10 }, \
16 { R27, R26, R25, R24, R23, R22, R21, R20 } \
17 }
diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json
index ccf59c180b..4c816a400c 100644
--- a/keyboards/omkbd/runner3680/3x8/info.json
+++ b/keyboards/omkbd/runner3680/3x8/info.json
@@ -22,56 +22,59 @@
22 "layouts": { 22 "layouts": {
23 "LAYOUT": { 23 "LAYOUT": {
24 "layout": [ 24 "layout": [
25 {"x":0, "y":0}, 25 {"matrix": [0, 0], "x": 0, "y": 0},
26 {"x":1, "y":0}, 26 {"matrix": [0, 1], "x": 1, "y": 0},
27 {"x":2, "y":0}, 27 {"matrix": [0, 2], "x": 2, "y": 0},
28 {"x":3, "y":0}, 28 {"matrix": [0, 3], "x": 3, "y": 0},
29 {"x":4, "y":0}, 29 {"matrix": [0, 4], "x": 4, "y": 0},
30 {"x":5, "y":0}, 30 {"matrix": [0, 5], "x": 5, "y": 0},
31 {"x":6, "y":0}, 31 {"matrix": [0, 6], "x": 6, "y": 0},
32 {"x":7, "y":0}, 32 {"matrix": [0, 7], "x": 7, "y": 0},
33 {"x":9, "y":0},
34 {"x":10, "y":0},
35 {"x":11, "y":0},
36 {"x":12, "y":0},
37 {"x":13, "y":0},
38 {"x":14, "y":0},
39 {"x":15, "y":0},
40 {"x":16, "y":0},
41 33
42 {"x":0, "y":1}, 34 {"matrix": [3, 7], "x": 9, "y": 0},
43 {"x":1, "y":1}, 35 {"matrix": [3, 6], "x": 10, "y": 0},
44 {"x":2, "y":1}, 36 {"matrix": [3, 5], "x": 11, "y": 0},
45 {"x":3, "y":1}, 37 {"matrix": [3, 4], "x": 12, "y": 0},
46 {"x":4, "y":1}, 38 {"matrix": [3, 3], "x": 13, "y": 0},
47 {"x":5, "y":1}, 39 {"matrix": [3, 2], "x": 14, "y": 0},
48 {"x":6, "y":1}, 40 {"matrix": [3, 1], "x": 15, "y": 0},
49 {"x":7, "y":1}, 41 {"matrix": [3, 0], "x": 16, "y": 0},
50 {"x":9, "y":1},
51 {"x":10, "y":1},
52 {"x":11, "y":1},
53 {"x":12, "y":1},
54 {"x":13, "y":1},
55 {"x":14, "y":1},
56 {"x":15, "y":1},
57 {"x":16, "y":1},
58 42
59 {"x":0, "y":2}, 43 {"matrix": [1, 0], "x": 0, "y": 1},
60 {"x":1, "y":2}, 44 {"matrix": [1, 1], "x": 1, "y": 1},
61 {"x":2, "y":2}, 45 {"matrix": [1, 2], "x": 2, "y": 1},
62 {"x":3, "y":2}, 46 {"matrix": [1, 3], "x": 3, "y": 1},
63 {"x":4, "y":2}, 47 {"matrix": [1, 4], "x": 4, "y": 1},
64 {"x":5, "y":2}, 48 {"matrix": [1, 5], "x": 5, "y": 1},
65 {"x":6, "y":2}, 49 {"matrix": [1, 6], "x": 6, "y": 1},
66 {"x":7, "y":2}, 50 {"matrix": [1, 7], "x": 7, "y": 1},
67 {"x":9, "y":2}, 51
68 {"x":10, "y":2}, 52 {"matrix": [4, 7], "x": 9, "y": 1},
69 {"x":11, "y":2}, 53 {"matrix": [4, 6], "x": 10, "y": 1},
70 {"x":12, "y":2}, 54 {"matrix": [4, 5], "x": 11, "y": 1},
71 {"x":13, "y":2}, 55 {"matrix": [4, 4], "x": 12, "y": 1},
72 {"x":14, "y":2}, 56 {"matrix": [4, 3], "x": 13, "y": 1},
73 {"x":15, "y":2}, 57 {"matrix": [4, 2], "x": 14, "y": 1},
74 {"x":16, "y":2} 58 {"matrix": [4, 1], "x": 15, "y": 1},
59 {"matrix": [4, 0], "x": 16, "y": 1},
60
61 {"matrix": [2, 0], "x": 0, "y": 2},
62 {"matrix": [2, 1], "x": 1, "y": 2},
63 {"matrix": [2, 2], "x": 2, "y": 2},
64 {"matrix": [2, 3], "x": 3, "y": 2},
65 {"matrix": [2, 4], "x": 4, "y": 2},
66 {"matrix": [2, 5], "x": 5, "y": 2},
67 {"matrix": [2, 6], "x": 6, "y": 2},
68 {"matrix": [2, 7], "x": 7, "y": 2},
69
70 {"matrix": [5, 7], "x": 9, "y": 2},
71 {"matrix": [5, 6], "x": 10, "y": 2},
72 {"matrix": [5, 5], "x": 11, "y": 2},
73 {"matrix": [5, 4], "x": 12, "y": 2},
74 {"matrix": [5, 3], "x": 13, "y": 2},
75 {"matrix": [5, 2], "x": 14, "y": 2},
76 {"matrix": [5, 1], "x": 15, "y": 2},
77 {"matrix": [5, 0], "x": 16, "y": 2}
75 ] 78 ]
76 } 79 }
77 } 80 }
diff --git a/keyboards/omkbd/runner3680/4x6/4x6.h b/keyboards/omkbd/runner3680/4x6/4x6.h
deleted file mode 100644
index 26bcca6de5..0000000000
--- a/keyboards/omkbd/runner3680/4x6/4x6.h
+++ /dev/null
@@ -1,20 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT( \
6 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
7 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
8 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
9 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
10 ) \
11 { \
12 { L00, L01, L02, L03, L04, L05 }, \
13 { L10, L11, L12, L13, L14, L15 }, \
14 { L20, L21, L22, L23, L24, L25 }, \
15 { L30, L31, L32, L33, L34, L35 }, \
16 { R05, R04, R03, R02, R01, R00 }, \
17 { R15, R14, R13, R12, R11, R10 }, \
18 { R25, R24, R23, R22, R21, R20 }, \
19 { R35, R34, R33, R32, R31, R30 } \
20 }
diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json
index f2433c99b6..05785c52dd 100644
--- a/keyboards/omkbd/runner3680/4x6/info.json
+++ b/keyboards/omkbd/runner3680/4x6/info.json
@@ -22,57 +22,61 @@
22 "layouts": { 22 "layouts": {
23 "LAYOUT": { 23 "LAYOUT": {
24 "layout": [ 24 "layout": [
25 {"x":0, "y":0}, 25 {"matrix": [0, 0], "x": 0, "y": 0},
26 {"x":1, "y":0}, 26 {"matrix": [0, 1], "x": 1, "y": 0},
27 {"x":2, "y":0}, 27 {"matrix": [0, 2], "x": 2, "y": 0},
28 {"x":3, "y":0}, 28 {"matrix": [0, 3], "x": 3, "y": 0},
29 {"x":4, "y":0}, 29 {"matrix": [0, 4], "x": 4, "y": 0},
30 {"x":5, "y":0}, 30 {"matrix": [0, 5], "x": 5, "y": 0},
31 {"x":7, "y":0},
32 {"x":8, "y":0},
33 {"x":9, "y":0},
34 {"x":10, "y":0},
35 {"x":11, "y":0},
36 {"x":12, "y":0},
37 31
38 {"x":0, "y":1}, 32 {"matrix": [4, 5], "x": 7, "y": 0},
39 {"x":1, "y":1}, 33 {"matrix": [4, 4], "x": 8, "y": 0},
40 {"x":2, "y":1}, 34 {"matrix": [4, 3], "x": 9, "y": 0},
41 {"x":3, "y":1}, 35 {"matrix": [4, 2], "x": 10, "y": 0},
42 {"x":4, "y":1}, 36 {"matrix": [4, 1], "x": 11, "y": 0},
43 {"x":5, "y":1}, 37 {"matrix": [4, 0], "x": 12, "y": 0},
44 {"x":7, "y":1},
45 {"x":8, "y":1},
46 {"x":9, "y":1},
47 {"x":10, "y":1},
48 {"x":11, "y":1},
49 {"x":12, "y":1},
50 38
51 {"x":0, "y":2}, 39 {"matrix": [1, 0], "x": 0, "y": 1},
52 {"x":1, "y":2}, 40 {"matrix": [1, 1], "x": 1, "y": 1},
53 {"x":2, "y":2}, 41 {"matrix": [1, 2], "x": 2, "y": 1},
54 {"x":3, "y":2}, 42 {"matrix": [1, 3], "x": 3, "y": 1},
55 {"x":4, "y":2}, 43 {"matrix": [1, 4], "x": 4, "y": 1},
56 {"x":5, "y":2}, 44 {"matrix": [1, 5], "x": 5, "y": 1},
57 {"x":7, "y":2},
58 {"x":8, "y":2},
59 {"x":9, "y":2},
60 {"x":10, "y":2},
61 {"x":11, "y":2},
62 {"x":12, "y":2},
63 45
64 {"x":0, "y":3}, 46 {"matrix": [5, 5], "x": 7, "y": 1},
65 {"x":1, "y":3}, 47 {"matrix": [5, 4], "x": 8, "y": 1},
66 {"x":2, "y":3}, 48 {"matrix": [5, 3], "x": 9, "y": 1},
67 {"x":3, "y":3}, 49 {"matrix": [5, 2], "x": 10, "y": 1},
68 {"x":4, "y":3}, 50 {"matrix": [5, 1], "x": 11, "y": 1},
69 {"x":5, "y":3}, 51 {"matrix": [5, 0], "x": 12, "y": 1},
70 {"x":7, "y":3}, 52
71 {"x":8, "y":3}, 53 {"matrix": [2, 0], "x": 0, "y": 2},
72 {"x":9, "y":3}, 54 {"matrix": [2, 1], "x": 1, "y": 2},
73 {"x":10, "y":3}, 55 {"matrix": [2, 2], "x": 2, "y": 2},
74 {"x":11, "y":3}, 56 {"matrix": [2, 3], "x": 3, "y": 2},
75 {"x":12, "y":3} 57 {"matrix": [2, 4], "x": 4, "y": 2},
58 {"matrix": [2, 5], "x": 5, "y": 2},
59
60 {"matrix": [6, 5], "x": 7, "y": 2},
61 {"matrix": [6, 4], "x": 8, "y": 2},
62 {"matrix": [6, 3], "x": 9, "y": 2},
63 {"matrix": [6, 2], "x": 10, "y": 2},
64 {"matrix": [6, 1], "x": 11, "y": 2},
65 {"matrix": [6, 0], "x": 12, "y": 2},
66
67 {"matrix": [3, 0], "x": 0, "y": 3},
68 {"matrix": [3, 1], "x": 1, "y": 3},
69 {"matrix": [3, 2], "x": 2, "y": 3},
70 {"matrix": [3, 3], "x": 3, "y": 3},
71 {"matrix": [3, 4], "x": 4, "y": 3},
72 {"matrix": [3, 5], "x": 5, "y": 3},
73
74 {"matrix": [7, 5], "x": 7, "y": 3},
75 {"matrix": [7, 4], "x": 8, "y": 3},
76 {"matrix": [7, 3], "x": 9, "y": 3},
77 {"matrix": [7, 2], "x": 10, "y": 3},
78 {"matrix": [7, 1], "x": 11, "y": 3},
79 {"matrix": [7, 0], "x": 12, "y": 3}
76 ] 80 ]
77 } 81 }
78 } 82 }
diff --git a/keyboards/omkbd/runner3680/4x7/4x7.h b/keyboards/omkbd/runner3680/4x7/4x7.h
deleted file mode 100644
index 50fbe3a5ce..0000000000
--- a/keyboards/omkbd/runner3680/4x7/4x7.h
+++ /dev/null
@@ -1,20 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT( \
6 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
7 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
8 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
9 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 \
10 ) \
11 { \
12 { L00, L01, L02, L03, L04, L05, L06 }, \
13 { L10, L11, L12, L13, L14, L15, L16 }, \
14 { L20, L21, L22, L23, L24, L25, L26 }, \
15 { L30, L31, L32, L33, L34, L35, L36 }, \
16 { R06, R05, R04, R03, R02, R01, R00 }, \
17 { R16, R15, R14, R13, R12, R11, R10 }, \
18 { R26, R25, R24, R23, R22, R21, R20 }, \
19 { R36, R35, R34, R33, R32, R31, R30 } \
20 }
diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json
index 17af0b601e..548cb8752f 100644
--- a/keyboards/omkbd/runner3680/4x7/info.json
+++ b/keyboards/omkbd/runner3680/4x7/info.json
@@ -22,65 +22,69 @@
22 "layouts": { 22 "layouts": {
23 "LAYOUT": { 23 "LAYOUT": {
24 "layout": [ 24 "layout": [
25 {"x":0, "y":0}, 25 {"matrix": [0, 0], "x": 0, "y": 0},
26 {"x":1, "y":0}, 26 {"matrix": [0, 1], "x": 1, "y": 0},
27 {"x":2, "y":0}, 27 {"matrix": [0, 2], "x": 2, "y": 0},
28 {"x":3, "y":0}, 28 {"matrix": [0, 3], "x": 3, "y": 0},
29 {"x":4, "y":0}, 29 {"matrix": [0, 4], "x": 4, "y": 0},
30 {"x":5, "y":0}, 30 {"matrix": [0, 5], "x": 5, "y": 0},
31 {"x":6, "y":0}, 31 {"matrix": [0, 6], "x": 6, "y": 0},
32 {"x":8, "y":0},
33 {"x":9, "y":0},
34 {"x":10, "y":0},
35 {"x":11, "y":0},
36 {"x":12, "y":0},
37 {"x":13, "y":0},
38 {"x":14, "y":0},
39 32
40 {"x":0, "y":1}, 33 {"matrix": [4, 6], "x": 8, "y": 0},
41 {"x":1, "y":1}, 34 {"matrix": [4, 5], "x": 9, "y": 0},
42 {"x":2, "y":1}, 35 {"matrix": [4, 4], "x": 10, "y": 0},
43 {"x":3, "y":1}, 36 {"matrix": [4, 3], "x": 11, "y": 0},
44 {"x":4, "y":1}, 37 {"matrix": [4, 2], "x": 12, "y": 0},
45 {"x":5, "y":1}, 38 {"matrix": [4, 1], "x": 13, "y": 0},
46 {"x":6, "y":1}, 39 {"matrix": [4, 0], "x": 14, "y": 0},
47 {"x":8, "y":1},
48 {"x":9, "y":1},
49 {"x":10, "y":1},
50 {"x":11, "y":1},
51 {"x":12, "y":1},
52 {"x":13, "y":1},
53 {"x":14, "y":1},
54 40
55 {"x":0, "y":2}, 41 {"matrix": [1, 0], "x": 0, "y": 1},
56 {"x":1, "y":2}, 42 {"matrix": [1, 1], "x": 1, "y": 1},
57 {"x":2, "y":2}, 43 {"matrix": [1, 2], "x": 2, "y": 1},
58 {"x":3, "y":2}, 44 {"matrix": [1, 3], "x": 3, "y": 1},
59 {"x":4, "y":2}, 45 {"matrix": [1, 4], "x": 4, "y": 1},
60 {"x":5, "y":2}, 46 {"matrix": [1, 5], "x": 5, "y": 1},
61 {"x":6, "y":2}, 47 {"matrix": [1, 6], "x": 6, "y": 1},
62 {"x":8, "y":2},
63 {"x":9, "y":2},
64 {"x":10, "y":2},
65 {"x":11, "y":2},
66 {"x":12, "y":2},
67 {"x":13, "y":2},
68 {"x":14, "y":2},
69 48
70 {"x":0, "y":3}, 49 {"matrix": [5, 6], "x": 8, "y": 1},
71 {"x":1, "y":3}, 50 {"matrix": [5, 5], "x": 9, "y": 1},
72 {"x":2, "y":3}, 51 {"matrix": [5, 4], "x": 10, "y": 1},
73 {"x":3, "y":3}, 52 {"matrix": [5, 3], "x": 11, "y": 1},
74 {"x":4, "y":3}, 53 {"matrix": [5, 2], "x": 12, "y": 1},
75 {"x":5, "y":3}, 54 {"matrix": [5, 1], "x": 13, "y": 1},
76 {"x":6, "y":3}, 55 {"matrix": [5, 0], "x": 14, "y": 1},
77 {"x":8, "y":3}, 56
78 {"x":9, "y":3}, 57 {"matrix": [2, 0], "x": 0, "y": 2},
79 {"x":10, "y":3}, 58 {"matrix": [2, 1], "x": 1, "y": 2},
80 {"x":11, "y":3}, 59 {"matrix": [2, 2], "x": 2, "y": 2},
81 {"x":12, "y":3}, 60 {"matrix": [2, 3], "x": 3, "y": 2},
82 {"x":13, "y":3}, 61 {"matrix": [2, 4], "x": 4, "y": 2},
83 {"x":14, "y":3} 62 {"matrix": [2, 5], "x": 5, "y": 2},
63 {"matrix": [2, 6], "x": 6, "y": 2},
64
65 {"matrix": [6, 6], "x": 8, "y": 2},
66 {"matrix": [6, 5], "x": 9, "y": 2},
67 {"matrix": [6, 4], "x": 10, "y": 2},
68 {"matrix": [6, 3], "x": 11, "y": 2},
69 {"matrix": [6, 2], "x": 12, "y": 2},
70 {"matrix": [6, 1], "x": 13, "y": 2},
71 {"matrix": [6, 0], "x": 14, "y": 2},
72
73 {"matrix": [3, 0], "x": 0, "y": 3},
74 {"matrix": [3, 1], "x": 1, "y": 3},
75 {"matrix": [3, 2], "x": 2, "y": 3},
76 {"matrix": [3, 3], "x": 3, "y": 3},
77 {"matrix": [3, 4], "x": 4, "y": 3},
78 {"matrix": [3, 5], "x": 5, "y": 3},
79 {"matrix": [3, 6], "x": 6, "y": 3},
80
81 {"matrix": [7, 6], "x": 8, "y": 3},
82 {"matrix": [7, 5], "x": 9, "y": 3},
83 {"matrix": [7, 4], "x": 10, "y": 3},
84 {"matrix": [7, 3], "x": 11, "y": 3},
85 {"matrix": [7, 2], "x": 12, "y": 3},
86 {"matrix": [7, 1], "x": 13, "y": 3},
87 {"matrix": [7, 0], "x": 14, "y": 3}
84 ] 88 ]
85 } 89 }
86 } 90 }
diff --git a/keyboards/omkbd/runner3680/4x8/4x8.h b/keyboards/omkbd/runner3680/4x8/4x8.h
deleted file mode 100644
index 08fed12164..0000000000
--- a/keyboards/omkbd/runner3680/4x8/4x8.h
+++ /dev/null
@@ -1,20 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT( \
6 L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
7 L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
8 L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \
9 L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37 \
10 ) \
11 { \
12 { L00, L01, L02, L03, L04, L05, L06, L07 }, \
13 { L10, L11, L12, L13, L14, L15, L16, L17 }, \
14 { L20, L21, L22, L23, L24, L25, L26, L27 }, \
15 { L30, L31, L32, L33, L34, L35, L36, L37 }, \
16 { R07, R06, R05, R04, R03, R02, R01, R00 }, \
17 { R17, R16, R15, R14, R13, R12, R11, R10 }, \
18 { R27, R26, R25, R24, R23, R22, R21, R20 }, \
19 { R37, R36, R35, R34, R33, R32, R31, R30 } \
20 }
diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json
index f8fb9fa02c..e492360e6a 100644
--- a/keyboards/omkbd/runner3680/4x8/info.json
+++ b/keyboards/omkbd/runner3680/4x8/info.json
@@ -22,73 +22,77 @@
22 "layouts": { 22 "layouts": {
23 "LAYOUT": { 23 "LAYOUT": {
24 "layout": [ 24 "layout": [
25 {"x":0, "y":0}, 25 {"matrix": [0, 0], "x": 0, "y": 0},
26 {"x":1, "y":0}, 26 {"matrix": [0, 1], "x": 1, "y": 0},
27 {"x":2, "y":0}, 27 {"matrix": [0, 2], "x": 2, "y": 0},
28 {"x":3, "y":0}, 28 {"matrix": [0, 3], "x": 3, "y": 0},
29 {"x":4, "y":0}, 29 {"matrix": [0, 4], "x": 4, "y": 0},
30 {"x":5, "y":0}, 30 {"matrix": [0, 5], "x": 5, "y": 0},
31 {"x":6, "y":0}, 31 {"matrix": [0, 6], "x": 6, "y": 0},
32 {"x":7, "y":0}, 32 {"matrix": [0, 7], "x": 7, "y": 0},
33 {"x":9, "y":0},
34 {"x":10, "y":0},
35 {"x":11, "y":0},
36 {"x":12, "y":0},
37 {"x":13, "y":0},
38 {"x":14, "y":0},
39 {"x":15, "y":0},
40 {"x":16, "y":0},
41 33
42 {"x":0, "y":1}, 34 {"matrix": [4, 7], "x": 9, "y": 0},
43 {"x":1, "y":1}, 35 {"matrix": [4, 6], "x": 10, "y": 0},
44 {"x":2, "y":1}, 36 {"matrix": [4, 5], "x": 11, "y": 0},
45 {"x":3, "y":1}, 37 {"matrix": [4, 4], "x": 12, "y": 0},
46 {"x":4, "y":1}, 38 {"matrix": [4, 3], "x": 13, "y": 0},
47 {"x":5, "y":1}, 39 {"matrix": [4, 2], "x": 14, "y": 0},
48 {"x":6, "y":1}, 40 {"matrix": [4, 1], "x": 15, "y": 0},
49 {"x":7, "y":1}, 41 {"matrix": [4, 0], "x": 16, "y": 0},
50 {"x":9, "y":1},
51 {"x":10, "y":1},
52 {"x":11, "y":1},
53 {"x":12, "y":1},
54 {"x":13, "y":1},
55 {"x":14, "y":1},
56 {"x":15, "y":1},
57 {"x":16, "y":1},
58 42
59 {"x":0, "y":2}, 43 {"matrix": [1, 0], "x": 0, "y": 1},
60 {"x":1, "y":2}, 44 {"matrix": [1, 1], "x": 1, "y": 1},
61 {"x":2, "y":2}, 45 {"matrix": [1, 2], "x": 2, "y": 1},
62 {"x":3, "y":2}, 46 {"matrix": [1, 3], "x": 3, "y": 1},
63 {"x":4, "y":2}, 47 {"matrix": [1, 4], "x": 4, "y": 1},
64 {"x":5, "y":2}, 48 {"matrix": [1, 5], "x": 5, "y": 1},
65 {"x":6, "y":2}, 49 {"matrix": [1, 6], "x": 6, "y": 1},
66 {"x":7, "y":2}, 50 {"matrix": [1, 7], "x": 7, "y": 1},
67 {"x":9, "y":2},
68 {"x":10, "y":2},
69 {"x":11, "y":2},
70 {"x":12, "y":2},
71 {"x":13, "y":2},
72 {"x":14, "y":2},
73 {"x":15, "y":2},
74 {"x":16, "y":2},
75 51
76 {"x":0, "y":3}, 52 {"matrix": [5, 7], "x": 9, "y": 1},
77 {"x":1, "y":3}, 53 {"matrix": [5, 6], "x": 10, "y": 1},
78 {"x":2, "y":3}, 54 {"matrix": [5, 5], "x": 11, "y": 1},
79 {"x":3, "y":3}, 55 {"matrix": [5, 4], "x": 12, "y": 1},
80 {"x":4, "y":3}, 56 {"matrix": [5, 3], "x": 13, "y": 1},
81 {"x":5, "y":3}, 57 {"matrix": [5, 2], "x": 14, "y": 1},
82 {"x":6, "y":3}, 58 {"matrix": [5, 1], "x": 15, "y": 1},
83 {"x":7, "y":3}, 59 {"matrix": [5, 0], "x": 16, "y": 1},
84 {"x":9, "y":3}, 60
85 {"x":10, "y":3}, 61 {"matrix": [2, 0], "x": 0, "y": 2},
86 {"x":11, "y":3}, 62 {"matrix": [2, 1], "x": 1, "y": 2},
87 {"x":12, "y":3}, 63 {"matrix": [2, 2], "x": 2, "y": 2},
88 {"x":13, "y":3}, 64 {"matrix": [2, 3], "x": 3, "y": 2},
89 {"x":14, "y":3}, 65 {"matrix": [2, 4], "x": 4, "y": 2},
90 {"x":15, "y":3}, 66 {"matrix": [2, 5], "x": 5, "y": 2},
91 {"x":16, "y":3} 67 {"matrix": [2, 6], "x": 6, "y": 2},
68 {"matrix": [2, 7], "x": 7, "y": 2},
69
70 {"matrix": [6, 7], "x": 9, "y": 2},
71 {"matrix": [6, 6], "x": 10, "y": 2},
72 {"matrix": [6, 5], "x": 11, "y": 2},
73 {"matrix": [6, 4], "x": 12, "y": 2},
74 {"matrix": [6, 3], "x": 13, "y": 2},
75 {"matrix": [6, 2], "x": 14, "y": 2},
76 {"matrix": [6, 1], "x": 15, "y": 2},
77 {"matrix": [6, 0], "x": 16, "y": 2},
78
79 {"matrix": [3, 0], "x": 0, "y": 3},
80 {"matrix": [3, 1], "x": 1, "y": 3},
81 {"matrix": [3, 2], "x": 2, "y": 3},
82 {"matrix": [3, 3], "x": 3, "y": 3},
83 {"matrix": [3, 4], "x": 4, "y": 3},
84 {"matrix": [3, 5], "x": 5, "y": 3},
85 {"matrix": [3, 6], "x": 6, "y": 3},
86 {"matrix": [3, 7], "x": 7, "y": 3},
87
88 {"matrix": [7, 7], "x": 9, "y": 3},
89 {"matrix": [7, 6], "x": 10, "y": 3},
90 {"matrix": [7, 5], "x": 11, "y": 3},
91 {"matrix": [7, 4], "x": 12, "y": 3},
92 {"matrix": [7, 3], "x": 13, "y": 3},
93 {"matrix": [7, 2], "x": 14, "y": 3},
94 {"matrix": [7, 1], "x": 15, "y": 3},
95 {"matrix": [7, 0], "x": 16, "y": 3}
92 ] 96 ]
93 } 97 }
94 } 98 }
diff --git a/keyboards/omkbd/runner3680/5x6/5x6.h b/keyboards/omkbd/runner3680/5x6/5x6.h
deleted file mode 100644
index 8047894606..0000000000
--- a/keyboards/omkbd/runner3680/5x6/5x6.h
+++ /dev/null
@@ -1,23 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT( \
6 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
7 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
8 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
9 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
10 L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
11 ) \
12 { \
13 { L00, L01, L02, L03, L04, L05 }, \
14 { L10, L11, L12, L13, L14, L15 }, \
15 { L20, L21, L22, L23, L24, L25 }, \
16 { L30, L31, L32, L33, L34, L35 }, \
17 { L40, L41, L42, L43, L44, L45 }, \
18 { R05, R04, R03, R02, R01, R00 }, \
19 { R15, R14, R13, R12, R11, R10 }, \
20 { R25, R24, R23, R22, R21, R20 }, \
21 { R35, R34, R33, R32, R31, R30 }, \
22 { R45, R44, R43, R42, R41, R40 } \
23 }
diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json
index dc9aa6f7f9..2ed37dd414 100644
--- a/keyboards/omkbd/runner3680/5x6/info.json
+++ b/keyboards/omkbd/runner3680/5x6/info.json
@@ -22,70 +22,75 @@
22 "layouts": { 22 "layouts": {
23 "LAYOUT": { 23 "LAYOUT": {
24 "layout": [ 24 "layout": [
25 {"x":0, "y":0}, 25 {"matrix": [0, 0], "x": 0, "y": 0},
26 {"x":1, "y":0}, 26 {"matrix": [0, 1], "x": 1, "y": 0},
27 {"x":2, "y":0}, 27 {"matrix": [0, 2], "x": 2, "y": 0},
28 {"x":3, "y":0}, 28 {"matrix": [0, 3], "x": 3, "y": 0},
29 {"x":4, "y":0}, 29 {"matrix": [0, 4], "x": 4, "y": 0},
30 {"x":5, "y":0}, 30 {"matrix": [0, 5], "x": 5, "y": 0},
31 {"x":7, "y":0},
32 {"x":8, "y":0},
33 {"x":9, "y":0},
34 {"x":10, "y":0},
35 {"x":11, "y":0},
36 {"x":12, "y":0},
37 31
38 {"x":0, "y":1}, 32 {"matrix": [5, 5], "x": 7, "y": 0},
39 {"x":1, "y":1}, 33 {"matrix": [5, 4], "x": 8, "y": 0},
40 {"x":2, "y":1}, 34 {"matrix": [5, 3], "x": 9, "y": 0},
41 {"x":3, "y":1}, 35 {"matrix": [5, 2], "x": 10, "y": 0},
42 {"x":4, "y":1}, 36 {"matrix": [5, 1], "x": 11, "y": 0},
43 {"x":5, "y":1}, 37 {"matrix": [5, 0], "x": 12, "y": 0},
44 {"x":7, "y":1},
45 {"x":8, "y":1},
46 {"x":9, "y":1},
47 {"x":10, "y":1},
48 {"x":11, "y":1},
49 {"x":12, "y":1},
50 38
51 {"x":0, "y":2}, 39 {"matrix": [1, 0], "x": 0, "y": 1},
52 {"x":1, "y":2}, 40 {"matrix": [1, 1], "x": 1, "y": 1},
53 {"x":2, "y":2}, 41 {"matrix": [1, 2], "x": 2, "y": 1},
54 {"x":3, "y":2}, 42 {"matrix": [1, 3], "x": 3, "y": 1},
55 {"x":4, "y":2}, 43 {"matrix": [1, 4], "x": 4, "y": 1},
56 {"x":5, "y":2}, 44 {"matrix": [1, 5], "x": 5, "y": 1},
57 {"x":7, "y":2},
58 {"x":8, "y":2},
59 {"x":9, "y":2},
60 {"x":10, "y":2},
61 {"x":11, "y":2},
62 {"x":12, "y":2},
63 45
64 {"x":0, "y":3}, 46 {"matrix": [6, 5], "x": 7, "y": 1},
65 {"x":1, "y":3}, 47 {"matrix": [6, 4], "x": 8, "y": 1},
66 {"x":2, "y":3}, 48 {"matrix": [6, 3], "x": 9, "y": 1},
67 {"x":3, "y":3}, 49 {"matrix": [6, 2], "x": 10, "y": 1},
68 {"x":4, "y":3}, 50 {"matrix": [6, 1], "x": 11, "y": 1},
69 {"x":5, "y":3}, 51 {"matrix": [6, 0], "x": 12, "y": 1},
70 {"x":7, "y":3},
71 {"x":8, "y":3},
72 {"x":9, "y":3},
73 {"x":10, "y":3},
74 {"x":11, "y":3},
75 {"x":12, "y":3},
76 52
77 {"x":0, "y":4}, 53 {"matrix": [2, 0], "x": 0, "y": 2},
78 {"x":1, "y":4}, 54 {"matrix": [2, 1], "x": 1, "y": 2},
79 {"x":2, "y":4}, 55 {"matrix": [2, 2], "x": 2, "y": 2},
80 {"x":3, "y":4}, 56 {"matrix": [2, 3], "x": 3, "y": 2},
81 {"x":4, "y":4}, 57 {"matrix": [2, 4], "x": 4, "y": 2},
82 {"x":5, "y":4}, 58 {"matrix": [2, 5], "x": 5, "y": 2},
83 {"x":7, "y":4}, 59
84 {"x":8, "y":4}, 60 {"matrix": [7, 5], "x": 7, "y": 2},
85 {"x":9, "y":4}, 61 {"matrix": [7, 4], "x": 8, "y": 2},
86 {"x":10, "y":4}, 62 {"matrix": [7, 3], "x": 9, "y": 2},
87 {"x":11, "y":4}, 63 {"matrix": [7, 2], "x": 10, "y": 2},
88 {"x":12, "y":4} 64 {"matrix": [7, 1], "x": 11, "y": 2},
65 {"matrix": [7, 0], "x": 12, "y": 2},
66
67 {"matrix": [3, 0], "x": 0, "y": 3},
68 {"matrix": [3, 1], "x": 1, "y": 3},
69 {"matrix": [3, 2], "x": 2, "y": 3},
70 {"matrix": [3, 3], "x": 3, "y": 3},
71 {"matrix": [3, 4], "x": 4, "y": 3},
72 {"matrix": [3, 5], "x": 5, "y": 3},
73
74 {"matrix": [8, 5], "x": 7, "y": 3},
75 {"matrix": [8, 4], "x": 8, "y": 3},
76 {"matrix": [8, 3], "x": 9, "y": 3},
77 {"matrix": [8, 2], "x": 10, "y": 3},
78 {"matrix": [8, 1], "x": 11, "y": 3},
79 {"matrix": [8, 0], "x": 12, "y": 3},
80
81 {"matrix": [4, 0], "x": 0, "y": 4},
82 {"matrix": [4, 1], "x": 1, "y": 4},
83 {"matrix": [4, 2], "x": 2, "y": 4},
84 {"matrix": [4, 3], "x": 3, "y": 4},
85 {"matrix": [4, 4], "x": 4, "y": 4},
86 {"matrix": [4, 5], "x": 5, "y": 4},
87
88 {"matrix": [9, 5], "x": 7, "y": 4},
89 {"matrix": [9, 4], "x": 8, "y": 4},
90 {"matrix": [9, 3], "x": 9, "y": 4},
91 {"matrix": [9, 2], "x": 10, "y": 4},
92 {"matrix": [9, 1], "x": 11, "y": 4},
93 {"matrix": [9, 0], "x": 12, "y": 4}
89 ] 94 ]
90 } 95 }
91 } 96 }
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c
index 62597d0060..3fda310364 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c
+++ b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include "5x6_5x8.h" 17#include "quantum.h"
18 18
19#ifdef RGB_MATRIX_ENABLE 19#ifdef RGB_MATRIX_ENABLE
20led_config_t g_led_config = { { 20led_config_t g_led_config = { {
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h
deleted file mode 100644
index 756f90db4b..0000000000
--- a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h
+++ /dev/null
@@ -1,39 +0,0 @@
1/* Copyright 2021 omkbd
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define LAYOUT( \
22 L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
23 L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
24 L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \
25 L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \
26 L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47 \
27 ) \
28 { \
29 { KC_NO, KC_NO, L02, L03, L04, L05, L06, L07 }, \
30 { KC_NO, KC_NO, L12, L13, L14, L15, L16, L17 }, \
31 { KC_NO, KC_NO, L22, L23, L24, L25, L26, L27 }, \
32 { KC_NO, KC_NO, L32, L33, L34, L35, L36, L37 }, \
33 { KC_NO, KC_NO, L42, L43, L44, L45, L46, L47 }, \
34 { R07, R06, R05, R04, R03, R02, R01, R00 }, \
35 { R17, R16, R15, R14, R13, R12, R11, R10 }, \
36 { R27, R26, R25, R24, R23, R22, R21, R20 }, \
37 { R37, R36, R35, R34, R33, R32, R31, R30 }, \
38 { R47, R46, R45, R44, R43, R42, R41, R40 } \
39 }
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json
index fa4f30bd7e..b597d80a12 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json
@@ -25,80 +25,85 @@
25 "layouts": { 25 "layouts": {
26 "LAYOUT": { 26 "LAYOUT": {
27 "layout": [ 27 "layout": [
28 {"x":0, "y":0}, 28 {"matrix": [0, 2], "x": 0, "y": 0},
29 {"x":1, "y":0}, 29 {"matrix": [0, 3], "x": 1, "y": 0},
30 {"x":2, "y":0}, 30 {"matrix": [0, 4], "x": 2, "y": 0},
31 {"x":3, "y":0}, 31 {"matrix": [0, 5], "x": 3, "y": 0},
32 {"x":4, "y":0}, 32 {"matrix": [0, 6], "x": 4, "y": 0},
33 {"x":5, "y":0}, 33 {"matrix": [0, 7], "x": 5, "y": 0},
34 {"x":7, "y":0},
35 {"x":8, "y":0},
36 {"x":9, "y":0},
37 {"x":10, "y":0},
38 {"x":11, "y":0},
39 {"x":12, "y":0},
40 {"x":13, "y":0},
41 {"x":14, "y":0},
42 34
43 {"x":0, "y":1}, 35 {"matrix": [5, 7], "x": 7, "y": 0},
44 {"x":1, "y":1}, 36 {"matrix": [5, 6], "x": 8, "y": 0},
45 {"x":2, "y":1}, 37 {"matrix": [5, 5], "x": 9, "y": 0},
46 {"x":3, "y":1}, 38 {"matrix": [5, 4], "x": 10, "y": 0},
47 {"x":4, "y":1}, 39 {"matrix": [5, 3], "x": 11, "y": 0},
48 {"x":5, "y":1}, 40 {"matrix": [5, 2], "x": 12, "y": 0},
49 {"x":7, "y":1}, 41 {"matrix": [5, 1], "x": 13, "y": 0},
50 {"x":8, "y":1}, 42 {"matrix": [5, 0], "x": 14, "y": 0},
51 {"x":9, "y":1},
52 {"x":10, "y":1},
53 {"x":11, "y":1},
54 {"x":12, "y":1},
55 {"x":13, "y":1},
56 {"x":14, "y":1},
57 43
58 {"x":0, "y":2}, 44 {"matrix": [1, 2], "x": 0, "y": 1},
59 {"x":1, "y":2}, 45 {"matrix": [1, 3], "x": 1, "y": 1},
60 {"x":2, "y":2}, 46 {"matrix": [1, 4], "x": 2, "y": 1},
61 {"x":3, "y":2}, 47 {"matrix": [1, 5], "x": 3, "y": 1},
62 {"x":4, "y":2}, 48 {"matrix": [1, 6], "x": 4, "y": 1},
63 {"x":5, "y":2}, 49 {"matrix": [1, 7], "x": 5, "y": 1},
64 {"x":7, "y":2},
65 {"x":8, "y":2},
66 {"x":9, "y":2},
67 {"x":10, "y":2},
68 {"x":11, "y":2},
69 {"x":12, "y":2},
70 {"x":13, "y":2},
71 {"x":14, "y":2},
72 50
73 {"x":0, "y":3}, 51 {"matrix": [6, 7], "x": 7, "y": 1},
74 {"x":1, "y":3}, 52 {"matrix": [6, 6], "x": 8, "y": 1},
75 {"x":2, "y":3}, 53 {"matrix": [6, 5], "x": 9, "y": 1},
76 {"x":3, "y":3}, 54 {"matrix": [6, 4], "x": 10, "y": 1},
77 {"x":4, "y":3}, 55 {"matrix": [6, 3], "x": 11, "y": 1},
78 {"x":5, "y":3}, 56 {"matrix": [6, 2], "x": 12, "y": 1},
79 {"x":7, "y":3}, 57 {"matrix": [6, 1], "x": 13, "y": 1},
80 {"x":8, "y":3}, 58 {"matrix": [6, 0], "x": 14, "y": 1},
81 {"x":9, "y":3},
82 {"x":10, "y":3},
83 {"x":11, "y":3},
84 {"x":12, "y":3},
85 {"x":13, "y":3},
86 {"x":14, "y":3},
87 59
88 {"x":0, "y":4}, 60 {"matrix": [2, 2], "x": 0, "y": 2},
89 {"x":1, "y":4}, 61 {"matrix": [2, 3], "x": 1, "y": 2},
90 {"x":2, "y":4}, 62 {"matrix": [2, 4], "x": 2, "y": 2},
91 {"x":3, "y":4}, 63 {"matrix": [2, 5], "x": 3, "y": 2},
92 {"x":4, "y":4}, 64 {"matrix": [2, 6], "x": 4, "y": 2},
93 {"x":5, "y":4}, 65 {"matrix": [2, 7], "x": 5, "y": 2},
94 {"x":7, "y":4}, 66
95 {"x":8, "y":4}, 67 {"matrix": [7, 7], "x": 7, "y": 2},
96 {"x":9, "y":4}, 68 {"matrix": [7, 6], "x": 8, "y": 2},
97 {"x":10, "y":4}, 69 {"matrix": [7, 5], "x": 9, "y": 2},
98 {"x":11, "y":4}, 70 {"matrix": [7, 4], "x": 10, "y": 2},
99 {"x":12, "y":4}, 71 {"matrix": [7, 3], "x": 11, "y": 2},
100 {"x":13, "y":4}, 72 {"matrix": [7, 2], "x": 12, "y": 2},
101 {"x":14, "y":4} 73 {"matrix": [7, 1], "x": 13, "y": 2},
74 {"matrix": [7, 0], "x": 14, "y": 2},
75
76 {"matrix": [3, 2], "x": 0, "y": 3},
77 {"matrix": [3, 3], "x": 1, "y": 3},
78 {"matrix": [3, 4], "x": 2, "y": 3},
79 {"matrix": [3, 5], "x": 3, "y": 3},
80 {"matrix": [3, 6], "x": 4, "y": 3},
81 {"matrix": [3, 7], "x": 5, "y": 3},
82
83 {"matrix": [8, 7], "x": 7, "y": 3},
84 {"matrix": [8, 6], "x": 8, "y": 3},
85 {"matrix": [8, 5], "x": 9, "y": 3},
86 {"matrix": [8, 4], "x": 10, "y": 3},
87 {"matrix": [8, 3], "x": 11, "y": 3},
88 {"matrix": [8, 2], "x": 12, "y": 3},
89 {"matrix": [8, 1], "x": 13, "y": 3},
90 {"matrix": [8, 0], "x": 14, "y": 3},
91
92 {"matrix": [4, 2], "x": 0, "y": 4},
93 {"matrix": [4, 3], "x": 1, "y": 4},
94 {"matrix": [4, 4], "x": 2, "y": 4},
95 {"matrix": [4, 5], "x": 3, "y": 4},
96 {"matrix": [4, 6], "x": 4, "y": 4},
97 {"matrix": [4, 7], "x": 5, "y": 4},
98
99 {"matrix": [9, 7], "x": 7, "y": 4},
100 {"matrix": [9, 6], "x": 8, "y": 4},
101 {"matrix": [9, 5], "x": 9, "y": 4},
102 {"matrix": [9, 4], "x": 10, "y": 4},
103 {"matrix": [9, 3], "x": 11, "y": 4},
104 {"matrix": [9, 2], "x": 12, "y": 4},
105 {"matrix": [9, 1], "x": 13, "y": 4},
106 {"matrix": [9, 0], "x": 14, "y": 4}
102 ] 107 ]
103 } 108 }
104 } 109 }
diff --git a/keyboards/omkbd/runner3680/5x7/5x7.h b/keyboards/omkbd/runner3680/5x7/5x7.h
deleted file mode 100644
index 1fe3397c97..0000000000
--- a/keyboards/omkbd/runner3680/5x7/5x7.h
+++ /dev/null
@@ -1,23 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT( \
6 L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
7 L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
8 L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
9 L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
10 L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
11 ) \
12 { \
13 { L00, L01, L02, L03, L04, L05, L06 }, \
14 { L10, L11, L12, L13, L14, L15, L16 }, \
15 { L20, L21, L22, L23, L24, L25, L26 }, \
16 { L30, L31, L32, L33, L34, L35, L36 }, \
17 { L40, L41, L42, L43, L44, L45, L46 }, \
18 { R06, R05, R04, R03, R02, R01, R00 }, \
19 { R16, R15, R14, R13, R12, R11, R10 }, \
20 { R26, R25, R24, R23, R22, R21, R20 }, \
21 { R36, R35, R34, R33, R32, R31, R30 }, \
22 { R46, R45, R44, R43, R42, R41, R40 } \
23 }
diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json
index c7cc414c5d..e9460d7d18 100644
--- a/keyboards/omkbd/runner3680/5x7/info.json
+++ b/keyboards/omkbd/runner3680/5x7/info.json
@@ -22,80 +22,85 @@
22 "layouts": { 22 "layouts": {
23 "LAYOUT": { 23 "LAYOUT": {
24 "layout": [ 24 "layout": [
25 {"x":0, "y":0}, 25 {"matrix": [0, 0], "x": 0, "y": 0},
26 {"x":1, "y":0}, 26 {"matrix": [0, 1], "x": 1, "y": 0},
27 {"x":2, "y":0}, 27 {"matrix": [0, 2], "x": 2, "y": 0},
28 {"x":3, "y":0}, 28 {"matrix": [0, 3], "x": 3, "y": 0},
29 {"x":4, "y":0}, 29 {"matrix": [0, 4], "x": 4, "y": 0},
30 {"x":5, "y":0}, 30 {"matrix": [0, 5], "x": 5, "y": 0},
31 {"x":6, "y":0}, 31 {"matrix": [0, 6], "x": 6, "y": 0},
32 {"x":8, "y":0},
33 {"x":9, "y":0},
34 {"x":10, "y":0},
35 {"x":11, "y":0},
36 {"x":12, "y":0},
37 {"x":13, "y":0},
38 {"x":14, "y":0},
39 32
40 {"x":0, "y":1}, 33 {"matrix": [5, 6], "x": 8, "y": 0},
41 {"x":1, "y":1}, 34 {"matrix": [5, 5], "x": 9, "y": 0},
42 {"x":2, "y":1}, 35 {"matrix": [5, 4], "x": 10, "y": 0},
43 {"x":3, "y":1}, 36 {"matrix": [5, 3], "x": 11, "y": 0},
44 {"x":4, "y":1}, 37 {"matrix": [5, 2], "x": 12, "y": 0},
45 {"x":5, "y":1}, 38 {"matrix": [5, 1], "x": 13, "y": 0},
46 {"x":6, "y":1}, 39 {"matrix": [5, 0], "x": 14, "y": 0},
47 {"x":8, "y":1},
48 {"x":9, "y":1},
49 {"x":10, "y":1},
50 {"x":11, "y":1},
51 {"x":12, "y":1},
52 {"x":13, "y":1},
53 {"x":14, "y":1},
54 40
55 {"x":0, "y":2}, 41 {"matrix": [1, 0], "x": 0, "y": 1},
56 {"x":1, "y":2}, 42 {"matrix": [1, 1], "x": 1, "y": 1},
57 {"x":2, "y":2}, 43 {"matrix": [1, 2], "x": 2, "y": 1},
58 {"x":3, "y":2}, 44 {"matrix": [1, 3], "x": 3, "y": 1},
59 {"x":4, "y":2}, 45 {"matrix": [1, 4], "x": 4, "y": 1},
60 {"x":5, "y":2}, 46 {"matrix": [1, 5], "x": 5, "y": 1},
61 {"x":6, "y":2}, 47 {"matrix": [1, 6], "x": 6, "y": 1},
62 {"x":8, "y":2},
63 {"x":9, "y":2},
64 {"x":10, "y":2},
65 {"x":11, "y":2},
66 {"x":12, "y":2},
67 {"x":13, "y":2},
68 {"x":14, "y":2},
69 48
70 {"x":0, "y":3}, 49 {"matrix": [6, 6], "x": 8, "y": 1},
71 {"x":1, "y":3}, 50 {"matrix": [6, 5], "x": 9, "y": 1},
72 {"x":2, "y":3}, 51 {"matrix": [6, 4], "x": 10, "y": 1},
73 {"x":3, "y":3}, 52 {"matrix": [6, 3], "x": 11, "y": 1},
74 {"x":4, "y":3}, 53 {"matrix": [6, 2], "x": 12, "y": 1},
75 {"x":5, "y":3}, 54 {"matrix": [6, 1], "x": 13, "y": 1},
76 {"x":6, "y":3}, 55 {"matrix": [6, 0], "x": 14, "y": 1},
77 {"x":8, "y":3},
78 {"x":9, "y":3},
79 {"x":10, "y":3},
80 {"x":11, "y":3},
81 {"x":12, "y":3},
82 {"x":13, "y":3},
83 {"x":14, "y":3},
84 56
85 {"x":0, "y":4}, 57 {"matrix": [2, 0], "x": 0, "y": 2},
86 {"x":1, "y":4}, 58 {"matrix": [2, 1], "x": 1, "y": 2},
87 {"x":2, "y":4}, 59 {"matrix": [2, 2], "x": 2, "y": 2},
88 {"x":3, "y":4}, 60 {"matrix": [2, 3], "x": 3, "y": 2},
89 {"x":4, "y":4}, 61 {"matrix": [2, 4], "x": 4, "y": 2},
90 {"x":5, "y":4}, 62 {"matrix": [2, 5], "x": 5, "y": 2},
91 {"x":6, "y":4}, 63 {"matrix": [2, 6], "x": 6, "y": 2},
92 {"x":8, "y":4}, 64
93 {"x":9, "y":4}, 65 {"matrix": [7, 6], "x": 8, "y": 2},
94 {"x":10, "y":4}, 66 {"matrix": [7, 5], "x": 9, "y": 2},
95 {"x":11, "y":4}, 67 {"matrix": [7, 4], "x": 10, "y": 2},
96 {"x":12, "y":4}, 68 {"matrix": [7, 3], "x": 11, "y": 2},
97 {"x":13, "y":4}, 69 {"matrix": [7, 2], "x": 12, "y": 2},
98 {"x":14, "y":4} 70 {"matrix": [7, 1], "x": 13, "y": 2},
71 {"matrix": [7, 0], "x": 14, "y": 2},
72
73 {"matrix": [3, 0], "x": 0, "y": 3},
74 {"matrix": [3, 1], "x": 1, "y": 3},
75 {"matrix": [3, 2], "x": 2, "y": 3},
76 {"matrix": [3, 3], "x": 3, "y": 3},
77 {"matrix": [3, 4], "x": 4, "y": 3},
78 {"matrix": [3, 5], "x": 5, "y": 3},
79 {"matrix": [3, 6], "x": 6, "y": 3},
80
81 {"matrix": [8, 6], "x": 8, "y": 3},
82 {"matrix": [8, 5], "x": 9, "y": 3},
83 {"matrix": [8, 4], "x": 10, "y": 3},
84 {"matrix": [8, 3], "x": 11, "y": 3},
85 {"matrix": [8, 2], "x": 12, "y": 3},
86 {"matrix": [8, 1], "x": 13, "y": 3},
87 {"matrix": [8, 0], "x": 14, "y": 3},
88
89 {"matrix": [4, 0], "x": 0, "y": 4},
90 {"matrix": [4, 1], "x": 1, "y": 4},
91 {"matrix": [4, 2], "x": 2, "y": 4},
92 {"matrix": [4, 3], "x": 3, "y": 4},
93 {"matrix": [4, 4], "x": 4, "y": 4},
94 {"matrix": [4, 5], "x": 5, "y": 4},
95 {"matrix": [4, 6], "x": 6, "y": 4},
96
97 {"matrix": [9, 6], "x": 8, "y": 4},
98 {"matrix": [9, 5], "x": 9, "y": 4},
99 {"matrix": [9, 4], "x": 10, "y": 4},
100 {"matrix": [9, 3], "x": 11, "y": 4},
101 {"matrix": [9, 2], "x": 12, "y": 4},
102 {"matrix": [9, 1], "x": 13, "y": 4},
103 {"matrix": [9, 0], "x": 14, "y": 4}
99 ] 104 ]
100 } 105 }
101 } 106 }
diff --git a/keyboards/omkbd/runner3680/5x8/5x8.h b/keyboards/omkbd/runner3680/5x8/5x8.h
deleted file mode 100644
index b21b14259d..0000000000
--- a/keyboards/omkbd/runner3680/5x8/5x8.h
+++ /dev/null
@@ -1,23 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT( \
6 L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
7 L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
8 L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \
9 L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \
10 L40, L41, L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47 \
11 ) \
12 { \
13 { L00, L01, L02, L03, L04, L05, L06, L07 }, \
14 { L10, L11, L12, L13, L14, L15, L16, L17 }, \
15 { L20, L21, L22, L23, L24, L25, L26, L27 }, \
16 { L30, L31, L32, L33, L34, L35, L36, L37 }, \
17 { L40, L41, L42, L43, L44, L45, L46, L47 }, \
18 { R07, R06, R05, R04, R03, R02, R01, R00 }, \
19 { R17, R16, R15, R14, R13, R12, R11, R10 }, \
20 { R27, R26, R25, R24, R23, R22, R21, R20 }, \
21 { R37, R36, R35, R34, R33, R32, R31, R30 }, \
22 { R47, R46, R45, R44, R43, R42, R41, R40 } \
23 }
diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json
index 5b4f3ad5cd..e851ec39b4 100644
--- a/keyboards/omkbd/runner3680/5x8/info.json
+++ b/keyboards/omkbd/runner3680/5x8/info.json
@@ -22,90 +22,95 @@
22 "layouts": { 22 "layouts": {
23 "LAYOUT": { 23 "LAYOUT": {
24 "layout": [ 24 "layout": [
25 {"x":0, "y":0}, 25 {"matrix": [0, 0], "x": 0, "y": 0},
26 {"x":1, "y":0}, 26 {"matrix": [0, 1], "x": 1, "y": 0},
27 {"x":2, "y":0}, 27 {"matrix": [0, 2], "x": 2, "y": 0},
28 {"x":3, "y":0}, 28 {"matrix": [0, 3], "x": 3, "y": 0},
29 {"x":4, "y":0}, 29 {"matrix": [0, 4], "x": 4, "y": 0},
30 {"x":5, "y":0}, 30 {"matrix": [0, 5], "x": 5, "y": 0},
31 {"x":6, "y":0}, 31 {"matrix": [0, 6], "x": 6, "y": 0},
32 {"x":7, "y":0}, 32 {"matrix": [0, 7], "x": 7, "y": 0},
33 {"x":9, "y":0},
34 {"x":10, "y":0},
35 {"x":11, "y":0},
36 {"x":12, "y":0},
37 {"x":13, "y":0},
38 {"x":14, "y":0},
39 {"x":15, "y":0},
40 {"x":16, "y":0},
41 33
42 {"x":0, "y":1}, 34 {"matrix": [5, 7], "x": 9, "y": 0},
43 {"x":1, "y":1}, 35 {"matrix": [5, 6], "x": 10, "y": 0},
44 {"x":2, "y":1}, 36 {"matrix": [5, 5], "x": 11, "y": 0},
45 {"x":3, "y":1}, 37 {"matrix": [5, 4], "x": 12, "y": 0},
46 {"x":4, "y":1}, 38 {"matrix": [5, 3], "x": 13, "y": 0},
47 {"x":5, "y":1}, 39 {"matrix": [5, 2], "x": 14, "y": 0},
48 {"x":6, "y":1}, 40 {"matrix": [5, 1], "x": 15, "y": 0},
49 {"x":7, "y":1}, 41 {"matrix": [5, 0], "x": 16, "y": 0},
50 {"x":9, "y":1},
51 {"x":10, "y":1},
52 {"x":11, "y":1},
53 {"x":12, "y":1},
54 {"x":13, "y":1},
55 {"x":14, "y":1},
56 {"x":15, "y":1},
57 {"x":16, "y":1},
58 42
59 {"x":0, "y":2}, 43 {"matrix": [1, 0], "x": 0, "y": 1},
60 {"x":1, "y":2}, 44 {"matrix": [1, 1], "x": 1, "y": 1},
61 {"x":2, "y":2}, 45 {"matrix": [1, 2], "x": 2, "y": 1},
62 {"x":3, "y":2}, 46 {"matrix": [1, 3], "x": 3, "y": 1},
63 {"x":4, "y":2}, 47 {"matrix": [1, 4], "x": 4, "y": 1},
64 {"x":5, "y":2}, 48 {"matrix": [1, 5], "x": 5, "y": 1},
65 {"x":6, "y":2}, 49 {"matrix": [1, 6], "x": 6, "y": 1},
66 {"x":7, "y":2}, 50 {"matrix": [1, 7], "x": 7, "y": 1},
67 {"x":9, "y":2},
68 {"x":10, "y":2},
69 {"x":11, "y":2},
70 {"x":12, "y":2},
71 {"x":13, "y":2},
72 {"x":14, "y":2},
73 {"x":15, "y":2},
74 {"x":16, "y":2},
75 51
76 {"x":0, "y":3}, 52 {"matrix": [6, 7], "x": 9, "y": 1},
77 {"x":1, "y":3}, 53 {"matrix": [6, 6], "x": 10, "y": 1},
78 {"x":2, "y":3}, 54 {"matrix": [6, 5], "x": 11, "y": 1},
79 {"x":3, "y":3}, 55 {"matrix": [6, 4], "x": 12, "y": 1},
80 {"x":4, "y":3}, 56 {"matrix": [6, 3], "x": 13, "y": 1},
81 {"x":5, "y":3}, 57 {"matrix": [6, 2], "x": 14, "y": 1},
82 {"x":6, "y":3}, 58 {"matrix": [6, 1], "x": 15, "y": 1},
83 {"x":7, "y":3}, 59 {"matrix": [6, 0], "x": 16, "y": 1},
84 {"x":9, "y":3},
85 {"x":10, "y":3},
86 {"x":11, "y":3},
87 {"x":12, "y":3},
88 {"x":13, "y":3},
89 {"x":14, "y":3},
90 {"x":15, "y":3},
91 {"x":16, "y":3},
92 60
93 {"x":0, "y":4}, 61 {"matrix": [2, 0], "x": 0, "y": 2},
94 {"x":1, "y":4}, 62 {"matrix": [2, 1], "x": 1, "y": 2},
95 {"x":2, "y":4}, 63 {"matrix": [2, 2], "x": 2, "y": 2},
96 {"x":3, "y":4}, 64 {"matrix": [2, 3], "x": 3, "y": 2},
97 {"x":4, "y":4}, 65 {"matrix": [2, 4], "x": 4, "y": 2},
98 {"x":5, "y":4}, 66 {"matrix": [2, 5], "x": 5, "y": 2},
99 {"x":6, "y":4}, 67 {"matrix": [2, 6], "x": 6, "y": 2},
100 {"x":7, "y":4}, 68 {"matrix": [2, 7], "x": 7, "y": 2},
101 {"x":9, "y":4}, 69
102 {"x":10, "y":4}, 70 {"matrix": [7, 7], "x": 9, "y": 2},
103 {"x":11, "y":4}, 71 {"matrix": [7, 6], "x": 10, "y": 2},
104 {"x":12, "y":4}, 72 {"matrix": [7, 5], "x": 11, "y": 2},
105 {"x":13, "y":4}, 73 {"matrix": [7, 4], "x": 12, "y": 2},
106 {"x":14, "y":4}, 74 {"matrix": [7, 3], "x": 13, "y": 2},
107 {"x":15, "y":4}, 75 {"matrix": [7, 2], "x": 14, "y": 2},
108 {"x":16, "y":4} 76 {"matrix": [7, 1], "x": 15, "y": 2},
77 {"matrix": [7, 0], "x": 16, "y": 2},
78
79 {"matrix": [3, 0], "x": 0, "y": 3},
80 {"matrix": [3, 1], "x": 1, "y": 3},
81 {"matrix": [3, 2], "x": 2, "y": 3},
82 {"matrix": [3, 3], "x": 3, "y": 3},
83 {"matrix": [3, 4], "x": 4, "y": 3},
84 {"matrix": [3, 5], "x": 5, "y": 3},
85 {"matrix": [3, 6], "x": 6, "y": 3},
86 {"matrix": [3, 7], "x": 7, "y": 3},
87
88 {"matrix": [8, 7], "x": 9, "y": 3},
89 {"matrix": [8, 6], "x": 10, "y": 3},
90 {"matrix": [8, 5], "x": 11, "y": 3},
91 {"matrix": [8, 4], "x": 12, "y": 3},
92 {"matrix": [8, 3], "x": 13, "y": 3},
93 {"matrix": [8, 2], "x": 14, "y": 3},
94 {"matrix": [8, 1], "x": 15, "y": 3},
95 {"matrix": [8, 0], "x": 16, "y": 3},
96
97 {"matrix": [4, 0], "x": 0, "y": 4},
98 {"matrix": [4, 1], "x": 1, "y": 4},
99 {"matrix": [4, 2], "x": 2, "y": 4},
100 {"matrix": [4, 3], "x": 3, "y": 4},
101 {"matrix": [4, 4], "x": 4, "y": 4},
102 {"matrix": [4, 5], "x": 5, "y": 4},
103 {"matrix": [4, 6], "x": 6, "y": 4},
104 {"matrix": [4, 7], "x": 7, "y": 4},
105
106 {"matrix": [9, 7], "x": 9, "y": 4},
107 {"matrix": [9, 6], "x": 10, "y": 4},
108 {"matrix": [9, 5], "x": 11, "y": 4},
109 {"matrix": [9, 4], "x": 12, "y": 4},
110 {"matrix": [9, 3], "x": 13, "y": 4},
111 {"matrix": [9, 2], "x": 14, "y": 4},
112 {"matrix": [9, 1], "x": 15, "y": 4},
113 {"matrix": [9, 0], "x": 16, "y": 4}
109 ] 114 ]
110 } 115 }
111 } 116 }
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 06:01:03 +0000