summaryrefslogtreecommitdiff
path: root/keyboards/nacly
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/nacly
parent941e159a28f1bdbdd913654c4f9a14291f8d5299 (diff)
Move single `LAYOUT`s to data driven (#20365)
Diffstat (limited to 'keyboards/nacly')
-rw-r--r--keyboards/nacly/sodium42/info.json84
-rw-r--r--keyboards/nacly/sodium42/sodium42.h36
-rw-r--r--keyboards/nacly/sodium50/info.json100
-rw-r--r--keyboards/nacly/sodium50/sodium50.h36
-rw-r--r--keyboards/nacly/sodium62/info.json124
-rw-r--r--keyboards/nacly/sodium62/sodium62.c2
-rw-r--r--keyboards/nacly/sodium62/sodium62.h39
-rw-r--r--keyboards/nacly/splitreus62/info.json76
-rw-r--r--keyboards/nacly/splitreus62/splitreus62.h26
-rw-r--r--keyboards/nacly/ua62/info.json76
-rw-r--r--keyboards/nacly/ua62/ua62.h41
11 files changed, 303 insertions, 337 deletions
diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json
index 255d4e85e2..0c92f469ae 100644
--- a/keyboards/nacly/sodium42/info.json
+++ b/keyboards/nacly/sodium42/info.json
@@ -21,55 +21,55 @@
21 "layouts": { 21 "layouts": {
22 "LAYOUT": { 22 "LAYOUT": {
23 "layout": [ 23 "layout": [
24 {"x": 0, "y": 0.75}, 24 {"matrix": [0, 0], "x": 0, "y": 0.75},
25 {"x": 1, "y": 0.5}, 25 {"matrix": [0, 1], "x": 1, "y": 0.5},
26 {"x": 2, "y": 0}, 26 {"matrix": [0, 2], "x": 2, "y": 0},
27 {"x": 3, "y": 0.25}, 27 {"matrix": [0, 3], "x": 3, "y": 0.25},
28 {"x": 4, "y": 1}, 28 {"matrix": [0, 4], "x": 4, "y": 1},
29 29
30 {"x": 8.75, "y": 1}, 30 {"matrix": [4, 4], "x": 8.75, "y": 1},
31 {"x": 9.75, "y": 0.5}, 31 {"matrix": [4, 3], "x": 9.75, "y": 0.5},
32 {"x": 10.75, "y": 0}, 32 {"matrix": [4, 2], "x": 10.75, "y": 0},
33 {"x": 11.75, "y": 0.5}, 33 {"matrix": [4, 1], "x": 11.75, "y": 0.5},
34 {"x": 12.75, "y": 0.75}, 34 {"matrix": [4, 0], "x": 12.75, "y": 0.75},
35 35
36 {"x": 0, "y": 1.75}, 36 {"matrix": [1, 0], "x": 0, "y": 1.75},
37 {"x": 1, "y": 1.5}, 37 {"matrix": [1, 1], "x": 1, "y": 1.5},
38 {"x": 2, "y": 1}, 38 {"matrix": [1, 2], "x": 2, "y": 1},
39 {"x": 3, "y": 1.25}, 39 {"matrix": [1, 3], "x": 3, "y": 1.25},
40 {"x": 4, "y": 2}, 40 {"matrix": [1, 4], "x": 4, "y": 2},
41 41
42 {"x": 8.75, "y": 2}, 42 {"matrix": [5, 4], "x": 8.75, "y": 2},
43 {"x": 9.75, "y": 1.5}, 43 {"matrix": [5, 3], "x": 9.75, "y": 1.5},
44 {"x": 10.75, "y": 1}, 44 {"matrix": [5, 2], "x": 10.75, "y": 1},
45 {"x": 11.75, "y": 1.5}, 45 {"matrix": [5, 1], "x": 11.75, "y": 1.5},
46 {"x": 12.75, "y": 1.75}, 46 {"matrix": [5, 0], "x": 12.75, "y": 1.75},
47 47
48 {"x": 0, "y": 2.75}, 48 {"matrix": [2, 0], "x": 0, "y": 2.75},
49 {"x": 1, "y": 2.5}, 49 {"matrix": [2, 1], "x": 1, "y": 2.5},
50 {"x": 2, "y": 2}, 50 {"matrix": [2, 2], "x": 2, "y": 2},
51 {"x": 3, "y": 2.25}, 51 {"matrix": [2, 3], "x": 3, "y": 2.25},
52 {"x": 4, "y": 3}, 52 {"matrix": [2, 4], "x": 4, "y": 3},
53 53
54 {"x": 8.75, "y": 3}, 54 {"matrix": [6, 4], "x": 8.75, "y": 3},
55 {"x": 9.75, "y": 2.5}, 55 {"matrix": [6, 3], "x": 9.75, "y": 2.5},
56 {"x": 10.75, "y": 2}, 56 {"matrix": [6, 2], "x": 10.75, "y": 2},
57 {"x": 11.75, "y": 2.5}, 57 {"matrix": [6, 1], "x": 11.75, "y": 2.5},
58 {"x": 12.75, "y": 2.75}, 58 {"matrix": [6, 0], "x": 12.75, "y": 2.75},
59 59
60 {"x": 0, "y": 3.75}, 60 {"matrix": [3, 0], "x": 0, "y": 3.75},
61 {"x": 1, "y": 3.5}, 61 {"matrix": [3, 1], "x": 1, "y": 3.5},
62 {"x": 2, "y": 3}, 62 {"matrix": [3, 2], "x": 2, "y": 3},
63 {"x": 3, "y": 3.25}, 63 {"matrix": [3, 3], "x": 3, "y": 3.25},
64 {"x": 4, "y": 4}, 64 {"matrix": [3, 4], "x": 4, "y": 4},
65 {"x": 5, "y": 4.5}, 65 {"matrix": [3, 5], "x": 5, "y": 4.5},
66 66
67 {"x": 7.75, "y": 4.5}, 67 {"matrix": [7, 5], "x": 7.75, "y": 4.5},
68 {"x": 8.75, "y": 4}, 68 {"matrix": [7, 4], "x": 8.75, "y": 4},
69 {"x": 9.75, "y": 3.5}, 69 {"matrix": [7, 3], "x": 9.75, "y": 3.5},
70 {"x": 10.75, "y": 3}, 70 {"matrix": [7, 2], "x": 10.75, "y": 3},
71 {"x": 11.75, "y": 3.5}, 71 {"matrix": [7, 1], "x": 11.75, "y": 3.5},
72 {"x": 12.75, "y": 3.75} 72 {"matrix": [7, 0], "x": 12.75, "y": 3.75}
73 ] 73 ]
74 } 74 }
75 } 75 }
diff --git a/keyboards/nacly/sodium42/sodium42.h b/keyboards/nacly/sodium42/sodium42.h
deleted file mode 100644
index 427b6f4d43..0000000000
--- a/keyboards/nacly/sodium42/sodium42.h
+++ /dev/null
@@ -1,36 +0,0 @@
1/* Copyright 2022 NaCly
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#pragma once
17
18#include "quantum.h"
19
20#define LAYOUT(\
21 L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \
22 L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
23 L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
24 L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30 \
25)\
26 {\
27 { L00, L01, L02, L03, L04, KC_NO }, \
28 { L10, L11, L12, L13, L14, KC_NO }, \
29 { L20, L21, L22, L23, L24, KC_NO }, \
30 { L30, L31, L32, L33, L34, L35 }, \
31\
32 { R00, R01, R02, R03, R04, KC_NO }, \
33 { R10, R11, R12, R13, R14, KC_NO }, \
34 { R20, R21, R22, R23, R24, KC_NO }, \
35 { R30, R31, R32, R33, R34, R35 } \
36}
diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json
index 182162e39f..920a2f946f 100644
--- a/keyboards/nacly/sodium50/info.json
+++ b/keyboards/nacly/sodium50/info.json
@@ -21,63 +21,63 @@
21 "layouts": { 21 "layouts": {
22 "LAYOUT": { 22 "LAYOUT": {
23 "layout": [ 23 "layout": [
24 {"x": 0, "y": 0.75}, 24 {"matrix": [0, 0], "x": 0, "y": 0.75},
25 {"x": 1, "y": 0.75}, 25 {"matrix": [0, 1], "x": 1, "y": 0.75},
26 {"x": 2, "y": 0.5}, 26 {"matrix": [0, 2], "x": 2, "y": 0.5},
27 {"x": 3, "y": 0}, 27 {"matrix": [0, 3], "x": 3, "y": 0},
28 {"x": 4, "y": 0.25}, 28 {"matrix": [0, 4], "x": 4, "y": 0.25},
29 {"x": 5, "y": 1}, 29 {"matrix": [0, 5], "x": 5, "y": 1},
30 30
31 {"x": 9.75, "y": 1}, 31 {"matrix": [4, 5], "x": 9.75, "y": 1},
32 {"x": 10.75, "y": 0.5}, 32 {"matrix": [4, 4], "x": 10.75, "y": 0.5},
33 {"x": 11.75, "y": 0}, 33 {"matrix": [4, 3], "x": 11.75, "y": 0},
34 {"x": 12.75, "y": 0.5}, 34 {"matrix": [4, 2], "x": 12.75, "y": 0.5},
35 {"x": 13.75, "y": 0.75}, 35 {"matrix": [4, 1], "x": 13.75, "y": 0.75},
36 {"x": 14.75, "y": 0.75}, 36 {"matrix": [4, 0], "x": 14.75, "y": 0.75},
37 37
38 {"x": 0, "y": 1.75}, 38 {"matrix": [1, 0], "x": 0, "y": 1.75},
39 {"x": 1, "y": 1.75}, 39 {"matrix": [1, 1], "x": 1, "y": 1.75},
40 {"x": 2, "y": 1.5}, 40 {"matrix": [1, 2], "x": 2, "y": 1.5},
41 {"x": 3, "y": 1}, 41 {"matrix": [1, 3], "x": 3, "y": 1},
42 {"x": 4, "y": 1.25}, 42 {"matrix": [1, 4], "x": 4, "y": 1.25},
43 {"x": 5, "y": 2}, 43 {"matrix": [1, 5], "x": 5, "y": 2},
44 44
45 {"x": 9.75, "y": 2}, 45 {"matrix": [5, 5], "x": 9.75, "y": 2},
46 {"x": 10.75, "y": 1.5}, 46 {"matrix": [5, 4], "x": 10.75, "y": 1.5},
47 {"x": 11.75, "y": 1}, 47 {"matrix": [5, 3], "x": 11.75, "y": 1},
48 {"x": 12.75, "y": 1.5}, 48 {"matrix": [5, 2], "x": 12.75, "y": 1.5},
49 {"x": 13.75, "y": 1.75}, 49 {"matrix": [5, 1], "x": 13.75, "y": 1.75},
50 {"x": 14.75, "y": 1.75}, 50 {"matrix": [5, 0], "x": 14.75, "y": 1.75},
51 51
52 {"x": 0, "y": 2.75}, 52 {"matrix": [2, 0], "x": 0, "y": 2.75},
53 {"x": 1, "y": 2.75}, 53 {"matrix": [2, 1], "x": 1, "y": 2.75},
54 {"x": 2, "y": 2.5}, 54 {"matrix": [2, 2], "x": 2, "y": 2.5},
55 {"x": 3, "y": 2}, 55 {"matrix": [2, 3], "x": 3, "y": 2},
56 {"x": 4, "y": 2.25}, 56 {"matrix": [2, 4], "x": 4, "y": 2.25},
57 {"x": 5, "y": 3}, 57 {"matrix": [2, 5], "x": 5, "y": 3},
58 58
59 {"x": 9.75, "y": 3}, 59 {"matrix": [6, 5], "x": 9.75, "y": 3},
60 {"x": 10.75, "y": 2.5}, 60 {"matrix": [6, 4], "x": 10.75, "y": 2.5},
61 {"x": 11.75, "y": 2}, 61 {"matrix": [6, 3], "x": 11.75, "y": 2},
62 {"x": 12.75, "y": 2.5}, 62 {"matrix": [6, 2], "x": 12.75, "y": 2.5},
63 {"x": 13.75, "y": 2.75}, 63 {"matrix": [6, 1], "x": 13.75, "y": 2.75},
64 {"x": 14.75, "y": 2.75}, 64 {"matrix": [6, 0], "x": 14.75, "y": 2.75},
65 65
66 {"x": 0, "y": 3.75}, 66 {"matrix": [3, 0], "x": 0, "y": 3.75},
67 {"x": 1, "y": 3.75}, 67 {"matrix": [3, 1], "x": 1, "y": 3.75},
68 {"x": 2, "y": 3.5}, 68 {"matrix": [3, 2], "x": 2, "y": 3.5},
69 {"x": 3, "y": 3}, 69 {"matrix": [3, 3], "x": 3, "y": 3},
70 {"x": 4, "y": 3.25}, 70 {"matrix": [3, 4], "x": 4, "y": 3.25},
71 {"x": 5, "y": 4}, 71 {"matrix": [3, 5], "x": 5, "y": 4},
72 {"x": 6, "y": 4.5}, 72 {"matrix": [3, 6], "x": 6, "y": 4.5},
73 73
74 {"x": 8.75, "y": 4.5}, 74 {"matrix": [7, 6], "x": 8.75, "y": 4.5},
75 {"x": 9.75, "y": 4}, 75 {"matrix": [7, 5], "x": 9.75, "y": 4},
76 {"x": 10.75, "y": 3.5}, 76 {"matrix": [7, 4], "x": 10.75, "y": 3.5},
77 {"x": 11.75, "y": 3}, 77 {"matrix": [7, 3], "x": 11.75, "y": 3},
78 {"x": 12.75, "y": 3.5}, 78 {"matrix": [7, 2], "x": 12.75, "y": 3.5},
79 {"x": 13.75, "y": 3.75}, 79 {"matrix": [7, 1], "x": 13.75, "y": 3.75},
80 {"x": 14.75, "y": 3.75} 80 {"matrix": [7, 0], "x": 14.75, "y": 3.75}
81 ] 81 ]
82 } 82 }
83 } 83 }
diff --git a/keyboards/nacly/sodium50/sodium50.h b/keyboards/nacly/sodium50/sodium50.h
deleted file mode 100644
index 384867f193..0000000000
--- a/keyboards/nacly/sodium50/sodium50.h
+++ /dev/null
@@ -1,36 +0,0 @@
1/* Copyright 2022 NaCly
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#pragma once
17
18#include "quantum.h"
19
20#define LAYOUT(\
21 L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \
22 L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \
23 L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \
24 L30, L31, L32, L33, L34, L35, L36, R36, R35, R34, R33, R32, R31, R30 \
25)\
26 {\
27 { L00, L01, L02, L03, L04, L05, KC_NO }, \
28 { L10, L11, L12, L13, L14, L15, KC_NO }, \
29 { L20, L21, L22, L23, L24, L25, KC_NO }, \
30 { L30, L31, L32, L33, L34, L35, L36 }, \
31\
32 { R00, R01, R02, R03, R04, R05, KC_NO }, \
33 { R10, R11, R12, R13, R14, R15, KC_NO }, \
34 { R20, R21, R22, R23, R24, R25, KC_NO }, \
35 { R30, R31, R32, R33, R34, R35, R36 } \
36}
diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json
index 07e380569b..8632bfabdf 100644
--- a/keyboards/nacly/sodium62/info.json
+++ b/keyboards/nacly/sodium62/info.json
@@ -21,77 +21,77 @@
21 "layouts": { 21 "layouts": {
22 "LAYOUT": { 22 "LAYOUT": {
23 "layout": [ 23 "layout": [
24 {"x": 0, "y": 0.75}, 24 {"matrix": [0, 0], "x": 0, "y": 0.75},
25 {"x": 1, "y": 0.75}, 25 {"matrix": [0, 1], "x": 1, "y": 0.75},
26 {"x": 2, "y": 0.5}, 26 {"matrix": [0, 2], "x": 2, "y": 0.5},
27 {"x": 3, "y": 0}, 27 {"matrix": [0, 3], "x": 3, "y": 0},
28 {"x": 4, "y": 0.25}, 28 {"matrix": [0, 4], "x": 4, "y": 0.25},
29 {"x": 5, "y": 1}, 29 {"matrix": [0, 5], "x": 5, "y": 1},
30 30
31 {"x": 9.75, "y": 1}, 31 {"matrix": [5, 5], "x": 9.75, "y": 1},
32 {"x": 10.75, "y": 0.5}, 32 {"matrix": [5, 4], "x": 10.75, "y": 0.5},
33 {"x": 11.75, "y": 0}, 33 {"matrix": [5, 3], "x": 11.75, "y": 0},
34 {"x": 12.75, "y": 0.5}, 34 {"matrix": [5, 2], "x": 12.75, "y": 0.5},
35 {"x": 13.75, "y": 0.75}, 35 {"matrix": [5, 1], "x": 13.75, "y": 0.75},
36 {"x": 14.75, "y": 0.75}, 36 {"matrix": [5, 0], "x": 14.75, "y": 0.75},
37 37
38 {"x": 0, "y": 1.75}, 38 {"matrix": [1, 0], "x": 0, "y": 1.75},
39 {"x": 1, "y": 1.75}, 39 {"matrix": [1, 1], "x": 1, "y": 1.75},
40 {"x": 2, "y": 1.5}, 40 {"matrix": [1, 2], "x": 2, "y": 1.5},
41 {"x": 3, "y": 1}, 41 {"matrix": [1, 3], "x": 3, "y": 1},
42 {"x": 4, "y": 1.25}, 42 {"matrix": [1, 4], "x": 4, "y": 1.25},
43 {"x": 5, "y": 2}, 43 {"matrix": [1, 5], "x": 5, "y": 2},
44 44
45 {"x": 9.75, "y": 2}, 45 {"matrix": [6, 5], "x": 9.75, "y": 2},
46 {"x": 10.75, "y": 1.5}, 46 {"matrix": [6, 4], "x": 10.75, "y": 1.5},
47 {"x": 11.75, "y": 1}, 47 {"matrix": [6, 3], "x": 11.75, "y": 1},
48 {"x": 12.75, "y": 1.5}, 48 {"matrix": [6, 2], "x": 12.75, "y": 1.5},
49 {"x": 13.75, "y": 1.75}, 49 {"matrix": [6, 1], "x": 13.75, "y": 1.75},
50 {"x": 14.75, "y": 1.75}, 50 {"matrix": [6, 0], "x": 14.75, "y": 1.75},
51 51
52 {"x": 0, "y": 2.75}, 52 {"matrix": [2, 0], "x": 0, "y": 2.75},
53 {"x": 1, "y": 2.75}, 53 {"matrix": [2, 1], "x": 1, "y": 2.75},
54 {"x": 2, "y": 2.5}, 54 {"matrix": [2, 2], "x": 2, "y": 2.5},
55 {"x": 3, "y": 2}, 55 {"matrix": [2, 3], "x": 3, "y": 2},
56 {"x": 4, "y": 2.25}, 56 {"matrix": [2, 4], "x": 4, "y": 2.25},
57 {"x": 5, "y": 3}, 57 {"matrix": [2, 5], "x": 5, "y": 3},
58 58
59 {"x": 9.75, "y": 3}, 59 {"matrix": [7, 5], "x": 9.75, "y": 3},
60 {"x": 10.75, "y": 2.5}, 60 {"matrix": [7, 4], "x": 10.75, "y": 2.5},
61 {"x": 11.75, "y": 2}, 61 {"matrix": [7, 3], "x": 11.75, "y": 2},
62 {"x": 12.75, "y": 2.5}, 62 {"matrix": [7, 2], "x": 12.75, "y": 2.5},
63 {"x": 13.75, "y": 2.75}, 63 {"matrix": [7, 1], "x": 13.75, "y": 2.75},
64 {"x": 14.75, "y": 2.75}, 64 {"matrix": [7, 0], "x": 14.75, "y": 2.75},
65 65
66 {"x": 0, "y": 3.75}, 66 {"matrix": [3, 0], "x": 0, "y": 3.75},
67 {"x": 1, "y": 3.75}, 67 {"matrix": [3, 1], "x": 1, "y": 3.75},
68 {"x": 2, "y": 3.5}, 68 {"matrix": [3, 2], "x": 2, "y": 3.5},
69 {"x": 3, "y": 3}, 69 {"matrix": [3, 3], "x": 3, "y": 3},
70 {"x": 4, "y": 3.25}, 70 {"matrix": [3, 4], "x": 4, "y": 3.25},
71 {"x": 5, "y": 4}, 71 {"matrix": [3, 5], "x": 5, "y": 4},
72 72
73 {"x": 9.75, "y": 4}, 73 {"matrix": [8, 5], "x": 9.75, "y": 4},
74 {"x": 10.75, "y": 3.5}, 74 {"matrix": [8, 4], "x": 10.75, "y": 3.5},
75 {"x": 11.75, "y": 3}, 75 {"matrix": [8, 3], "x": 11.75, "y": 3},
76 {"x": 12.75, "y": 3.5}, 76 {"matrix": [8, 2], "x": 12.75, "y": 3.5},
77 {"x": 13.75, "y": 3.75}, 77 {"matrix": [8, 1], "x": 13.75, "y": 3.75},
78 {"x": 14.75, "y": 3.75}, 78 {"matrix": [8, 0], "x": 14.75, "y": 3.75},
79 79
80 {"x": 0, "y": 4.75}, 80 {"matrix": [4, 0], "x": 0, "y": 4.75},
81 {"x": 1, "y": 4.75}, 81 {"matrix": [4, 1], "x": 1, "y": 4.75},
82 {"x": 2, "y": 4.5}, 82 {"matrix": [4, 2], "x": 2, "y": 4.5},
83 {"x": 3, "y": 4}, 83 {"matrix": [4, 3], "x": 3, "y": 4},
84 {"x": 4, "y": 4.25}, 84 {"matrix": [4, 4], "x": 4, "y": 4.25},
85 {"x": 5, "y": 5}, 85 {"matrix": [4, 5], "x": 5, "y": 5},
86 {"x": 6, "y": 5.5}, 86 {"matrix": [4, 6], "x": 6, "y": 5.5},
87 87
88 {"x": 8.75, "y": 5.5}, 88 {"matrix": [9, 6], "x": 8.75, "y": 5.5},
89 {"x": 9.75, "y": 5}, 89 {"matrix": [9, 5], "x": 9.75, "y": 5},
90 {"x": 10.75, "y": 4.5}, 90 {"matrix": [9, 4], "x": 10.75, "y": 4.5},
91 {"x": 11.75, "y": 4}, 91 {"matrix": [9, 3], "x": 11.75, "y": 4},
92 {"x": 12.75, "y": 4.5}, 92 {"matrix": [9, 2], "x": 12.75, "y": 4.5},
93 {"x": 13.75, "y": 4.75}, 93 {"matrix": [9, 1], "x": 13.75, "y": 4.75},
94 {"x": 14.75, "y": 4.75} 94 {"matrix": [9, 0], "x": 14.75, "y": 4.75}
95 ] 95 ]
96 } 96 }
97 } 97 }
diff --git a/keyboards/nacly/sodium62/sodium62.c b/keyboards/nacly/sodium62/sodium62.c
index d418313374..55d8c3c558 100644
--- a/keyboards/nacly/sodium62/sodium62.c
+++ b/keyboards/nacly/sodium62/sodium62.c
@@ -13,7 +13,7 @@
13 * You should have received a copy of the GNU General Public License 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/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#include "sodium62.h" 16#include "quantum.h"
17 17
18#ifdef OLED_ENABLE 18#ifdef OLED_ENABLE
19bool oled_task_kb(void) { 19bool oled_task_kb(void) {
diff --git a/keyboards/nacly/sodium62/sodium62.h b/keyboards/nacly/sodium62/sodium62.h
deleted file mode 100644
index 7db1002333..0000000000
--- a/keyboards/nacly/sodium62/sodium62.h
+++ /dev/null
@@ -1,39 +0,0 @@
1/* Copyright 2022 NaCly
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#pragma once
17
18#include "quantum.h"
19
20#define LAYOUT(\
21 L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \
22 L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \
23 L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \
24 L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \
25 L40, L41, L42, L43, L44, L45, L46, R46, R45, R44, R43, R42, R41, R40 \
26)\
27 {\
28 { L00, L01, L02, L03, L04, L05, KC_NO }, \
29 { L10, L11, L12, L13, L14, L15, KC_NO }, \
30 { L20, L21, L22, L23, L24, L25, KC_NO }, \
31 { L30, L31, L32, L33, L34, L35, KC_NO }, \
32 { L40, L41, L42, L43, L44, L45, L46 }, \
33\
34 { R00, R01, R02, R03, R04, R05, KC_NO }, \
35 { R10, R11, R12, R13, R14, R15, KC_NO }, \
36 { R20, R21, R22, R23, R24, R25, KC_NO }, \
37 { R30, R31, R32, R33, R34, R35, KC_NO }, \
38 { R40, R41, R42, R43, R44, R45, R46 } \
39}
diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json
index e8361decda..5c61b6f5fe 100644
--- a/keyboards/nacly/splitreus62/info.json
+++ b/keyboards/nacly/splitreus62/info.json
@@ -23,7 +23,79 @@
23 "bootloader": "caterina", 23 "bootloader": "caterina",
24 "layouts": { 24 "layouts": {
25 "LAYOUT": { 25 "LAYOUT": {
26 "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}] 26 "layout": [
27 {"matrix": [0, 0], "x": 0, "y": 0.6},
28 {"matrix": [0, 1], "x": 1, "y": 0.6},
29 {"matrix": [0, 2], "x": 2, "y": 0.35},
30 {"matrix": [0, 3], "x": 3, "y": 0},
31 {"matrix": [0, 4], "x": 4, "y": 0.35},
32 {"matrix": [0, 5], "x": 5, "y": 0.7},
33
34 {"matrix": [6, 5], "x": 9, "y": 0.7},
35 {"matrix": [6, 4], "x": 10, "y": 0.35},
36 {"matrix": [6, 3], "x": 11, "y": 0},
37 {"matrix": [6, 2], "x": 12, "y": 0.35},
38 {"matrix": [6, 1], "x": 13, "y": 0.6},
39 {"matrix": [6, 0], "x": 14, "y": 0.6},
40
41 {"matrix": [1, 0], "x": 0, "y": 1.6},
42 {"matrix": [1, 1], "x": 1, "y": 1.6},
43 {"matrix": [1, 2], "x": 2, "y": 1.35},
44 {"matrix": [1, 3], "x": 3, "y": 1},
45 {"matrix": [1, 4], "x": 4, "y": 1.35},
46 {"matrix": [1, 5], "x": 5, "y": 1.7},
47
48 {"matrix": [7, 5], "x": 9, "y": 1.7},
49 {"matrix": [7, 4], "x": 10, "y": 1.35},
50 {"matrix": [7, 3], "x": 11, "y": 1},
51 {"matrix": [7, 2], "x": 12, "y": 1.35},
52 {"matrix": [7, 1], "x": 13, "y": 1.6},
53 {"matrix": [7, 0], "x": 14, "y": 1.6},
54
55 {"matrix": [2, 0], "x": 0, "y": 2.6},
56 {"matrix": [2, 1], "x": 1, "y": 2.6},
57 {"matrix": [2, 2], "x": 2, "y": 2.35},
58 {"matrix": [2, 3], "x": 3, "y": 2},
59 {"matrix": [2, 4], "x": 4, "y": 2.35},
60 {"matrix": [2, 5], "x": 5, "y": 2.7},
61
62 {"matrix": [8, 5], "x": 9, "y": 2.7},
63 {"matrix": [8, 4], "x": 10, "y": 2.35},
64 {"matrix": [8, 3], "x": 11, "y": 2},
65 {"matrix": [8, 2], "x": 12, "y": 2.35},
66 {"matrix": [8, 1], "x": 13, "y": 2.6},
67 {"matrix": [8, 0], "x": 14, "y": 2.6},
68
69 {"matrix": [3, 0], "x": 0, "y": 3.6},
70 {"matrix": [3, 1], "x": 1, "y": 3.6},
71 {"matrix": [3, 2], "x": 2, "y": 3.35},
72 {"matrix": [3, 3], "x": 3, "y": 3},
73 {"matrix": [3, 4], "x": 4, "y": 3.35},
74 {"matrix": [3, 5], "x": 5, "y": 3.7},
75
76 {"matrix": [9, 5], "x": 9, "y": 3.7},
77 {"matrix": [9, 4], "x": 10, "y": 3.35},
78 {"matrix": [9, 3], "x": 11, "y": 3},
79 {"matrix": [9, 2], "x": 12, "y": 3.35},
80 {"matrix": [9, 1], "x": 13, "y": 3.6},
81 {"matrix": [9, 0], "x": 14, "y": 3.6},
82
83 {"matrix": [4, 0], "x": 0, "y": 4.6},
84 {"matrix": [4, 1], "x": 1, "y": 4.6},
85 {"matrix": [4, 2], "x": 2, "y": 4.35},
86 {"matrix": [4, 3], "x": 3, "y": 4},
87 {"matrix": [4, 4], "x": 4, "y": 4.35},
88 {"matrix": [4, 5], "x": 5, "y": 4.7},
89 {"matrix": [5, 5], "x": 6, "y": 3.95, "h": 1.5},
90
91 {"matrix": [11, 5], "x": 8, "y": 3.95, "h": 1.5},
92 {"matrix": [10, 5], "x": 9, "y": 4.7},
93 {"matrix": [10, 4], "x": 10, "y": 4.35},
94 {"matrix": [10, 3], "x": 11, "y": 4},
95 {"matrix": [10, 2], "x": 12, "y": 4.35},
96 {"matrix": [10, 1], "x": 13, "y": 4.6},
97 {"matrix": [10, 0], "x": 14, "y": 4.6}
98 ]
27 } 99 }
28 } 100 }
29 } 101}
diff --git a/keyboards/nacly/splitreus62/splitreus62.h b/keyboards/nacly/splitreus62/splitreus62.h
deleted file mode 100644
index bc6c2a9131..0000000000
--- a/keyboards/nacly/splitreus62/splitreus62.h
+++ /dev/null
@@ -1,26 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT(\
6 L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \
7 L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \
8 L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \
9 L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \
10 L40, L41, L42, L43, L44, L45, L55, R55, R45, R44, R43, R42, R41, R40 \
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 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, L55 }, \
19\
20 { R00, R01, R02, R03, R04, R05 }, \
21 { R10, R11, R12, R13, R14, R15 }, \
22 { R20, R21, R22, R23, R24, R25 }, \
23 { R30, R31, R32, R33, R34, R35 }, \
24 { R40, R41, R42, R43, R44, R45 }, \
25 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R55 } \
26}
diff --git a/keyboards/nacly/ua62/info.json b/keyboards/nacly/ua62/info.json
index 82e284ebe7..383825414b 100644
--- a/keyboards/nacly/ua62/info.json
+++ b/keyboards/nacly/ua62/info.json
@@ -17,7 +17,79 @@
17 "bootloader": "caterina", 17 "bootloader": "caterina",
18 "layouts": { 18 "layouts": {
19 "LAYOUT": { 19 "LAYOUT": {
20 "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}] 20 "layout": [
21 {"matrix": [0, 0], "x": 0, "y": 0.6},
22 {"matrix": [0, 1], "x": 1, "y": 0.6},
23 {"matrix": [0, 2], "x": 2, "y": 0.35},
24 {"matrix": [0, 3], "x": 3, "y": 0},
25 {"matrix": [0, 4], "x": 4, "y": 0.35},
26 {"matrix": [0, 5], "x": 5, "y": 0.7},
27
28 {"matrix": [0, 7], "x": 9, "y": 0.7},
29 {"matrix": [0, 8], "x": 10, "y": 0.35},
30 {"matrix": [0, 9], "x": 11, "y": 0},
31 {"matrix": [0, 10], "x": 12, "y": 0.35},
32 {"matrix": [0, 11], "x": 13, "y": 0.6},
33 {"matrix": [0, 12], "x": 14, "y": 0.6},
34
35 {"matrix": [1, 0], "x": 0, "y": 1.6},
36 {"matrix": [1, 1], "x": 1, "y": 1.6},
37 {"matrix": [1, 2], "x": 2, "y": 1.35},
38 {"matrix": [1, 3], "x": 3, "y": 1},
39 {"matrix": [1, 4], "x": 4, "y": 1.35},
40 {"matrix": [1, 5], "x": 5, "y": 1.7},
41
42 {"matrix": [1, 7], "x": 9, "y": 1.7},
43 {"matrix": [1, 8], "x": 10, "y": 1.35},
44 {"matrix": [1, 9], "x": 11, "y": 1},
45 {"matrix": [1, 10], "x": 12, "y": 1.35},
46 {"matrix": [1, 11], "x": 13, "y": 1.6},
47 {"matrix": [1, 12], "x": 14, "y": 1.6},
48
49 {"matrix": [2, 0], "x": 0, "y": 2.6},
50 {"matrix": [2, 1], "x": 1, "y": 2.6},
51 {"matrix": [2, 2], "x": 2, "y": 2.35},
52 {"matrix": [2, 3], "x": 3, "y": 2},
53 {"matrix": [2, 4], "x": 4, "y": 2.35},
54 {"matrix": [2, 5], "x": 5, "y": 2.7},
55
56 {"matrix": [2, 7], "x": 9, "y": 2.7},
57 {"matrix": [2, 8], "x": 10, "y": 2.35},
58 {"matrix": [2, 9], "x": 11, "y": 2},
59 {"matrix": [2, 10], "x": 12, "y": 2.35},
60 {"matrix": [2, 11], "x": 13, "y": 2.6},
61 {"matrix": [2, 12], "x": 14, "y": 2.6},
62
63 {"matrix": [3, 0], "x": 0, "y": 3.6},
64 {"matrix": [3, 1], "x": 1, "y": 3.6},
65 {"matrix": [3, 2], "x": 2, "y": 3.35},
66 {"matrix": [3, 3], "x": 3, "y": 3},
67 {"matrix": [3, 4], "x": 4, "y": 3.35},
68 {"matrix": [3, 5], "x": 5, "y": 3.7},
69
70 {"matrix": [3, 7], "x": 9, "y": 3.7},
71 {"matrix": [3, 8], "x": 10, "y": 3.35},
72 {"matrix": [3, 9], "x": 11, "y": 3},
73 {"matrix": [3, 10], "x": 12, "y": 3.35},
74 {"matrix": [3, 11], "x": 13, "y": 3.6},
75 {"matrix": [3, 12], "x": 14, "y": 3.6},
76
77 {"matrix": [4, 0], "x": 0, "y": 4.6},
78 {"matrix": [4, 1], "x": 1, "y": 4.6},
79 {"matrix": [4, 2], "x": 2, "y": 4.35},
80 {"matrix": [4, 3], "x": 3, "y": 4},
81 {"matrix": [4, 4], "x": 4, "y": 4.35},
82 {"matrix": [4, 5], "x": 5, "y": 4.7},
83 {"matrix": [4, 6], "x": 6, "y": 3.95, "h": 1.5},
84
85 {"matrix": [3, 6], "x": 8, "y": 3.95, "h": 1.5},
86 {"matrix": [4, 7], "x": 9, "y": 4.7},
87 {"matrix": [4, 8], "x": 10, "y": 4.35},
88 {"matrix": [4, 9], "x": 11, "y": 4},
89 {"matrix": [4, 10], "x": 12, "y": 4.35},
90 {"matrix": [4, 11], "x": 13, "y": 4.6},
91 {"matrix": [4, 12], "x": 14, "y": 4.6}
92 ]
21 } 93 }
22 } 94 }
23 } 95}
diff --git a/keyboards/nacly/ua62/ua62.h b/keyboards/nacly/ua62/ua62.h
deleted file mode 100644
index 4509bbff3d..0000000000
--- a/keyboards/nacly/ua62/ua62.h
+++ /dev/null
@@ -1,41 +0,0 @@
1/* Copyright 2019 NaCly
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#pragma once
17
18#include "quantum.h"
19
20/* This a shortcut to help you visually see your layout.
21 *
22 * The first section contains all of the arguments representing the physical
23 * layout of the board and position of the keys.
24 *
25 * The second converts the arguments into a two-dimensional array which
26 * represents the switch matrix.
27 */
28#define LAYOUT( \
29 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
30 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
31 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
32 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
33 k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d \
34) \
35{ \
36 { k00, k01, k02, k03, k04, k05, KC_NO, k06, k07, k08, k09, k0a, k0b }, \
37 { k10, k11, k12, k13, k14, k15, KC_NO, k16, k17, k18, k19, k1a, k1b }, \
38 { k20, k21, k22, k23, k24, k25, KC_NO, k26, k27, k28, k29, k2a, k2b }, \
39 { k30, k31, k32, k33, k34, k35, k47, k36, k37, k38, k39, k3a, k3b }, \
40 { k40, k41, k42, k43, k44, k45, k46, k48, k49, k4a, k4b, k4c, k4d }, \
41}