summaryrefslogtreecommitdiff
path: root/keyboards/halfcliff
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/halfcliff
parent941e159a28f1bdbdd913654c4f9a14291f8d5299 (diff)
Move single `LAYOUT`s to data driven (#20365)
Diffstat (limited to 'keyboards/halfcliff')
-rw-r--r--keyboards/halfcliff/halfcliff.c2
-rw-r--r--keyboards/halfcliff/halfcliff.h58
-rw-r--r--keyboards/halfcliff/info.json161
3 files changed, 86 insertions, 135 deletions
diff --git a/keyboards/halfcliff/halfcliff.c b/keyboards/halfcliff/halfcliff.c
index 9e3f64d284..de636f22fe 100644
--- a/keyboards/halfcliff/halfcliff.c
+++ b/keyboards/halfcliff/halfcliff.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 "halfcliff.h" 17#include "quantum.h"
18 18
19#ifdef OLED_ENABLE 19#ifdef OLED_ENABLE
20 20
diff --git a/keyboards/halfcliff/halfcliff.h b/keyboards/halfcliff/halfcliff.h
deleted file mode 100644
index 6e4c808641..0000000000
--- a/keyboards/halfcliff/halfcliff.h
+++ /dev/null
@@ -1,58 +0,0 @@
1/* Copyright 2021 n2
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/* This is a shortcut to help you visually see your layout.
22 *
23 * The first section contains all of the arguments representing the physical
24 * layout of the board and position of the keys.
25 *
26 * The second converts the arguments into a two-dimensional array which
27 * represents the switch matrix.
28 */
29
30#define LAYOUT( \
31 l51,l50,l00,l01,l02,l03,l04,r04,r03,r02,r01,r00,r50,r51,r52,\
32 l61,l60,l10,l11,l12,l13,l14,r14,r13,r12,r11,r10,r60,r61,r62,\
33 l71,l70,l20,l21,l22,l23,l24,r24,r23,r22,r21,r20,r70,r71,r72,\
34 l81,l80,l30,l31,l32,l33,l34,r34,r33,r32,r31,r30,r80,r81,r82,\
35 l91,l90,l40,l41,l42,l43,l44,r44,r43,r42,r41,r40,r90,r91,r92\
36) \
37{ \
38 {l00, l01, l02, l03, l04 }, \
39 {l10, l11, l12, l13, l14 }, \
40 {l20, l21, l22, l23, l24 }, \
41 {l30, l31, l32, l33, l34 }, \
42 {l40, l41, l42, l43, l44 }, \
43 {l50, l51, KC_NO,KC_NO,KC_NO}, \
44 {l60, l61, KC_NO,KC_NO,KC_NO}, \
45 {l70, l71, KC_NO,KC_NO,KC_NO}, \
46 {l80, l81, KC_NO,KC_NO,KC_NO}, \
47 {l90, l91, KC_NO,KC_NO,KC_NO}, \
48 {r00, r01, r02, r03, r04 }, \
49 {r10, r11, r12, r13, r14 }, \
50 {r20, r21, r22, r23, r24 }, \
51 {r30, r31, r32, r33, r34 }, \
52 {r40, r41, r42, r43, r44 }, \
53 {r50, r51, r52, KC_NO,KC_NO}, \
54 {r60, r61, r62, KC_NO,KC_NO}, \
55 {r70, r71, r72, KC_NO,KC_NO}, \
56 {r80, r81, r82, KC_NO,KC_NO}, \
57 {r90, r91, r92, KC_NO,KC_NO}, \
58}
diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json
index 6b86e69a1f..820babd432 100644
--- a/keyboards/halfcliff/info.json
+++ b/keyboards/halfcliff/info.json
@@ -24,82 +24,91 @@
24 "layouts": { 24 "layouts": {
25 "LAYOUT": { 25 "LAYOUT": {
26 "layout": [ 26 "layout": [
27 {"x":0.75,"y":0}, 27 {"matrix": [5, 1], "x": 0.75, "y": 0},
28 {"x":1.75,"y":0}, 28 {"matrix": [5, 0], "x": 1.75, "y": 0},
29 {"x":2.75,"y":0}, 29 {"matrix": [0, 0], "x": 2.75, "y": 0},
30 {"x":3.75,"y":0}, 30 {"matrix": [0, 1], "x": 3.75, "y": 0},
31 {"x":4.75,"y":0}, 31 {"matrix": [0, 2], "x": 4.75, "y": 0},
32 {"x":5.75,"y":0}, 32 {"matrix": [0, 3], "x": 5.75, "y": 0},
33 {"x":6.75,"y":0}, 33 {"matrix": [0, 4], "x": 6.75, "y": 0},
34 {"x":8.25,"y":0}, 34
35 {"x":9.25,"y":0}, 35 {"matrix": [10, 4], "x": 8.25, "y": 0},
36 {"x":10.25,"y":0}, 36 {"matrix": [10, 3], "x": 9.25, "y": 0},
37 {"x":11.25,"y":0}, 37 {"matrix": [10, 2], "x": 10.25, "y": 0},
38 {"x":12.25,"y":0}, 38 {"matrix": [10, 1], "x": 11.25, "y": 0},
39 {"x":13.25,"y":0}, 39 {"matrix": [10, 0], "x": 12.25, "y": 0},
40 {"x":14.25,"y":0}, 40 {"matrix": [15, 0], "x": 13.25, "y": 0},
41 {"x":15.25,"y":0}, 41 {"matrix": [15, 1], "x": 14.25, "y": 0},
42 {"x":0.25,"y":1,"w":1.5}, 42 {"matrix": [15, 2], "x": 15.25, "y": 0},
43 {"x":1.75,"y":1}, 43
44 {"x":2.75,"y":1}, 44 {"matrix": [6, 1], "x": 0.25, "y": 1, "w": 1.5},
45 {"x":3.75,"y":1}, 45 {"matrix": [6, 0], "x": 1.75, "y": 1},
46 {"x":4.75,"y":1}, 46 {"matrix": [1, 0], "x": 2.75, "y": 1},
47 {"x":5.75,"y":1}, 47 {"matrix": [1, 1], "x": 3.75, "y": 1},
48 {"x":6.75,"y":1}, 48 {"matrix": [1, 2], "x": 4.75, "y": 1},
49 {"x":8.25,"y":1}, 49 {"matrix": [1, 3], "x": 5.75, "y": 1},
50 {"x":9.25,"y":1}, 50 {"matrix": [1, 4], "x": 6.75, "y": 1},
51 {"x":10.25,"y":1}, 51
52 {"x":11.25,"y":1}, 52 {"matrix": [11, 4], "x": 8.25, "y": 1},
53 {"x":12.25,"y":1}, 53 {"matrix": [11, 3], "x": 9.25, "y": 1},
54 {"x":13.25,"y":1}, 54 {"matrix": [11, 2], "x": 10.25, "y": 1},
55 {"x":14.25,"y":1}, 55 {"matrix": [11, 1], "x": 11.25, "y": 1},
56 {"x":16.25,"y":0}, 56 {"matrix": [11, 0], "x": 12.25, "y": 1},
57 {"x":0,"y":2,"w":1.75}, 57 {"matrix": [16, 0], "x": 13.25, "y": 1},
58 {"x":1.75,"y":2}, 58 {"matrix": [16, 1], "x": 14.25, "y": 1},
59 {"x":2.75,"y":2}, 59 {"matrix": [16, 2], "x": 16.25, "y": 0},
60 {"x":3.75,"y":2}, 60
61 {"x":4.75,"y":2}, 61 {"matrix": [7, 1], "x": 0, "y": 2, "w": 1.75},
62 {"x":5.75,"y":2}, 62 {"matrix": [7, 0], "x": 1.75, "y": 2},
63 {"x":6.75,"y":2}, 63 {"matrix": [2, 0], "x": 2.75, "y": 2},
64 {"x":8.25,"y":2}, 64 {"matrix": [2, 1], "x": 3.75, "y": 2},
65 {"x":9.25,"y":2}, 65 {"matrix": [2, 2], "x": 4.75, "y": 2},
66 {"x":10.25,"y":2}, 66 {"matrix": [2, 3], "x": 5.75, "y": 2},
67 {"x":11.25,"y":2}, 67 {"matrix": [2, 4], "x": 6.75, "y": 2},
68 {"x":12.25,"y":2}, 68
69 {"x":13.25,"y":2}, 69 {"matrix": [12, 4], "x": 8.25, "y": 2},
70 {"x":14.25,"y":2}, 70 {"matrix": [12, 3], "x": 9.25, "y": 2},
71 {"x":15.5,"y":1,"w":1.25,"h":2}, 71 {"matrix": [12, 2], "x": 10.25, "y": 2},
72 {"x":0,"y":3,"w":1.75}, 72 {"matrix": [12, 1], "x": 11.25, "y": 2},
73 {"x":1.75,"y":3}, 73 {"matrix": [12, 0], "x": 12.25, "y": 2},
74 {"x":2.75,"y":3}, 74 {"matrix": [17, 0], "x": 13.25, "y": 2},
75 {"x":3.75,"y":3}, 75 {"matrix": [17, 1], "x": 14.25, "y": 2},
76 {"x":4.75,"y":3}, 76 {"matrix": [17, 2], "x": 15.5, "y": 1, "w": 1.25, "h": 2},
77 {"x":5.75,"y":3}, 77
78 {"x":6.75,"y":3}, 78 {"matrix": [8, 1], "x": 0, "y": 3, "w": 1.75},
79 {"x":8.25,"y":3}, 79 {"matrix": [8, 0], "x": 1.75, "y": 3},
80 {"x":9.25,"y":3}, 80 {"matrix": [3, 0], "x": 2.75, "y": 3},
81 {"x":10.25,"y":3}, 81 {"matrix": [3, 1], "x": 3.75, "y": 3},
82 {"x":11.25,"y":3}, 82 {"matrix": [3, 2], "x": 4.75, "y": 3},
83 {"x":12.25,"y":3}, 83 {"matrix": [3, 3], "x": 5.75, "y": 3},
84 {"x":13.25,"y":3}, 84 {"matrix": [3, 4], "x": 6.75, "y": 3},
85 {"x":14.25,"y":3}, 85
86 {"x":15.25,"y":3,"w":2}, 86 {"matrix": [13, 4], "x": 8.25, "y": 3},
87 {"x":0.5,"y":4,"w":1.25}, 87 {"matrix": [13, 3], "x": 9.25, "y": 3},
88 {"x":1.75,"y":4}, 88 {"matrix": [13, 2], "x": 10.25, "y": 3},
89 {"x":2.75,"y":4}, 89 {"matrix": [13, 1], "x": 11.25, "y": 3},
90 {"x":3.75,"y":4}, 90 {"matrix": [13, 0], "x": 12.25, "y": 3},
91 {"x":4.75,"y":4}, 91 {"matrix": [18, 0], "x": 13.25, "y": 3},
92 {"x":5.75,"y":4}, 92 {"matrix": [18, 1], "x": 14.25, "y": 3},
93 {"x":6.75,"y":4}, 93 {"matrix": [18, 2], "x": 15.25, "y": 3, "w": 2},
94 {"x":8.25,"y":4}, 94
95 {"x":9.25,"y":4}, 95 {"matrix": [9, 1], "x": 0.5, "y": 4, "w": 1.25},
96 {"x":10.25,"y":4}, 96 {"matrix": [9, 0], "x": 1.75, "y": 4},
97 {"x":11.25,"y":4}, 97 {"matrix": [4, 0], "x": 2.75, "y": 4},
98 {"x":12.25,"y":4}, 98 {"matrix": [4, 1], "x": 3.75, "y": 4},
99 {"x":13.25,"y":4}, 99 {"matrix": [4, 2], "x": 4.75, "y": 4},
100 {"x":14.25,"y":4}, 100 {"matrix": [4, 3], "x": 5.75, "y": 4},
101 {"x":15.25,"y":4} 101 {"matrix": [4, 4], "x": 6.75, "y": 4},
102 ] 102
103 {"matrix": [14, 4], "x": 8.25, "y": 4},
104 {"matrix": [14, 3], "x": 9.25, "y": 4},
105 {"matrix": [14, 2], "x": 10.25, "y": 4},
106 {"matrix": [14, 1], "x": 11.25, "y": 4},
107 {"matrix": [14, 0], "x": 12.25, "y": 4},
108 {"matrix": [19, 0], "x": 13.25, "y": 4},
109 {"matrix": [19, 1], "x": 14.25, "y": 4},
110 {"matrix": [19, 2], "x": 15.25, "y": 4}
111 ]
103 } 112 }
104 } 113 }
105} 114}