summaryrefslogtreecommitdiff
path: root/keyboards/mechlovin/hannah65
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechlovin/hannah65')
-rw-r--r--keyboards/mechlovin/hannah65/config.h16
-rw-r--r--keyboards/mechlovin/hannah65/hannah65.c17
-rw-r--r--keyboards/mechlovin/hannah65/hannah65.h23
-rw-r--r--keyboards/mechlovin/hannah65/info.json5
-rw-r--r--keyboards/mechlovin/hannah65/rev1/haus/info.json420
-rw-r--r--keyboards/mechlovin/hannah65/rev1/rev1.h61
6 files changed, 221 insertions, 321 deletions
diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h
index e96bc8bc85..1686c861fb 100644
--- a/keyboards/mechlovin/hannah65/config.h
+++ b/keyboards/mechlovin/hannah65/config.h
@@ -17,21 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A4, A5, A3, A2, A1 }
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A0, C15, B4, B5, B3, C13, C14, A13 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD4
#define BACKLIGHT_PWM_CHANNEL 3
diff --git a/keyboards/mechlovin/hannah65/hannah65.c b/keyboards/mechlovin/hannah65/hannah65.c
deleted file mode 100644
index 92e0917ebe..0000000000
--- a/keyboards/mechlovin/hannah65/hannah65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "hannah65.h"
diff --git a/keyboards/mechlovin/hannah65/hannah65.h b/keyboards/mechlovin/hannah65/hannah65.h
deleted file mode 100644
index 99da5a2a1a..0000000000
--- a/keyboards/mechlovin/hannah65/hannah65.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_mechlovin_hannah65_rev1)
-# include "rev1.h"
-#endif \ No newline at end of file
diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json
index 74ae965fb7..88a3f39719 100644
--- a/keyboards/mechlovin/hannah65/info.json
+++ b/keyboards/mechlovin/hannah65/info.json
@@ -3,6 +3,11 @@
"pin": "B8",
"breathing": true
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"],
+ "rows": ["A4", "A5", "A3", "A2", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B9",
"on_state": 0
diff --git a/keyboards/mechlovin/hannah65/rev1/haus/info.json b/keyboards/mechlovin/hannah65/rev1/haus/info.json
index 55ddde0a58..ac97de5f18 100644
--- a/keyboards/mechlovin/hannah65/rev1/haus/info.json
+++ b/keyboards/mechlovin/hannah65/rev1/haus/info.json
@@ -11,218 +11,230 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0},
- {"label":"K1D (B1,D2)", "x":14, "y":0},
- {"label":"K0E (B0,D3)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (B3,B6)", "x":1.25, "y":3},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "x":15, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [1, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_65_ansi_blocker": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
- {"label":"K0E (B0,D3)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "x":15, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT_65_iso_blocker": {
"layout": [
- {"label":"K00 (B0,B5)", "x":0, "y":0},
- {"label":"K01 (B0,B6)", "x":1, "y":0},
- {"label":"K02 (B0,B7)", "x":2, "y":0},
- {"label":"K03 (B0,C0)", "x":3, "y":0},
- {"label":"K04 (B0,C1)", "x":4, "y":0},
- {"label":"K05 (B0,C2)", "x":5, "y":0},
- {"label":"K06 (B0,C3)", "x":6, "y":0},
- {"label":"K07 (B0,C4)", "x":7, "y":0},
- {"label":"K08 (B0,C5)", "x":8, "y":0},
- {"label":"K09 (B0,C6)", "x":9, "y":0},
- {"label":"K0A (B0,C7)", "x":10, "y":0},
- {"label":"K0B (B0,D0)", "x":11, "y":0},
- {"label":"K0C (B0,D1)", "x":12, "y":0},
- {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
- {"label":"K0E (B0,D3)", "x":15, "y":0},
- {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (B1,B6)", "x":1.5, "y":1},
- {"label":"K12 (B1,B7)", "x":2.5, "y":1},
- {"label":"K13 (B1,C0)", "x":3.5, "y":1},
- {"label":"K14 (B1,C1)", "x":4.5, "y":1},
- {"label":"K15 (B1,C2)", "x":5.5, "y":1},
- {"label":"K16 (B1,C3)", "x":6.5, "y":1},
- {"label":"K17 (B1,C4)", "x":7.5, "y":1},
- {"label":"K18 (B1,C5)", "x":8.5, "y":1},
- {"label":"K19 (B1,C6)", "x":9.5, "y":1},
- {"label":"K1A (B1,C7)", "x":10.5, "y":1},
- {"label":"K1B (B1,D0)", "x":11.5, "y":1},
- {"label":"K1C (B1,D1)", "x":12.5, "y":1},
- {"label":"K2D (B2,D2)", "x":13.75, "y":1, "w":1.25, "h":2},
- {"label":"K1E (B1,D3)", "x":15, "y":1},
- {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (B2,B6)", "x":1.75, "y":2},
- {"label":"K22 (B2,B7)", "x":2.75, "y":2},
- {"label":"K23 (B2,C0)", "x":3.75, "y":2},
- {"label":"K24 (B2,C1)", "x":4.75, "y":2},
- {"label":"K25 (B2,C2)", "x":5.75, "y":2},
- {"label":"K26 (B2,C3)", "x":6.75, "y":2},
- {"label":"K27 (B2,C4)", "x":7.75, "y":2},
- {"label":"K28 (B2,C5)", "x":8.75, "y":2},
- {"label":"K29 (B2,C6)", "x":9.75, "y":2},
- {"label":"K2A (B2,C7)", "x":10.75, "y":2},
- {"label":"K2B (B2,D0)", "x":11.75, "y":2},
- {"label":"K2C (B2,D1)", "x":12.75, "y":2},
- {"label":"K2E (B2,D3)", "x":15, "y":2},
- {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (B3,B6)", "x":1.25, "y":3},
- {"label":"K32 (B3,B7)", "x":2.25, "y":3},
- {"label":"K33 (B3,C0)", "x":3.25, "y":3},
- {"label":"K34 (B3,C1)", "x":4.25, "y":3},
- {"label":"K35 (B3,C2)", "x":5.25, "y":3},
- {"label":"K36 (B3,C3)", "x":6.25, "y":3},
- {"label":"K37 (B3,C4)", "x":7.25, "y":3},
- {"label":"K38 (B3,C5)", "x":8.25, "y":3},
- {"label":"K39 (B3,C6)", "x":9.25, "y":3},
- {"label":"K3A (B3,C7)", "x":10.25, "y":3},
- {"label":"K3B (B3,D0)", "x":11.25, "y":3},
- {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (B3,D2)", "x":14, "y":3},
- {"label":"K3E (B3,D3)", "x":15, "y":3},
- {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (B4,D1)", "x":13, "y":4},
- {"label":"K4D (B4,D2)", "x":14, "y":4},
- {"label":"K4E (B4,D3)", "x":15, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/mechlovin/hannah65/rev1/rev1.h b/keyboards/mechlovin/hannah65/rev1/rev1.h
deleted file mode 100644
index 0b6b863d56..0000000000
--- a/keyboards/mechlovin/hannah65/rev1/rev1.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2020 Team Mechlovin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_65_ansi_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT_65_iso_blocker( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E }, \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 11:22:55 +0000