aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-09-29 19:48:37 +0000
committerGitHub <noreply@github.com>2021-09-29 12:48:37 -0700
commit8fccd82d4ec8292892067ab06dd235cf9b2d1565 (patch)
tree1a9b28a030ae94bfbbe3d9e3352509bd5d08b978
parent02ab7b1888e6572178543ca0b944e4fa14cdf974 (diff)
downloadqmk_firmware-8fccd82d4ec8292892067ab06dd235cf9b2d1565.tar.gz
qmk_firmware-8fccd82d4ec8292892067ab06dd235cf9b2d1565.zip
Mechlovin Hannah60RGB touch-up (#14646)
* use XXX for KC_NO in rev1.h * add matrix diagram to rev1.h * remove reference to KBFirmware JSON Parser from rev1.h * use XXX for KC_NO in rev2.h * add matrix diagram to rev2.h * add LAYOUT_60_ansi and LAYOUT_60_iso * enable Community Layout support * update info.json metadata - specify keyboard revision in keyboard_name - use GitHub username in maintainer field * remove reference to KBFirmware JSON Parser from main rules.mk
Diffstat
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev1/info.json4
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev1/rev1.h59
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev2/info.json143
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev2/rev2.h57
-rw-r--r--keyboards/mechlovin/hannah60rgb/rules.mk3
5 files changed, 236 insertions, 30 deletions
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json
index a95c11763..48c878edb 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json
@@ -1,7 +1,7 @@
1{ 1{
2 "keyboard_name": "hannah60rgb", 2 "keyboard_name": "hannah60rgb rev1",
3 "url": "", 3 "url": "",
4 "maintainer": "Team Mechlovin'", 4 "maintainer": "mechlovin",
5 "layouts": { 5 "layouts": {
6 "LAYOUT_all": { 6 "LAYOUT_all": {
7 "layout": [ 7 "layout": [
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rev1.h b/keyboards/mechlovin/hannah60rgb/rev1/rev1.h
index 8fd1c6797..656364459 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/rev1.h
+++ b/keyboards/mechlovin/hannah60rgb/rev1/rev1.h
@@ -18,6 +18,31 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18 18
19#include "quantum.h" 19#include "quantum.h"
20 20
21#define XXX KC_NO
22
23/*
24 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
25 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │ │0D │ 2u Backspace
26 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └─┬─────┤
27 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C │ │ │
28 * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌──┴┐2D │ ISO Enter
29 * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │ │2C │ │
30 * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌─┴───┴────┤
31 * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │ │3C │ 2.75u RShift
32 * └────────┘ ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤ └──────────┘
33 * │40 │41 │42 │44 │46 │48 │4A │4B │4C │4D │ Split Space 1
34 * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
35 * ┌────┬────┬────┬──────────┬────┬────────┬────┬────┬────┬────┐
36 * │40 │41 │42 │44 │46 │48 │4A │4B │4C │4D │ Split Space 2
37 * └────┴────┴────┴──────────┴────┴────────┴────┴────┴────┴────┘
38 * ┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
39 * │40 │41 │42 │46 │4A │4B │4C │4D │ Standard
40 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
41 * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
42 * │40 │41 │42 │46 │4B │4C │4D │ Tsangan/WKL
43 * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
44 */
45
21#define LAYOUT_all( \ 46#define LAYOUT_all( \
22K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \ 47K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \
23K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \ 48K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \
@@ -25,11 +50,11 @@ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
25K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ 50K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
26K40, K41, K42, K44, K46, K48, K4A, K4B, K4C, K4D \ 51K40, K41, K42, K44, K46, K48, K4A, K4B, K4C, K4D \
27) { \ 52) { \
28 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ 53 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
29 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ 54 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
30 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ 55 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
31 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ 56 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
32 { K40, K41, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, K4B, K4C, K4D }, \ 57 { K40, K41, K42, XXX, K44, XXX, K46, XXX, K48, XXX, K4A, K4B, K4C, K4D }, \
33} 58}
34#define LAYOUT_60_ansi( \ 59#define LAYOUT_60_ansi( \
35 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ 60 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
@@ -38,11 +63,11 @@ K40, K41, K42, K44, K46, K48, K4A, K4B, K4C, K4D \
38 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ 63 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
39 K40, K41, K42, K46, K4A, K4B, K4C, K4D \ 64 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
40) { \ 65) { \
41 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ 66 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
42 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO }, \ 67 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX }, \
43 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ 68 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
44 { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO }, \ 69 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX }, \
45 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D }, \ 70 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }, \
46} 71}
47#define LAYOUT_60_iso( \ 72#define LAYOUT_60_iso( \
48 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ 73 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
@@ -51,13 +76,9 @@ K40, K41, K42, K44, K46, K48, K4A, K4B, K4C, K4D \
51 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ 76 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
52 K40, K41, K42, K46, K4A, K4B, K4C, K4D \ 77 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
53) { \ 78) { \
54 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ 79 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
55 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO }, \ 80 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX }, \
56 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ 81 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
57 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO }, \ 82 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX }, \
58 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D }, \ 83 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }, \
59} 84}
60
61
62// generated by KBFirmware JSON to QMK Parser
63// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json
index d927001a4..74490e03e 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json
@@ -1,7 +1,7 @@
1{ 1{
2 "keyboard_name": "hannah60rgb", 2 "keyboard_name": "hannah60rgb rev2",
3 "url": "", 3 "url": "",
4 "maintainer": "Team Mechlovin'", 4 "maintainer": "mechlovin",
5 "layouts": { 5 "layouts": {
6 "LAYOUT_all": { 6 "LAYOUT_all": {
7 "layout": [ 7 "layout": [
@@ -74,6 +74,145 @@
74 {"x": 12.5, "y": 4, "w": 1.25}, 74 {"x": 12.5, "y": 4, "w": 1.25},
75 {"x": 13.75, "y": 4, "w": 1.25} 75 {"x": 13.75, "y": 4, "w": 1.25}
76 ] 76 ]
77 },
78 "LAYOUT_60_ansi": {
79 "layout": [
80 {"x":0, "y":0},
81 {"x":1, "y":0},
82 {"x":2, "y":0},
83 {"x":3, "y":0},
84 {"x":4, "y":0},
85 {"x":5, "y":0},
86 {"x":6, "y":0},
87 {"x":7, "y":0},
88 {"x":8, "y":0},
89 {"x":9, "y":0},
90 {"x":10, "y":0},
91 {"x":11, "y":0},
92 {"x":12, "y":0},
93 {"x":13, "y":0, "w":2},
94
95 {"x":0, "y":1, "w":1.5},
96 {"x":1.5, "y":1},
97 {"x":2.5, "y":1},
98 {"x":3.5, "y":1},
99 {"x":4.5, "y":1},
100 {"x":5.5, "y":1},
101 {"x":6.5, "y":1},
102 {"x":7.5, "y":1},
103 {"x":8.5, "y":1},
104 {"x":9.5, "y":1},
105 {"x":10.5, "y":1},
106 {"x":11.5, "y":1},
107 {"x":12.5, "y":1},
108 {"x":13.5, "y":1, "w":1.5},
109
110 {"x":0, "y":2, "w":1.75},
111 {"x":1.75, "y":2},
112 {"x":2.75, "y":2},
113 {"x":3.75, "y":2},
114 {"x":4.75, "y":2},
115 {"x":5.75, "y":2},
116 {"x":6.75, "y":2},
117 {"x":7.75, "y":2},
118 {"x":8.75, "y":2},
119 {"x":9.75, "y":2},
120 {"x":10.75, "y":2},
121 {"x":11.75, "y":2},
122 {"x":12.75, "y":2, "w":2.25},
123
124 {"x":0, "y":3, "w":2.25},
125 {"x":2.25, "y":3},
126 {"x":3.25, "y":3},
127 {"x":4.25, "y":3},
128 {"x":5.25, "y":3},
129 {"x":6.25, "y":3},
130 {"x":7.25, "y":3},
131 {"x":8.25, "y":3},
132 {"x":9.25, "y":3},
133 {"x":10.25, "y":3},
134 {"x":11.25, "y":3},
135 {"x":12.25, "y":3, "w":2.75},
136
137 {"x":0, "y":4, "w":1.25},
138 {"x":1.25, "y":4, "w":1.25},
139 {"x":2.5, "y":4, "w":1.25},
140 {"x":3.75, "y":4, "w":6.25},
141 {"x":10, "y":4, "w":1.25},
142 {"x":11.25, "y":4, "w":1.25},
143 {"x":12.5, "y":4, "w":1.25},
144 {"x":13.75, "y":4, "w":1.25}
145 ]
146 },
147 "LAYOUT_60_iso": {
148 "layout": [
149 {"x":0, "y":0},
150 {"x":1, "y":0},
151 {"x":2, "y":0},
152 {"x":3, "y":0},
153 {"x":4, "y":0},
154 {"x":5, "y":0},
155 {"x":6, "y":0},
156 {"x":7, "y":0},
157 {"x":8, "y":0},
158 {"x":9, "y":0},
159 {"x":10, "y":0},
160 {"x":11, "y":0},
161 {"x":12, "y":0},
162 {"x":13, "y":0, "w":2},
163
164 {"x":0, "y":1, "w":1.5},
165 {"x":1.5, "y":1},
166 {"x":2.5, "y":1},
167 {"x":3.5, "y":1},
168 {"x":4.5, "y":1},
169 {"x":5.5, "y":1},
170 {"x":6.5, "y":1},
171 {"x":7.5, "y":1},
172 {"x":8.5, "y":1},
173 {"x":9.5, "y":1},
174 {"x":10.5, "y":1},
175 {"x":11.5, "y":1},
176 {"x":12.5, "y":1},
177
178 {"x":0, "y":2, "w":1.75},
179 {"x":1.75, "y":2},
180 {"x":2.75, "y":2},
181 {"x":3.75, "y":2},
182 {"x":4.75, "y":2},
183 {"x":5.75, "y":2},
184 {"x":6.75, "y":2},
185 {"x":7.75, "y":2},
186 {"x":8.75, "y":2},
187 {"x":9.75, "y":2},
188 {"x":10.75, "y":2},
189 {"x":11.75, "y":2},
190 {"x":12.75, "y":2},
191 {"x":13.75, "y":1, "w":1.25, "h":2},
192
193 {"x":0, "y":3, "w":1.25},
194 {"x":1.25, "y":3},
195 {"x":2.25, "y":3},
196 {"x":3.25, "y":3},
197 {"x":4.25, "y":3},
198 {"x":5.25, "y":3},
199 {"x":6.25, "y":3},
200 {"x":7.25, "y":3},
201 {"x":8.25, "y":3},
202 {"x":9.25, "y":3},
203 {"x":10.25, "y":3},
204 {"x":11.25, "y":3},
205 {"x":12.25, "y":3, "w":2.75},
206
207 {"x":0, "y":4, "w":1.25},
208 {"x":1.25, "y":4, "w":1.25},
209 {"x":2.5, "y":4, "w":1.25},
210 {"x":3.75, "y":4, "w":6.25},
211 {"x":10, "y":4, "w":1.25},
212 {"x":11.25, "y":4, "w":1.25},
213 {"x":12.5, "y":4, "w":1.25},
214 {"x":13.75, "y":4, "w":1.25}
215 ]
77 } 216 }
78 } 217 }
79} 218}
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rev2.h b/keyboards/mechlovin/hannah60rgb/rev2/rev2.h
index 3382941e4..7e10c6769 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/rev2.h
+++ b/keyboards/mechlovin/hannah60rgb/rev2/rev2.h
@@ -18,6 +18,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
18 18
19#include "quantum.h" 19#include "quantum.h"
20 20
21#define XXX KC_NO
22
23/*
24 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
25 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │ │0D │ 2u Backspace
26 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └─┬─────┤
27 * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C │ │ │
28 * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌──┴┐2D │ ISO Enter
29 * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │ │2C │ │
30 * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌─┴───┴────┤
31 * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │ │3C │ 2.75u RShift
32 * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ └──────────┘
33 * │40 │41 │42 │46 │4A │4B │4C │4D │ Standard
34 * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
35 * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
36 * │40 │41 │42 │46 │4B │4C │4D │ Tsangan/WKL
37 * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
38 */
39
21#define LAYOUT_all( \ 40#define LAYOUT_all( \
22K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \ 41K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \
23K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \ 42K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \
@@ -25,9 +44,37 @@ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
25K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ 44K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
26K40, K41, K42, K46, K4A, K4B, K4C, K4D \ 45K40, K41, K42, K46, K4A, K4B, K4C, K4D \
27) { \ 46) { \
28 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ 47 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
29 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ 48 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
30 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ 49 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
31 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ 50 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
32 { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D }, \ 51 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }, \
52}
53
54#define LAYOUT_60_ansi( \
55 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
56 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \
57 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
58 K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
59 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
60) { \
61 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
62 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX }, \
63 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
64 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX }, \
65 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }, \
66}
67
68#define LAYOUT_60_iso( \
69 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
70 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
71 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
72 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
73 K40, K41, K42, K46, K4A, K4B, K4C, K4D \
74) { \
75 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
76 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX }, \
77 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
78 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX }, \
79 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }, \
33} 80}
diff --git a/keyboards/mechlovin/hannah60rgb/rules.mk b/keyboards/mechlovin/hannah60rgb/rules.mk
index c24be862e..b11ad1d35 100644
--- a/keyboards/mechlovin/hannah60rgb/rules.mk
+++ b/keyboards/mechlovin/hannah60rgb/rules.mk
@@ -20,7 +20,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover
20BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality 20BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
21AUDIO_ENABLE = no # Audio output 21AUDIO_ENABLE = no # Audio output
22 22
23# generated by KBFirmware JSON to QMK Parser 23LAYOUTS = 60_ansi 60_iso
24# https://noroadsleft.github.io/kbf_qmk_converter/
25 24
26DEFAULT_FOLDER = mechlovin/hannah60rgb/rev1 25DEFAULT_FOLDER = mechlovin/hannah60rgb/rev1
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-20 10:59:33 +0000