summaryrefslogtreecommitdiff
path: root/keyboards/custommk/genesis/rev2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/custommk/genesis/rev2')
-rw-r--r--keyboards/custommk/genesis/rev2/config.h8
-rw-r--r--keyboards/custommk/genesis/rev2/info.json146
-rw-r--r--keyboards/custommk/genesis/rev2/rev2.c2
-rw-r--r--keyboards/custommk/genesis/rev2/rev2.h66
4 files changed, 86 insertions, 136 deletions
diff --git a/keyboards/custommk/genesis/rev2/config.h b/keyboards/custommk/genesis/rev2/config.h
index f152f723fe..00b9711420 100644
--- a/keyboards/custommk/genesis/rev2/config.h
+++ b/keyboards/custommk/genesis/rev2/config.h
@@ -16,14 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F0, C7, C6, B6, B5, B0}
-#define MATRIX_COL_PINS { F4, F5, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define TAP_CODE_DELAY 10
#define RGB_DI_PIN E6
diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json
index 45b83c512a..44d65fcd8b 100644
--- a/keyboards/custommk/genesis/rev2/info.json
+++ b/keyboards/custommk/genesis/rev2/info.json
@@ -8,6 +8,11 @@
"pid": "0xFAB1",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "D7", "B4"],
+ "rows": ["F0", "C7", "C6", "B6", "B5", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F6", "pin_b": "F7", "resolution": 2},
@@ -18,71 +23,90 @@
"bootloader": "qmk-dfu",
"layouts": {
"LAYOUT_ortho_5x4": {
- "layout": [{"label":"MO(1)", "x":0, "y":0},
- {"label":"/", "x":1, "y":0},
- {"label":"*", "x":2, "y":0},
- {"label":"Mute", "x":3, "y":0},
- {"label":"7", "x":0, "y":1},
- {"label":"8", "x":1, "y":1},
- {"label":"9", "x":2, "y":1},
- {"label":"+", "x":3, "y":1},
- {"label":"4", "x":0, "y":2},
- {"label":"5", "x":1, "y":2},
- {"label":"6", "x":2, "y":2},
- {"label":"Pg Up", "x":3, "y":2},
- {"label":"1", "x":0, "y":3},
- {"label":"2", "x":1, "y":3},
- {"label":"3", "x":2, "y":3},
- {"label":"Pg Dn", "x":3, "y":3},
- {"label":"0", "x":0, "y":4},
- {"label":"Spc", "x":1, "y":4},
- {"label":".", "x":2, "y":4},
- {"label":"Enter", "x":3, "y":4}]
+ "layout": [
+ {"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": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4}
+ ]
},
"LAYOUT_numpad_5x4": {
- "layout": [{"label":"MO(1)", "x":0, "y":0},
- {"label":"/", "x":1, "y":0},
- {"label":"*", "x":2, "y":0},
- {"label":"-", "x":3, "y":0},
- {"label":"7", "x":0, "y":1},
- {"label":"8", "x":1, "y":1},
- {"label":"9", "x":2, "y":1},
- {"label":"+", "x":3, "y":1, "h":2},
- {"label":"4", "x":0, "y":2},
- {"label":"5", "x":1, "y":2},
- {"label":"6", "x":2, "y":2},
- {"label":"1", "x":0, "y":3},
- {"label":"2", "x":1, "y":3},
- {"label":"3", "x":2, "y":3},
- {"label":"Enter", "x":3, "y":3, "h":2},
- {"label":"0", "x":0, "y":4, "w":2},
- {"label":".", "x":2, "y":4}]
+ "layout": [
+ {"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": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [2, 0], "x": 3, "y": 1, "h": 2},
+
+ {"matrix": [2, 1], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [4, 0], "x": 3, "y": 3, "h": 2},
+
+ {"matrix": [4, 2], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 3], "x": 2, "y": 4}
+ ]
},
"LAYOUT_via_6x4": {
- "layout": [{"label":"Vol-", "x":0, "y":0},
- {"label":"Vol+", "x":1, "y":0},
- {"label":"Vol-", "x":3, "y":0},
- {"label":"Vol+", "x":4, "y":0},
- {"label":"MO(1)", "x":0.5, "y":1.1},
- {"label":"/", "x":1.5, "y":1.1},
- {"label":"*", "x":2.5, "y":1.1},
- {"label":"Mute", "x":3.5, "y":1.1},
- {"label":"7", "x":0.5, "y":2.1},
- {"label":"8", "x":1.5, "y":2.1},
- {"label":"9", "x":2.5, "y":2.1},
- {"label":"+", "x":3.5, "y":2.1},
- {"label":"4", "x":0.5, "y":3.1},
- {"label":"5", "x":1.5, "y":3.1},
- {"label":"6", "x":2.5, "y":3.1},
- {"label":"Pg Up", "x":3.5, "y":3.1},
- {"label":"1", "x":0.5, "y":4.1},
- {"label":"2", "x":1.5, "y":4.1},
- {"label":"3", "x":2.5, "y":4.1},
- {"label":"Pg Dn", "x":3.5, "y":4.1},
- {"label":"0", "x":0.5, "y":5.1},
- {"label":"Spc", "x":1.5, "y":5.1},
- {"label":".", "x":2.5, "y":5.1},
- {"label":"Enter", "x":3.5, "y":5.1}]
+ "layout": [
+ {"matrix": [5, 0], "x": 0, "y": 0},
+ {"matrix": [5, 1], "x": 1, "y": 0},
+ {"matrix": [5, 2], "x": 3, "y": 0},
+ {"matrix": [5, 3], "x": 4, "y": 0},
+
+ {"matrix": [0, 0], "x": 0.5, "y": 1.1},
+ {"matrix": [0, 1], "x": 1.5, "y": 1.1},
+ {"matrix": [0, 2], "x": 2.5, "y": 1.1},
+ {"matrix": [0, 3], "x": 3.5, "y": 1.1},
+
+ {"matrix": [1, 0], "x": 0.5, "y": 2.1},
+ {"matrix": [1, 1], "x": 1.5, "y": 2.1},
+ {"matrix": [1, 2], "x": 2.5, "y": 2.1},
+ {"matrix": [1, 3], "x": 3.5, "y": 2.1},
+
+ {"matrix": [2, 0], "x": 0.5, "y": 3.1},
+ {"matrix": [2, 1], "x": 1.5, "y": 3.1},
+ {"matrix": [2, 2], "x": 2.5, "y": 3.1},
+ {"matrix": [2, 3], "x": 3.5, "y": 3.1},
+
+ {"matrix": [3, 0], "x": 0.5, "y": 4.1},
+ {"matrix": [3, 1], "x": 1.5, "y": 4.1},
+ {"matrix": [3, 2], "x": 2.5, "y": 4.1},
+ {"matrix": [3, 3], "x": 3.5, "y": 4.1},
+
+ {"matrix": [4, 0], "x": 0.5, "y": 5.1},
+ {"matrix": [4, 1], "x": 1.5, "y": 5.1},
+ {"matrix": [4, 2], "x": 2.5, "y": 5.1},
+ {"matrix": [4, 3], "x": 3.5, "y": 5.1}
+ ]
}
}
}
diff --git a/keyboards/custommk/genesis/rev2/rev2.c b/keyboards/custommk/genesis/rev2/rev2.c
index bfa4cb0558..5993ebb8c6 100644
--- a/keyboards/custommk/genesis/rev2/rev2.c
+++ b/keyboards/custommk/genesis/rev2/rev2.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rev2.h"
+#include "quantum.h"
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/custommk/genesis/rev2/rev2.h b/keyboards/custommk/genesis/rev2/rev2.h
deleted file mode 100644
index e978e706c3..0000000000
--- a/keyboards/custommk/genesis/rev2/rev2.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2020 customMK
- *
- * 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_numpad_5x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, \
- K20, K21, K22, K23, \
- K30, K31, K32, \
- K40, K42, K43 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, KC_NO }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, KC_NO }, \
- { K40, KC_NO, K42, K43 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO} \
-}
-
-#define LAYOUT_ortho_5x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33, \
- K40, K41, K42, K43 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 }, \
- { K40, K41, K42, K43 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO} \
-}
-
-
-#define LAYOUT_via_6x4( \
- E00A, E00B, E01A, E01B, \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33, \
- K40, K41, K42, K43 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 }, \
- { K40, K41, K42, K43 }, \
- { E00A, E00B, E01A, E01B } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 05:22:02 +0000