summaryrefslogtreecommitdiff
path: root/keyboards/keyprez
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keyprez')
-rw-r--r--keyboards/keyprez/bison/bison.c2
-rw-r--r--keyboards/keyprez/bison/bison.h99
-rw-r--r--keyboards/keyprez/bison/config.h17
-rw-r--r--keyboards/keyprez/bison/info.json588
-rw-r--r--keyboards/keyprez/corgi/config.h11
-rw-r--r--keyboards/keyprez/corgi/corgi.c17
-rw-r--r--keyboards/keyprez/corgi/corgi.h46
-rw-r--r--keyboards/keyprez/corgi/info.json104
-rw-r--r--keyboards/keyprez/rhino/config.h17
-rw-r--r--keyboards/keyprez/rhino/info.json311
-rw-r--r--keyboards/keyprez/rhino/rhino.c25
-rw-r--r--keyboards/keyprez/rhino/rhino.h80
-rw-r--r--keyboards/keyprez/unicorn/config.h18
-rw-r--r--keyboards/keyprez/unicorn/info.json170
-rw-r--r--keyboards/keyprez/unicorn/unicorn.c18
-rw-r--r--keyboards/keyprez/unicorn/unicorn.h36
16 files changed, 621 insertions, 938 deletions
diff --git a/keyboards/keyprez/bison/bison.c b/keyboards/keyprez/bison/bison.c
index 30e0cdbe2b..2106ae8c2c 100644
--- a/keyboards/keyprez/bison/bison.c
+++ b/keyboards/keyprez/bison/bison.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "bison.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/keyprez/bison/bison.h b/keyboards/keyprez/bison/bison.h
deleted file mode 100644
index 74b7bae985..0000000000
--- a/keyboards/keyprez/bison/bison.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Copyright 2021 csandven
- *
- * 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( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
- L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
- L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \
- L30, L31, L32, L33, L34, L35, L36, L37, L44, R40, R30, R31, R32, R33, R34, R35, R36, R37, \
- L40, L41, L42, L43, R41, R42, R43, R44 \
- ) \
- { \
- { L07, L06, L05, L04, L03, L02, L01, L00 }, \
- { L17, L16, L15, L14, L13, L12, L11, L10 }, \
- { L27, L26, L25, L24, L23, L22, L21, L20 }, \
- { L37, L36, L35, L34, L33, L32, L31, L30 }, \
- { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17 }, \
- { R20, R21, R22, R23, R24, R25, R26, R27 }, \
- { R30, R31, R32, R33, R34, R35, R36, R37 }, \
- { R41, R42, R43, R44, R40, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_6_8( \
- L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
- L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
- L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \
- L32, L33, L34, L35, L36, L37, L44, R40, R30, R31, R32, R33, R34, R35, R36, R37, \
- L40, L41, L42, L43, R41, R42, R43, R44 \
- ) \
- { \
- { L07, L06, L05, L04, L03, L02, KC_NO, KC_NO }, \
- { L17, L16, L15, L14, L13, L12, KC_NO, KC_NO }, \
- { L27, L26, L25, L24, L23, L22, KC_NO, KC_NO }, \
- { L37, L36, L35, L34, L33, L32, KC_NO, KC_NO }, \
- { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17 }, \
- { R20, R21, R22, R23, R24, R25, R26, R27 }, \
- { R30, R31, R32, R33, R34, R35, R36, R37 }, \
- { R41, R42, R43, R44, R40, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_8_6( \
- L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, L36, L37, L44, R40, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, R41, R42, R43, R44 \
- ) \
- { \
- { L07, L06, L05, L04, L03, L02, L01, L00 }, \
- { L17, L16, L15, L14, L13, L12, L11, L10 }, \
- { L27, L26, L25, L24, L23, L22, L21, L20 }, \
- { L37, L36, L35, L34, L33, L32, L31, L30 }, \
- { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, KC_NO, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, KC_NO, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, KC_NO, KC_NO }, \
- { R41, R42, R43, R44, R40, KC_NO, KC_NO } \
- }
-
-#define LAYOUT_6_6( \
- L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, \
- L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, \
- L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, \
- L32, L33, L34, L35, L36, L37, L44, R40, R30, R31, R32, R33, R34, R35, \
- L40, L41, L42, L43, R41, R42, R43, R44 \
- ) \
- { \
- { L07, L06, L05, L04, L03, L02, KC_NO, KC_NO }, \
- { L17, L16, L15, L14, L13, L12, KC_NO, KC_NO }, \
- { L27, L26, L25, L24, L23, L22, KC_NO, KC_NO }, \
- { L37, L36, L35, L34, L33, L32, KC_NO, KC_NO }, \
- { L43, L42, L41, L40, L44, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, KC_NO, KC_NO }, \
- { R10, R11, R12, R13, R14, R15, KC_NO, KC_NO }, \
- { R20, R21, R22, R23, R24, R25, KC_NO, KC_NO }, \
- { R30, R31, R32, R33, R34, R35, KC_NO, KC_NO }, \
- { R41, R42, R43, R44, R40, KC_NO, KC_NO } \
- }
diff --git a/keyboards/keyprez/bison/config.h b/keyboards/keyprez/bison/config.h
index ba68e0d976..c4bb34279d 100644
--- a/keyboards/keyprez/bison/config.h
+++ b/keyboards/keyprez/bison/config.h
@@ -17,23 +17,6 @@ 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 { D2, F7, B1, B3, D7 }
-#define MATRIX_COL_PINS { D3, E6, B2, B4, D4, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/keyprez/bison/info.json b/keyboards/keyprez/bison/info.json
index a18beb8305..3e47764d5e 100644
--- a/keyboards/keyprez/bison/info.json
+++ b/keyboards/keyprez/bison/info.json
@@ -8,6 +8,11 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D3", "E6", "B2", "B4", "D4", "F6", "F5", "F4"],
+ "rows": ["D2", "F7", "B1", "B3", "D7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B6", "pin_b": "B5"}
@@ -28,301 +33,318 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "F1", "x": 0, "y": 0},
- {"label": "F2", "x": 1, "y": 0},
- {"label": "~", "x": 2, "y": 0},
- {"label": "1", "x": 3, "y": 0},
- {"label": "2", "x": 4, "y": 0},
- {"label": "3", "x": 5, "y": 0},
- {"label": "4", "x": 6, "y": 0},
- {"label": "5", "x": 7, "y": 0},
- {"label": "6", "x": 10, "y": 0},
- {"label": "7", "x": 11, "y": 0},
- {"label": "8", "x": 12, "y": 0},
- {"label": "9", "x": 13, "y": 0},
- {"label": "0", "x": 14, "y": 0},
- {"label": "-", "x": 15, "y": 0},
- {"label": "=", "x": 16, "y": 0},
- {"label": "Del", "x": 17, "y": 0},
-
- {"label": "F3", "x": 0, "y": 1},
- {"label": "F4", "x": 1, "y": 1},
- {"label": "Tab", "x": 2, "y": 1},
- {"label": "Q", "x": 3, "y": 1},
- {"label": "W", "x": 4, "y": 1},
- {"label": "E", "x": 5, "y": 1},
- {"label": "R", "x": 6, "y": 1},
- {"label": "T", "x": 7, "y": 1},
- {"label": "Y", "x": 10, "y": 1},
- {"label": "U", "x": 11, "y": 1},
- {"label": "I", "x": 12, "y": 1},
- {"label": "O", "x": 13, "y": 1},
- {"label": "P", "x": 14, "y": 1},
- {"label": "[", "x": 15, "y": 1},
- {"label": "]", "x": 16, "y": 1},
- {"label": "\\", "x": 17, "y": 1},
-
- {"label": "F5", "x": 0, "y": 2},
- {"label": "F6", "x": 1, "y": 2},
- {"label": "Esc", "x": 2, "y": 2},
- {"label": "A", "x": 3, "y": 2},
- {"label": "S", "x": 4, "y": 2},
- {"label": "D", "x": 5, "y": 2},
- {"label": "F", "x": 6, "y": 2},
- {"label": "G", "x": 7, "y": 2},
- {"label": "H", "x": 10, "y": 2},
- {"label": "J", "x": 11, "y": 2},
- {"label": "K", "x": 12, "y": 2},
- {"label": "L", "x": 13, "y": 2},
- {"label": ";", "x": 14, "y": 2},
- {"label": "'", "x": 15, "y": 2},
- {"label": "BS", "x": 16, "y": 2},
- {"label": "FN", "x": 17, "y": 2},
-
- {"label": "F7", "x": 0, "y": 3},
- {"label": "F8", "x": 1, "y": 3},
- {"label": "Shift", "x": 2, "y": 3},
- {"label": "Z", "x": 3, "y": 3},
- {"label": "X", "x": 4, "y": 3},
- {"label": "C", "x": 5, "y": 3},
- {"label": "V", "x": 6, "y": 3},
- {"label": "B", "x": 7, "y": 3},
- {"label": "Mute", "x": 8, "y": 3},
- {"label": "MPLY", "x": 9, "y": 3},
- {"label": "N", "x": 10, "y": 3},
- {"label": "M", "x": 11, "y": 3},
- {"label": ",", "x": 12, "y": 3},
- {"label": ".", "x": 13, "y": 3},
- {"label": "/", "x": 14, "y": 3},
- {"label": "Enter", "x": 15, "y": 3},
- {"label": "Home", "x": 16, "y": 3},
- {"label": "End", "x": 17, "y": 3},
-
- {"label": "OS", "x": 3.75, "y": 4},
- {"label": "Alt", "x": 4.75, "y": 4},
- {"label": "Lower", "x": 5.75, "y": 4},
- {"label": "BS", "x": 6.75, "y": 4, "w": 1.5},
- {"label": "", "x": 9.75, "y": 4, "w": 1.5},
- {"label": "Raise", "x": 11.25, "y": 4},
- {"label": "Alt", "x": 12.25, "y": 4},
- {"label": "OS", "x": 13.25, "y": 4}
+ {"matrix": [0, 7], "x": 0, "y": 0},
+ {"matrix": [0, 6], "x": 1, "y": 0},
+ {"matrix": [0, 5], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [0, 1], "x": 6, "y": 0},
+ {"matrix": [0, 0], "x": 7, "y": 0},
+
+ {"matrix": [5, 0], "x": 10, "y": 0},
+ {"matrix": [5, 1], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 4], "x": 14, "y": 0},
+ {"matrix": [5, 5], "x": 15, "y": 0},
+ {"matrix": [5, 6], "x": 16, "y": 0},
+ {"matrix": [5, 7], "x": 17, "y": 0},
+
+ {"matrix": [1, 7], "x": 0, "y": 1},
+ {"matrix": [1, 6], "x": 1, "y": 1},
+ {"matrix": [1, 5], "x": 2, "y": 1},
+ {"matrix": [1, 4], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 2], "x": 5, "y": 1},
+ {"matrix": [1, 1], "x": 6, "y": 1},
+ {"matrix": [1, 0], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 10, "y": 1},
+ {"matrix": [6, 1], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 4], "x": 14, "y": 1},
+ {"matrix": [6, 5], "x": 15, "y": 1},
+ {"matrix": [6, 6], "x": 16, "y": 1},
+ {"matrix": [6, 7], "x": 17, "y": 1},
+
+ {"matrix": [2, 7], "x": 0, "y": 2},
+ {"matrix": [2, 6], "x": 1, "y": 2},
+ {"matrix": [2, 5], "x": 2, "y": 2},
+ {"matrix": [2, 4], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 2], "x": 5, "y": 2},
+ {"matrix": [2, 1], "x": 6, "y": 2},
+ {"matrix": [2, 0], "x": 7, "y": 2},
+
+ {"matrix": [7, 0], "x": 10, "y": 2},
+ {"matrix": [7, 1], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 4], "x": 14, "y": 2},
+ {"matrix": [7, 5], "x": 15, "y": 2},
+ {"matrix": [7, 6], "x": 16, "y": 2},
+ {"matrix": [7, 7], "x": 17, "y": 2},
+
+ {"matrix": [3, 7], "x": 0, "y": 3},
+ {"matrix": [3, 6], "x": 1, "y": 3},
+ {"matrix": [3, 5], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 5, "y": 3},
+ {"matrix": [3, 1], "x": 6, "y": 3},
+ {"matrix": [3, 0], "x": 7, "y": 3},
+ {"matrix": [4, 4], "x": 8, "y": 3},
+
+ {"matrix": [9, 4], "x": 9, "y": 3},
+ {"matrix": [8, 0], "x": 10, "y": 3},
+ {"matrix": [8, 1], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 4], "x": 14, "y": 3},
+ {"matrix": [8, 5], "x": 15, "y": 3},
+ {"matrix": [8, 6], "x": 16, "y": 3},
+ {"matrix": [8, 7], "x": 17, "y": 3},
+
+ {"matrix": [4, 3], "x": 3.75, "y": 4},
+ {"matrix": [4, 2], "x": 4.75, "y": 4},
+ {"matrix": [4, 1], "x": 5.75, "y": 4},
+ {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 11.25, "y": 4},
+ {"matrix": [9, 2], "x": 12.25, "y": 4},
+ {"matrix": [9, 3], "x": 13.25, "y": 4}
]
},
-
"LAYOUT_6_8": {
"layout": [
- {"label": "~", "x": 2, "y": 0},
- {"label": "1", "x": 3, "y": 0},
- {"label": "2", "x": 4, "y": 0},
- {"label": "3", "x": 5, "y": 0},
- {"label": "4", "x": 6, "y": 0},
- {"label": "5", "x": 7, "y": 0},
- {"label": "6", "x": 10, "y": 0},
- {"label": "7", "x": 11, "y": 0},
- {"label": "8", "x": 12, "y": 0},
- {"label": "9", "x": 13, "y": 0},
- {"label": "0", "x": 14, "y": 0},
- {"label": "-", "x": 15, "y": 0},
- {"label": "=", "x": 16, "y": 0},
- {"label": "Del", "x": 17, "y": 0},
-
- {"label": "Tab", "x": 2, "y": 1},
- {"label": "Q", "x": 3, "y": 1},
- {"label": "W", "x": 4, "y": 1},
- {"label": "E", "x": 5, "y": 1},
- {"label": "R", "x": 6, "y": 1},
- {"label": "T", "x": 7, "y": 1},
- {"label": "Y", "x": 10, "y": 1},
- {"label": "U", "x": 11, "y": 1},
- {"label": "I", "x": 12, "y": 1},
- {"label": "O", "x": 13, "y": 1},
- {"label": "P", "x": 14, "y": 1},
- {"label": "[", "x": 15, "y": 1},
- {"label": "]", "x": 16, "y": 1},
- {"label": "\\", "x": 17, "y": 1},
-
- {"label": "Esc", "x": 2, "y": 2},
- {"label": "A", "x": 3, "y": 2},
- {"label": "S", "x": 4, "y": 2},
- {"label": "D", "x": 5, "y": 2},
- {"label": "F", "x": 6, "y": 2},
- {"label": "G", "x": 7, "y": 2},
- {"label": "H", "x": 10, "y": 2},
- {"label": "J", "x": 11, "y": 2},
- {"label": "K", "x": 12, "y": 2},
- {"label": "L", "x": 13, "y": 2},
- {"label": ";", "x": 14, "y": 2},
- {"label": "'", "x": 15, "y": 2},
- {"label": "BS", "x": 16, "y": 2},
- {"label": "FN", "x": 17, "y": 2},
-
- {"label": "Shift", "x": 2, "y": 3},
- {"label": "Z", "x": 3, "y": 3},
- {"label": "X", "x": 4, "y": 3},
- {"label": "C", "x": 5, "y": 3},
- {"label": "V", "x": 6, "y": 3},
- {"label": "B", "x": 7, "y": 3},
- {"label": "Mute", "x": 8, "y": 3},
- {"label": "MPLY", "x": 9, "y": 3},
- {"label": "N", "x": 10, "y": 3},
- {"label": "M", "x": 11, "y": 3},
- {"label": ",", "x": 12, "y": 3},
- {"label": ".", "x": 13, "y": 3},
- {"label": "/", "x": 14, "y": 3},
- {"label": "Enter", "x": 15, "y": 3},
- {"label": "Home", "x": 16, "y": 3},
- {"label": "End", "x": 17, "y": 3},
-
- {"label": "OS", "x": 3.75, "y": 4},
- {"label": "Alt", "x": 4.75, "y": 4},
- {"label": "Lower", "x": 5.75, "y": 4},
- {"label": "BS", "x": 6.75, "y": 4, "w": 1.5},
- {"label": "", "x": 9.75, "y": 4, "w": 1.5},
- {"label": "Raise", "x": 11.25, "y": 4},
- {"label": "Alt", "x": 12.25, "y": 4},
- {"label": "OS", "x": 13.25, "y": 4}
+ {"matrix": [0, 5], "x": 0, "y": 0},
+ {"matrix": [0, 4], "x": 1, "y": 0},
+ {"matrix": [0, 3], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 1], "x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 5, "y": 0},
+
+ {"matrix": [5, 0], "x": 8, "y": 0},
+ {"matrix": [5, 1], "x": 9, "y": 0},
+ {"matrix": [5, 2], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 5], "x": 13, "y": 0},
+ {"matrix": [5, 6], "x": 14, "y": 0},
+ {"matrix": [5, 7], "x": 15, "y": 0},
+
+ {"matrix": [1, 5], "x": 0, "y": 1},
+ {"matrix": [1, 4], "x": 1, "y": 1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 1], "x": 4, "y": 1},
+ {"matrix": [1, 0], "x": 5, "y": 1},
+
+ {"matrix": [6, 0], "x": 8, "y": 1},
+ {"matrix": [6, 1], "x": 9, "y": 1},
+ {"matrix": [6, 2], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 5], "x": 13, "y": 1},
+ {"matrix": [6, 6], "x": 14, "y": 1},
+ {"matrix": [6, 7], "x": 15, "y": 1},
+
+ {"matrix": [2, 5], "x": 0, "y": 2},
+ {"matrix": [2, 4], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 1], "x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 5, "y": 2},
+
+ {"matrix": [7, 0], "x": 8, "y": 2},
+ {"matrix": [7, 1], "x": 9, "y": 2},
+ {"matrix": [7, 2], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 5], "x": 13, "y": 2},
+ {"matrix": [7, 6], "x": 14, "y": 2},
+ {"matrix": [7, 7], "x": 15, "y": 2},
+
+ {"matrix": [3, 5], "x": 0, "y": 3},
+ {"matrix": [3, 4], "x": 1, "y": 3},
+ {"matrix": [3, 3], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 1], "x": 4, "y": 3},
+ {"matrix": [3, 0], "x": 5, "y": 3},
+ {"matrix": [4, 4], "x": 6, "y": 3},
+
+ {"matrix": [9, 4], "x": 7, "y": 3},
+ {"matrix": [8, 0], "x": 8, "y": 3},
+ {"matrix": [8, 1], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 5], "x": 13, "y": 3},
+ {"matrix": [8, 6], "x": 14, "y": 3},
+ {"matrix": [8, 7], "x": 15, "y": 3},
+
+ {"matrix": [4, 3], "x": 1.75, "y": 4},
+ {"matrix": [4, 2], "x": 2.75, "y": 4},
+ {"matrix": [4, 1], "x": 3.75, "y": 4},
+ {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 9.25, "y": 4},
+ {"matrix": [9, 2], "x": 10.25, "y": 4},
+ {"matrix": [9, 3], "x": 11.25, "y": 4}
]
},
-
"LAYOUT_8_6": {
"layout": [
- {"label": "F1", "x": 0, "y": 0},
- {"label": "F2", "x": 1, "y": 0},
- {"label": "~", "x": 2, "y": 0},
- {"label": "1", "x": 3, "y": 0},
- {"label": "2", "x": 4, "y": 0},
- {"label": "3", "x": 5, "y": 0},
- {"label": "4", "x": 6, "y": 0},
- {"label": "5", "x": 7, "y": 0},
- {"label": "6", "x": 10, "y": 0},
- {"label": "7", "x": 11, "y": 0},
- {"label": "8", "x": 12, "y": 0},
- {"label": "9", "x": 13, "y": 0},
- {"label": "0", "x": 14, "y": 0},
- {"label": "Del", "x": 15, "y": 0},
-
- {"label": "F3", "x": 0, "y": 1},
- {"label": "F4", "x": 1, "y": 1},
- {"label": "Tab", "x": 2, "y": 1},
- {"label": "Q", "x": 3, "y": 1},
- {"label": "W", "x": 4, "y": 1},
- {"label": "E", "x": 5, "y": 1},
- {"label": "R", "x": 6, "y": 1},
- {"label": "T", "x": 7, "y": 1},
- {"label": "Y", "x": 10, "y": 1},
- {"label": "U", "x": 11, "y": 1},
- {"label": "I", "x": 12, "y": 1},
- {"label": "O", "x": 13, "y": 1},
- {"label": "P", "x": 14, "y": 1},
- {"label": "BS", "x": 15, "y": 1},
-
- {"label": "F5", "x": 0, "y": 2},
- {"label": "F6", "x": 1, "y": 2},
- {"label": "Esc", "x": 2, "y": 2},
- {"label": "A", "x": 3, "y": 2},
- {"label": "S", "x": 4, "y": 2},
- {"label": "D", "x": 5, "y": 2},
- {"label": "F", "x": 6, "y": 2},
- {"label": "G", "x": 7, "y": 2},
- {"label": "H", "x": 10, "y": 2},
- {"label": "J", "x": 11, "y": 2},
- {"label": "K", "x": 12, "y": 2},
- {"label": "L", "x": 13, "y": 2},
- {"label": ";", "x": 14, "y": 2},
- {"label": "'", "x": 15, "y": 2},
-
- {"label": "F7", "x": 0, "y": 3},
- {"label": "F8", "x": 1, "y": 3},
- {"label": "Shift", "x": 2, "y": 3},
- {"label": "Z", "x": 3, "y": 3},
- {"label": "X", "x": 4, "y": 3},
- {"label": "C", "x": 5, "y": 3},
- {"label": "V", "x": 6, "y": 3},
- {"label": "B", "x": 7, "y": 3},
- {"label": "Mute", "x": 8, "y": 3},
- {"label": "MPLY", "x": 9, "y": 3},
- {"label": "N", "x": 10, "y": 3},
- {"label": "M", "x": 11, "y": 3},
- {"label": ",", "x": 12, "y": 3},
- {"label": ".", "x": 13, "y": 3},
- {"label": "/", "x": 14, "y": 3},
- {"label": "Enter", "x": 15, "y": 3},
-
- {"label": "OS", "x": 3.75, "y": 4},
- {"label": "Alt", "x": 4.75, "y": 4},
- {"label": "Lower", "x": 5.75, "y": 4},
- {"label": "BS", "x": 6.75, "y": 4, "w": 1.5},
- {"label": "", "x": 9.75, "y": 4, "w": 1.5},
- {"label": "Raise", "x": 11.25, "y": 4},
- {"label": "Alt", "x": 12.25, "y": 4},
- {"label": "FN", "x": 13.25, "y": 4}
+ {"matrix": [0, 7], "x": 0, "y": 0},
+ {"matrix": [0, 6], "x": 1, "y": 0},
+ {"matrix": [0, 5], "x": 2, "y": 0},
+ {"matrix": [0, 4], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [0, 1], "x": 6, "y": 0},
+ {"matrix": [0, 0], "x": 7, "y": 0},
+
+ {"matrix": [5, 0], "x": 10, "y": 0},
+ {"matrix": [5, 1], "x": 11, "y": 0},
+ {"matrix": [5, 2], "x": 12, "y": 0},
+ {"matrix": [5, 3], "x": 13, "y": 0},
+ {"matrix": [5, 4], "x": 14, "y": 0},
+ {"matrix": [5, 5], "x": 15, "y": 0},
+
+ {"matrix": [1, 7], "x": 0, "y": 1},
+ {"matrix": [1, 6], "x": 1, "y": 1},
+ {"matrix": [1, 5], "x": 2, "y": 1},
+ {"matrix": [1, 4], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 2], "x": 5, "y": 1},
+ {"matrix": [1, 1], "x": 6, "y": 1},
+ {"matrix": [1, 0], "x": 7, "y": 1},
+
+ {"matrix": [6, 0], "x": 10, "y": 1},
+ {"matrix": [6, 1], "x": 11, "y": 1},
+ {"matrix": [6, 2], "x": 12, "y": 1},
+ {"matrix": [6, 3], "x": 13, "y": 1},
+ {"matrix": [6, 4], "x": 14, "y": 1},
+ {"matrix": [6, 5], "x": 15, "y": 1},
+
+ {"matrix": [2, 7], "x": 0, "y": 2},
+ {"matrix": [2, 6], "x": 1, "y": 2},
+ {"matrix": [2, 5], "x": 2, "y": 2},
+ {"matrix": [2, 4], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 2], "x": 5, "y": 2},
+ {"matrix": [2, 1], "x": 6, "y": 2},
+ {"matrix": [2, 0], "x": 7, "y": 2},
+
+ {"matrix": [7, 0], "x": 10, "y": 2},
+ {"matrix": [7, 1], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 4], "x": 14, "y": 2},
+ {"matrix": [7, 5], "x": 15, "y": 2},
+
+ {"matrix": [3, 7], "x": 0, "y": 3},
+ {"matrix": [3, 6], "x": 1, "y": 3},
+ {"matrix": [3, 5], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 5, "y": 3},
+ {"matrix": [3, 1], "x": 6, "y": 3},
+ {"matrix": [3, 0], "x": 7, "y": 3},
+ {"matrix": [4, 4], "x": 8, "y": 3},
+
+ {"matrix": [9, 4], "x": 9, "y": 3},
+ {"matrix": [8, 0], "x": 10, "y": 3},
+ {"matrix": [8, 1], "x": 11, "y": 3},
+ {"matrix": [8, 2], "x": 12, "y": 3},
+ {"matrix": [8, 3], "x": 13, "y": 3},
+ {"matrix": [8, 4], "x": 14, "y": 3},
+ {"matrix": [8, 5], "x": 15, "y": 3},
+
+ {"matrix": [4, 3], "x": 3.75, "y": 4},
+ {"matrix": [4, 2], "x": 4.75, "y": 4},
+ {"matrix": [4, 1], "x": 5.75, "y": 4},
+ {"matrix": [4, 0], "x": 6.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 11.25, "y": 4},
+ {"matrix": [9, 2], "x": 12.25, "y": 4},
+ {"matrix": [9, 3], "x": 13.25, "y": 4}
]
},
-
"LAYOUT_6_6": {
"layout": [
- {"label": "~", "x": 2, "y": 0},
- {"label": "1", "x": 3, "y": 0},
- {"label": "2", "x": 4, "y": 0},
- {"label": "3", "x": 5, "y": 0},
- {"label": "4", "x": 6, "y": 0},
- {"label": "5", "x": 7, "y": 0},
- {"label": "6", "x": 10, "y": 0},
- {"label": "7", "x": 11, "y": 0},
- {"label": "8", "x": 12, "y": 0},
- {"label": "9", "x": 13, "y": 0},
- {"label": "0", "x": 14, "y": 0},
- {"label": "Del", "x": 15, "y": 0},
-
- {"label": "Tab", "x": 2, "y": 1},
- {"label": "Q", "x": 3, "y": 1},
- {"label": "W", "x": 4, "y": 1},
- {"label": "E", "x": 5, "y": 1},
- {"label": "R", "x": 6, "y": 1},
- {"label": "T", "x": 7, "y": 1},
- {"label": "Y", "x": 10, "y": 1},
- {"label": "U", "x": 11, "y": 1},
- {"label": "I", "x": 12, "y": 1},
- {"label": "O", "x": 13, "y": 1},
- {"label": "P", "x": 14, "y": 1},
- {"label": "BS", "x": 15, "y": 1},
-
- {"label": "Esc", "x": 2, "y": 2},
- {"label": "A", "x": 3, "y": 2},
- {"label": "S", "x": 4, "y": 2},
- {"label": "D", "x": 5, "y": 2},
- {"label": "F", "x": 6, "y": 2},
- {"label": "G", "x": 7, "y": 2},
- {"label": "H", "x": 10, "y": 2},
- {"label": "J", "x": 11, "y": 2},
- {"label": "K", "x": 12, "y": 2},
- {"label": "L", "x": 13, "y": 2},
- {"label": ";", "x": 14, "y": 2},
- {"label": "'", "x": 15, "y": 2},
-
- {"label": "Shift", "x": 2, "y": 3},
- {"label": "Z", "x": 3, "y": 3},
- {"label": "X", "x": 4, "y": 3},
- {"label": "C", "x": 5, "y": 3},
- {"label": "V", "x": 6, "y": 3},
- {"label": "B", "x": 7, "y": 3},
- {"label": "Mute", "x": 8, "y": 3},
- {"label": "MPLY", "x": 9, "y": 3},
- {"label": "N", "x": 10, "y": 3},
- {"label": "M", "x": 11, "y": 3},
- {"label": ",", "x": 12, "y": 3},
- {"label": ".", "x": 13, "y": 3},
- {"label": "/", "x": 14, "y": 3},
- {"label": "Enter", "x": 15, "y": 3},
-
- {"label": "OS", "x": 3.75, "y": 4},
- {"label": "Alt", "x": 4.75, "y": 4},
- {"label": "Lower", "x": 5.75, "y": 4},
- {"label": "BS", "x": 6.75, "y": 4, "w": 1.5},
- {"label": "", "x": 9.75, "y": 4, "w": 1.5},
- {"label": "Raise", "x": 11.25, "y": 4},
- {"label": "Alt", "x": 12.25, "y": 4},
- {"label": "FN", "x": 13.25, "y": 4}
+ {"matrix": [0, 5], "x": 0, "y": 0},
+ {"matrix": [0, 4], "x": 1, "y": 0},
+ {"matrix": [0, 3], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 1], "x": 4, "y": 0},
+ {"matrix": [0, 0], "x": 5, "y": 0},
+
+ {"matrix": [5, 0], "x": 8, "y": 0},
+ {"matrix": [5, 1], "x": 9, "y": 0},
+ {"matrix": [5, 2], "x": 10, "y": 0},
+ {"matrix": [5, 3], "x": 11, "y": 0},
+ {"matrix": [5, 4], "x": 12, "y": 0},
+ {"matrix": [5, 5], "x": 13, "y": 0},
+
+ {"matrix": [1, 5], "x": 0, "y": 1},
+ {"matrix": [1, 4], "x": 1, "y": 1},
+ {"matrix": [1, 3], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 1], "x": 4, "y": 1},
+ {"matrix": [1, 0], "x": 5, "y": 1},
+
+ {"matrix": [6, 0], "x": 8, "y": 1},
+ {"matrix": [6, 1], "x": 9, "y": 1},
+ {"matrix": [6, 2], "x": 10, "y": 1},
+ {"matrix": [6, 3], "x": 11, "y": 1},
+ {"matrix": [6, 4], "x": 12, "y": 1},
+ {"matrix": [6, 5], "x": 13, "y": 1},
+
+ {"matrix": [2, 5], "x": 0, "y": 2},
+ {"matrix": [2, 4], "x": 1, "y": 2},
+ {"matrix": [2, 3], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 1], "x": 4, "y": 2},
+ {"matrix": [2, 0], "x": 5, "y": 2},
+
+ {"matrix": [7, 0], "x": 8, "y": 2},
+ {"matrix": [7, 1], "x": 9, "y": 2},
+ {"matrix": [7, 2], "x": 10, "y": 2},
+ {"matrix": [7, 3], "x": 11, "y": 2},
+ {"matrix": [7, 4], "x": 12, "y": 2},
+ {"matrix": [7, 5], "x": 13, "y": 2},
+
+ {"matrix": [3, 5], "x": 0, "y": 3},
+ {"matrix": [3, 4], "x": 1, "y": 3},
+ {"matrix": [3, 3], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 1], "x": 4, "y": 3},
+ {"matrix": [3, 0], "x": 5, "y": 3},
+ {"matrix": [4, 4], "x": 6, "y": 3},
+
+ {"matrix": [9, 4], "x": 7, "y": 3},
+ {"matrix": [8, 0], "x": 8, "y": 3},
+ {"matrix": [8, 1], "x": 9, "y": 3},
+ {"matrix": [8, 2], "x": 10, "y": 3},
+ {"matrix": [8, 3], "x": 11, "y": 3},
+ {"matrix": [8, 4], "x": 12, "y": 3},
+ {"matrix": [8, 5], "x": 13, "y": 3},
+
+ {"matrix": [4, 3], "x": 1.75, "y": 4},
+ {"matrix": [4, 2], "x": 2.75, "y": 4},
+ {"matrix": [4, 1], "x": 3.75, "y": 4},
+ {"matrix": [4, 0], "x": 4.75, "y": 4, "w": 1.5},
+
+ {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 9.25, "y": 4},
+ {"matrix": [9, 2], "x": 10.25, "y": 4},
+ {"matrix": [9, 3], "x": 11.25, "y": 4}
]
}
}
diff --git a/keyboards/keyprez/corgi/config.h b/keyboards/keyprez/corgi/config.h
index 081e14372d..b04e4a036e 100644
--- a/keyboards/keyprez/corgi/config.h
+++ b/keyboards/keyprez/corgi/config.h
@@ -17,17 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- */
-#define MATRIX_ROW_PINS { F5, F7, B2, B6, F4, F6, B1, B3 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6, D2, B7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/keyprez/corgi/corgi.c b/keyboards/keyprez/corgi/corgi.c
deleted file mode 100644
index ba64134de9..0000000000
--- a/keyboards/keyprez/corgi/corgi.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Christian Sandven
- *
- * 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 "corgi.h"
diff --git a/keyboards/keyprez/corgi/corgi.h b/keyboards/keyprez/corgi/corgi.h
deleted file mode 100644
index d697e436de..0000000000
--- a/keyboards/keyprez/corgi/corgi.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2021 Christian Sandven
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- r1t \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, KC_NO }, \
- { k10, k11, k12, k13, k14, k15, KC_NO }, \
- { k20, k21, k22, k23, k24, k25, KC_NO }, \
- { k30, k31, k32, k33, k34, k35, r1t }, \
- { k06, k07, k08, k09, k0a, k0b, KC_NO }, \
- { k16, k17, k18, k19, k1a, k1b, KC_NO }, \
- { k26, k27, k28, k29, k2a, k2b, KC_NO }, \
- { k36, k37, k38, k39, k3a, k3b, KC_NO } \
-}
-
diff --git a/keyboards/keyprez/corgi/info.json b/keyboards/keyprez/corgi/info.json
index f130ae5919..6e4c5682f5 100644
--- a/keyboards/keyprez/corgi/info.json
+++ b/keyboards/keyprez/corgi/info.json
@@ -8,6 +8,11 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B5", "B4", "E6", "D7", "C6", "D2", "B7"],
+ "rows": ["F5", "F7", "B2", "B6", "F4", "F6", "B1", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D3", "pin_b": "D4"}
@@ -19,59 +24,58 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
-
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
- {"x":12, "y":1},
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6, "y": 0},
+ {"matrix": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 5], "x": 12, "y": 0},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
- {"x":12, "y":2},
+ {"matrix": [1, 0], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [5, 0], "x": 7, "y": 1},
+ {"matrix": [5, 1], "x": 8, "y": 1},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 4], "x": 11, "y": 1},
+ {"matrix": [5, 5], "x": 12, "y": 1},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3},
- {"x":12, "y":3},
+ {"matrix": [2, 0], "x": 1, "y": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [6, 0], "x": 7, "y": 2},
+ {"matrix": [6, 1], "x": 8, "y": 2},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 5], "x": 12, "y": 2},
- {"x":0, "y":3}
+ {"matrix": [3, 0], "x": 1, "y": 3},
+ {"matrix": [3, 1], "x": 2, "y": 3},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3},
+ {"matrix": [3, 5], "x": 6, "y": 3},
+ {"matrix": [7, 0], "x": 7, "y": 3},
+ {"matrix": [7, 1], "x": 8, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3},
+ {"matrix": [7, 3], "x": 10, "y": 3},
+ {"matrix": [7, 4], "x": 11, "y": 3},
+ {"matrix": [7, 5], "x": 12, "y": 3},
+ {"matrix": [3, 6], "x": 0, "y": 3}
]
}
}
diff --git a/keyboards/keyprez/rhino/config.h b/keyboards/keyprez/rhino/config.h
index 3ea5c1384d..ce59f90c35 100644
--- a/keyboards/keyprez/rhino/config.h
+++ b/keyboards/keyprez/rhino/config.h
@@ -17,23 +17,6 @@ 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 { B3, B2, B6, B1, F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D3, D2, D4, D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define AUDIO_PIN C6
#define MUSIC_MAP
diff --git a/keyboards/keyprez/rhino/info.json b/keyboards/keyprez/rhino/info.json
index f92ce7b0b2..105cc0446a 100644
--- a/keyboards/keyprez/rhino/info.json
+++ b/keyboards/keyprez/rhino/info.json
@@ -8,6 +8,11 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D3", "D2", "D4", "D7", "E6", "B4", "B5"],
+ "rows": ["B3", "B2", "B6", "B1", "F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D1", "pin_b": "D0"}
@@ -19,180 +24,178 @@
"layouts": {
"LAYOUT_ortho_2x2u": {
"layout": [
- {"x": 12.5, "y": 0},
+ {"matrix": [7, 6], "x": 12.5, "y": 0},
- {"x": 0, "y": 1, "w": 1.5},
- {"x": 1.5, "y": 1},
- {"x": 2.5, "y": 1},
- {"x": 3.5, "y": 1},
- {"x": 4.5, "y": 1},
- {"x": 5.5, "y": 1},
- {"x": 6.5, "y": 1},
- {"x": 7.5, "y": 1},
- {"x": 8.5, "y": 1},
- {"x": 9.5, "y": 1},
- {"x": 10.5, "y": 1},
- {"x": 11.5, "y": 1},
- {"x": 12.5, "y": 1},
- {"x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 1},
+ {"matrix": [0, 2], "x": 2.5, "y": 1},
+ {"matrix": [0, 3], "x": 3.5, "y": 1},
+ {"matrix": [0, 4], "x": 4.5, "y": 1},
+ {"matrix": [0, 5], "x": 5.5, "y": 1},
+ {"matrix": [0, 6], "x": 6.5, "y": 1},
+ {"matrix": [4, 0], "x": 7.5, "y": 1},
+ {"matrix": [4, 1], "x": 8.5, "y": 1},
+ {"matrix": [4, 2], "x": 9.5, "y": 1},
+ {"matrix": [4, 3], "x": 10.5, "y": 1},
+ {"matrix": [4, 4], "x": 11.5, "y": 1},
+ {"matrix": [4, 5], "x": 12.5, "y": 1},
+ {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
- {"x": 0, "y": 2, "w": 1.5},
- {"x": 1.5, "y": 2},
- {"x": 2.5, "y": 2},
- {"x": 3.5, "y": 2},
- {"x": 4.5, "y": 2},
- {"x": 5.5, "y": 2},
- {"x": 6.5, "y": 2},
- {"x": 7.5, "y": 2},
- {"x": 8.5, "y": 2},
- {"x": 9.5, "y": 2},
- {"x": 10.5, "y": 2},
- {"x": 11.5, "y": 2},
- {"x": 12.5, "y": 2},
- {"x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 2},
+ {"matrix": [1, 2], "x": 2.5, "y": 2},
+ {"matrix": [1, 3], "x": 3.5, "y": 2},
+ {"matrix": [1, 4], "x": 4.5, "y": 2},
+ {"matrix": [1, 5], "x": 5.5, "y": 2},
+ {"matrix": [1, 6], "x": 6.5, "y": 2},
+ {"matrix": [5, 0], "x": 7.5, "y": 2},
+ {"matrix": [5, 1], "x": 8.5, "y": 2},
+ {"matrix": [5, 2], "x": 9.5, "y": 2},
+ {"matrix": [5, 3], "x": 10.5, "y": 2},
+ {"matrix": [5, 4], "x": 11.5, "y": 2},
+ {"matrix": [5, 5], "x": 12.5, "y": 2},
+ {"matrix": [5, 6], "x": 13.5, "y": 2, "w": 1.5},
- {"x": 0, "y": 3, "w": 1.5},
- {"x": 1.5, "y": 3},
- {"x": 2.5, "y": 3},
- {"x": 3.5, "y": 3},
- {"x": 4.5, "y": 3},
- {"x": 5.5, "y": 3},
- {"x": 6.5, "y": 3},
- {"x": 7.5, "y": 3},
- {"x": 8.5, "y": 3},
- {"x": 9.5, "y": 3},
- {"x": 10.5, "y": 3},
- {"x": 11.5, "y": 3},
- {"x": 12.5, "y": 3},
- {"x": 13.5, "y": 3, "w": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 3},
+ {"matrix": [2, 2], "x": 2.5, "y": 3},
+ {"matrix": [2, 3], "x": 3.5, "y": 3},
+ {"matrix": [2, 4], "x": 4.5, "y": 3},
+ {"matrix": [2, 5], "x": 5.5, "y": 3},
+ {"matrix": [2, 6], "x": 6.5, "y": 3},
+ {"matrix": [6, 0], "x": 7.5, "y": 3},
+ {"matrix": [6, 1], "x": 8.5, "y": 3},
+ {"matrix": [6, 2], "x": 9.5, "y": 3},
+ {"matrix": [6, 3], "x": 10.5, "y": 3},
+ {"matrix": [6, 4], "x": 11.5, "y": 3},
+ {"matrix": [6, 5], "x": 12.5, "y": 3},
+ {"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.5},
- {"x": 1.5, "y": 4},
- {"x": 2.5, "y": 4},
- {"x": 3.5, "y": 4},
- {"x": 4.5, "y": 4},
- {"x": 5.5, "y": 4, "w": 2},
- {"x": 7.5, "y": 4, "w": 2},
- {"x": 9.5, "y": 4},
- {"x": 10.5, "y": 4},
- {"x": 11.5, "y": 4},
- {"x": 12.5, "y": 4}
+ {"matrix": [3, 1], "x": 1.5, "y": 4},
+ {"matrix": [3, 2], "x": 2.5, "y": 4},
+ {"matrix": [3, 3], "x": 3.5, "y": 4},
+ {"matrix": [3, 4], "x": 4.5, "y": 4},
+ {"matrix": [3, 6], "x": 5.5, "y": 4, "w": 2},
+ {"matrix": [7, 0], "x": 7.5, "y": 4, "w": 2},
+ {"matrix": [7, 2], "x": 9.5, "y": 4},
+ {"matrix": [7, 3], "x": 10.5, "y": 4},
+ {"matrix": [7, 4], "x": 11.5, "y": 4},
+ {"matrix": [7, 5], "x": 12.5, "y": 4}
]
},
-
"LAYOUT_ergo_2x2u": {
"layout": [
- {"x": 12.5, "y": 0},
+ {"matrix": [7, 6], "x": 12.5, "y": 0},
- {"x": 0, "y": 1, "w": 1.5},
- {"x": 1.5, "y": 1},
- {"x": 2.5, "y": 1},
- {"x": 3.5, "y": 1},
- {"x": 4.5, "y": 1},
- {"x": 5.5, "y": 1},
- {"x": 6.5, "y": 1, "h": 1.5},
- {"x": 7.5, "y": 1, "h": 1.5},
- {"x": 8.5, "y": 1},
- {"x": 9.5, "y": 1},
- {"x": 10.5, "y": 1},
- {"x": 11.5, "y": 1},
- {"x": 12.5, "y": 1},
- {"x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 1},
+ {"matrix": [0, 2], "x": 2.5, "y": 1},
+ {"matrix": [0, 3], "x": 3.5, "y": 1},
+ {"matrix": [0, 4], "x": 4.5, "y": 1},
+ {"matrix": [0, 5], "x": 5.5, "y": 1},
+ {"matrix": [0, 6], "x": 6.5, "y": 1, "h": 1.5},
+ {"matrix": [4, 0], "x": 7.5, "y": 1, "h": 1.5},
+ {"matrix": [4, 1], "x": 8.5, "y": 1},
+ {"matrix": [4, 2], "x": 9.5, "y": 1},
+ {"matrix": [4, 3], "x": 10.5, "y": 1},
+ {"matrix": [4, 4], "x": 11.5, "y": 1},
+ {"matrix": [4, 5], "x": 12.5, "y": 1},
+ {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
- {"x": 0, "y": 2, "w": 1.5},
- {"x": 1.5, "y": 2},
- {"x": 2.5, "y": 2},
- {"x": 3.5, "y": 2},
- {"x": 4.5, "y": 2},
- {"x": 5.5, "y": 2},
- {"x": 6.5, "y": 2.5, "h": 1.5},
- {"x": 7.5, "y": 2.5, "h": 1.5},
- {"x": 8.5, "y": 2},
- {"x": 9.5, "y": 2},
- {"x": 10.5, "y": 2},
- {"x": 11.5, "y": 2},
- {"x": 12.5, "y": 2},
- {"x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 2},
+ {"matrix": [1, 2], "x": 2.5, "y": 2},
+ {"matrix": [1, 3], "x": 3.5, "y": 2},
+ {"matrix": [1, 4], "x": 4.5, "y": 2},
+ {"matrix": [1, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5, "h": 1.5},
+ {"matrix": [6, 0], "x": 7.5, "y": 2.5, "h": 1.5},
+ {"matrix": [5, 1], "x": 8.5, "y": 2},
+ {"matrix": [5, 2], "x": 9.5, "y": 2},
+ {"matrix": [5, 3], "x": 10.5, "y": 2},
+ {"matrix": [5, 4], "x": 11.5, "y": 2},
+ {"matrix": [5, 5], "x": 12.5, "y": 2},
+ {"matrix": [5, 6], "x": 13.5, "y": 2, "w": 1.5},
- {"x": 0, "y": 3, "w": 1.5},
- {"x": 1.5, "y": 3},
- {"x": 2.5, "y": 3},
- {"x": 3.5, "y": 3},
- {"x": 4.5, "y": 3},
- {"x": 5.5, "y": 3},
- {"x": 8.5, "y": 3},
- {"x": 9.5, "y": 3},
- {"x": 10.5, "y": 3},
- {"x": 11.5, "y": 3},
- {"x": 12.5, "y": 3},
- {"x": 13.5, "y": 3, "w": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 3},
+ {"matrix": [2, 2], "x": 2.5, "y": 3},
+ {"matrix": [2, 3], "x": 3.5, "y": 3},
+ {"matrix": [2, 4], "x": 4.5, "y": 3},
+ {"matrix": [2, 5], "x": 5.5, "y": 3},
+ {"matrix": [6, 1], "x": 8.5, "y": 3},
+ {"matrix": [6, 2], "x": 9.5, "y": 3},
+ {"matrix": [6, 3], "x": 10.5, "y": 3},
+ {"matrix": [6, 4], "x": 11.5, "y": 3},
+ {"matrix": [6, 5], "x": 12.5, "y": 3},
+ {"matrix": [6, 6], "x": 13.5, "y": 3, "w": 1.5},
- {"x": 1.5, "y": 4},
- {"x": 2.5, "y": 4},
- {"x": 3.5, "y": 4},
- {"x": 4.5, "y": 4},
- {"x": 5.5, "y": 4, "w": 2},
- {"x": 7.5, "y": 4, "w": 2},
- {"x": 9.5, "y": 4},
- {"x": 10.5, "y": 4},
- {"x": 11.5, "y": 4},
- {"x": 12.5, "y": 4}
+ {"matrix": [3, 1], "x": 1.5, "y": 4},
+ {"matrix": [3, 2], "x": 2.5, "y": 4},
+ {"matrix": [3, 3], "x": 3.5, "y": 4},
+ {"matrix": [3, 4], "x": 4.5, "y": 4},
+ {"matrix": [3, 6], "x": 5.5, "y": 4, "w": 2},
+ {"matrix": [7, 0], "x": 7.5, "y": 4, "w": 2},
+ {"matrix": [7, 2], "x": 9.5, "y": 4},
+ {"matrix": [7, 3], "x": 10.5, "y": 4},
+ {"matrix": [7, 4], "x": 11.5, "y": 4},
+ {"matrix": [7, 5], "x": 12.5, "y": 4}
]
},
-
"LAYOUT_ortho_7u": {
"layout": [
- {"x": 12.5, "y": 0},
+ {"matrix": [7, 6], "x": 12.5, "y": 0},
- {"x": 0, "y": 1, "w": 1.5},
- {"x": 1.5, "y": 1},
- {"x": 2.5, "y": 1},
- {"x": 3.5, "y": 1},
- {"x": 4.5, "y": 1},
- {"x": 5.5, "y": 1},
- {"x": 6.5, "y": 1},
- {"x": 7.5, "y": 1},
- {"x": 8.5, "y": 1},
- {"x": 9.5, "y": 1},
- {"x": 10.5, "y": 1},
- {"x": 11.5, "y": 1},
- {"x": 12.5, "y": 1},
- {"x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 1},
+ {"matrix": [0, 2], "x": 2.5, "y": 1},
+ {"matrix": [0, 3], "x": 3.5, "y": 1},
+ {"matrix": [0, 4], "x": 4.5, "y": 1},
+ {"matrix": [0, 5], "x": 5.5, "y": 1},
+ {"matrix": [0, 6], "x": 6.5, "y": 1},
+ {"matrix": [4, 0], "x": 7.5, "y": 1},
+ {"matrix": [4, 1], "x": 8.5, "y": 1},
+ {"matrix": [4, 2], "x": 9.5, "y": 1},
+ {"matrix": [4, 3], "x": 10.5, "y": 1},
+ {"matrix": [4, 4], "x": 11.5, "y": 1},
+ {"matrix": [4, 5], "x": 12.5, "y": 1},
+ {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5},
- {"x": 0, "y": 2, "w": 1.5},
- {"x": 1.5, "y": 2},
- {"x": 2.5, "y": 2},
- {"x": 3.5, "y": 2},
- {"x": 4.5, "y": 2},
- {"x": 5.5, "y": 2},
- {"x": 6.5, "y": 2},
- {"x": 7.5, "y": 2},
- {"x": 8.5, "y": 2},
- {"x": 9.5, "y": 2},
- {"x": 10.5, "y": 2},
- {"x": 11.5, "y": 2},
- {"x": 12.5, "y": 2, "w": 1.5},
- {"x": 14, "y": 2},
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 2},
+ {"matrix": [1, 2], "x": 2.5, "y": 2},
+ {"matrix": [1, 3], "x": 3.5, "y": 2},
+ {"matrix": [1, 4], "x": 4.5, "y": 2},
+ {"matrix": [1, 5], "x": 5.5, "y": 2},
+ {"matrix": [1, 6], "x": 6.5, "y": 2},
+ {"matrix": [5, 0], "x": 7.5, "y": 2},
+ {"matrix": [5, 1], "x": 8.5, "y": 2},
+ {"matrix": [5, 2], "x": 9.5, "y": 2},
+ {"matrix": [5, 3], "x": 10.5, "y": 2},
+ {"matrix": [5, 4], "x": 11.5, "y": 2},
+ {"matrix": [5, 5], "x": 12.5, "y": 2, "w": 1.5},
+ {"matrix": [5, 6], "x": 14, "y": 2},
- {"x": 0, "y": 3, "w": 1.5},
- {"x": 1.5, "y": 3},
- {"x": 2.5, "y": 3},
- {"x": 3.5, "y": 3},
- {"x": 4.5, "y": 3},
- {"x": 5.5, "y": 3},
- {"x": 6.5, "y": 3},
- {"x": 7.5, "y": 3},
- {"x": 8.5, "y": 3},
- {"x": 9.5, "y": 3},
- {"x": 10.5, "y": 3},
- {"x": 11.5, "y": 3, "w": 1.5},
- {"x": 13, "y": 3},
- {"x": 14, "y": 3},
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 3},
+ {"matrix": [2, 2], "x": 2.5, "y": 3},
+ {"matrix": [2, 3], "x": 3.5, "y": 3},
+ {"matrix": [2, 4], "x": 4.5, "y": 3},
+ {"matrix": [2, 5], "x": 5.5, "y": 3},
+ {"matrix": [2, 6], "x": 6.5, "y": 3},
+ {"matrix": [6, 0], "x": 7.5, "y": 3},
+ {"matrix": [6, 1], "x": 8.5, "y": 3},
+ {"matrix": [6, 2], "x": 9.5, "y": 3},
+ {"matrix": [6, 3], "x": 10.5, "y": 3},
+ {"matrix": [6, 4], "x": 11.5, "y": 3, "w": 1.5},
+ {"matrix": [6, 5], "x": 13, "y": 3},
+ {"matrix": [6, 6], "x": 14, "y": 3},
- {"x": 1.5, "y": 4},
- {"x": 2.5, "y": 4, "w": 1.5},
- {"x": 4, "y": 4, "w": 7},
- {"x": 11, "y": 4, "w": 1.5},
- {"x": 12.5, "y": 4}
+ {"matrix": [3, 1], "x": 1.5, "y": 4},
+ {"matrix": [3, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [3, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [7, 4], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [7, 5], "x": 12.5, "y": 4}
]
}
}
diff --git a/keyboards/keyprez/rhino/rhino.c b/keyboards/keyprez/rhino/rhino.c
index 31302eff5b..e7eb74e655 100644
--- a/keyboards/keyprez/rhino/rhino.c
+++ b/keyboards/keyprez/rhino/rhino.c
@@ -14,19 +14,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rhino.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- tap_code(clockwise ? KC_VOLU : KC_VOLD);
- return true;
-}
+#include "quantum.h"
__attribute__ ((weak))
-const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_ortho_2x2u(
- 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1, 3, 0, 6, 8, 10, 0, 13, 15, 0, 18, 20, 0,
- 0, 0, 2, 4, 5, 7, 9, 11, 12, 14, 16, 17, 19, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-);
+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
+ { 0, 0, 0, 0, 0, 0, 0},
+ { 0, 1, 3, 0, 6, 8, 10},
+ { 0, 0, 2, 4, 5, 7, 9},
+ { 0, 0, 0, 0, 0, 0, 0},
+ { 0, 0, 0, 0, 0, 0, 0},
+ { 0, 13, 15, 0, 18, 20, 0},
+ {11, 12, 14, 16, 17, 19, 0},
+ { 0, 0, 0, 0, 0, 0, 0}
+};
diff --git a/keyboards/keyprez/rhino/rhino.h b/keyboards/keyprez/rhino/rhino.h
deleted file mode 100644
index 1547717a87..0000000000
--- a/keyboards/keyprez/rhino/rhino.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2021 Christian Sandven
- *
- * 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"
-
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_2x2u( \
- k70, \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, \
- k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06 }, \
- { k20, k21, k22, k23, k24, k25, k26 }, \
- { k40, k41, k42, k43, k44, k45, k46 }, \
- { KC_NO, k60, k61, k62, k63, KC_NO, k64 }, \
- { k07, k08, k09, k10, k11, k12, k13 }, \
- { k27, k28, k29, k30, k31, k32, k33 }, \
- { k47, k48, k49, k50, k51, k52, k53 }, \
- { k65, KC_NO, k66, k67, k68, k69, k70 } \
-}
-
-#define LAYOUT_ergo_2x2u( \
- k70, \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, \
- k40, k41, k42, k43, k44, k45, k48, k49, k50, k51, k52, k53, \
- k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06 }, \
- { k20, k21, k22, k23, k24, k25, KC_NO }, \
- { k40, k41, k42, k43, k44, k45, k26 }, \
- { KC_NO, k60, k61, k62, k63, KC_NO, k64 }, \
- { k07, k08, k09, k10, k11, k12, k13 }, \
- { KC_NO, k28, k29, k30, k31, k32, k33 }, \
- { k27, k48, k49, k50, k51, k52, k53 }, \
- { k65, KC_NO, k66, k67, k68, k69, k70 } \
-}
-
-#define LAYOUT_ortho_7u( \
- k65, \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, \
- k60, k61, k62, k63, k64 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06 }, \
- { k20, k21, k22, k23, k24, k25, k26 }, \
- { k40, k41, k42, k43, k44, k45, k46 }, \
- { KC_NO, k60, k61, KC_NO, KC_NO, KC_NO, k62 }, \
- { k07, k08, k09, k10, k11, k12, k13 }, \
- { k27, k28, k29, k30, k31, k32, k33 }, \
- { k47, k48, k49, k50, k51, k52, k53 }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, k63, k64, k65 } \
-}
-
diff --git a/keyboards/keyprez/unicorn/config.h b/keyboards/keyprez/unicorn/config.h
index 80747b54be..76a8890108 100644
--- a/keyboards/keyprez/unicorn/config.h
+++ b/keyboards/keyprez/unicorn/config.h
@@ -3,25 +3,7 @@
#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 MASTER_RIGHT
-#define MATRIX_ROW_PINS { F4, D3, F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { F5, B2, B5, D7, B4, B6, E6, D4 }
-#define MATRIX_ROW_PINS_RIGHT { F4, B2, F6, F7, B1, B3 }
-#define MATRIX_COL_PINS_RIGHT { F5, D3, B5, D7, B4, B6, E6, C6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/info.json
index e3afebbc0f..58d2a98d30 100644
--- a/keyboards/keyprez/unicorn/info.json
+++ b/keyboards/keyprez/unicorn/info.json
@@ -8,99 +8,115 @@
"pid": "0x7563",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F5", "B2", "B5", "D7", "B4", "B6", "E6", "D4"],
+ "rows": ["F4", "D3", "F6", "F7", "B1", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D2", "pin_b": "D4"}
]
},
"split": {
- "soft_serial_pin": "D0"
+ "soft_serial_pin": "D0",
+ "matrix_pins": {
+ "right": {
+ "cols": ["F5", "D3", "B5", "D7", "B4", "B6", "E6", "C6"],
+ "rows": ["F4", "B2", "F6", "F7", "B1", "B3"]
+ }
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"|\u00a7", "x":0, "y":0},
- {"label":"1!", "x":1, "y":0},
- {"label":"2\"", "x":2, "y":0},
- {"label":"3#", "x":3, "y":0},
- {"label":"4\u00a4", "x":4, "y":0},
- {"label":"5%", "x":5, "y":0},
- {"label":"6&", "x":6, "y":0},
- {"label":"7/", "x":8, "y":0},
- {"label":"8(", "x":9, "y":0},
- {"label":"9)", "x":10, "y":0},
- {"label":"0=", "x":11, "y":0},
- {"label":"+?", "x":12, "y":0},
- {"label":"\\`", "x":13, "y":0},
- {"label":"Backspace", "x":14, "y":0, "w":2},
- {"label":"Home", "x":16, "y":0},
- {"label":"Rotary", "x":17, "y":0},
+ {"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": [6, 0], "x": 8, "y": 0},
+ {"matrix": [6, 1], "x": 9, "y": 0},
+ {"matrix": [6, 2], "x": 10, "y": 0},
+ {"matrix": [6, 3], "x": 11, "y": 0},
+ {"matrix": [6, 4], "x": 12, "y": 0},
+ {"matrix": [6, 5], "x": 13, "y": 0},
+ {"matrix": [6, 6], "x": 14, "y": 0, "w": 2},
+ {"matrix": [6, 7], "x": 16, "y": 0},
+ {"matrix": [11, 2], "x": 17, "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": [7, 0], "x": 7.5, "y": 1},
+ {"matrix": [7, 1], "x": 8.5, "y": 1},
+ {"matrix": [7, 2], "x": 9.5, "y": 1},
+ {"matrix": [7, 3], "x": 10.5, "y": 1},
+ {"matrix": [7, 4], "x": 11.5, "y": 1},
+ {"matrix": [7, 5], "x": 12.5, "y": 1},
+ {"matrix": [7, 6], "x": 13.5, "y": 1},
+ {"matrix": [11, 4], "x": 16, "y": 1},
+ {"matrix": [11, 3], "x": 17, "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": [8, 0], "x": 7.75, "y": 2},
+ {"matrix": [8, 1], "x": 8.75, "y": 2},
+ {"matrix": [8, 2], "x": 9.75, "y": 2},
+ {"matrix": [8, 3], "x": 10.75, "y": 2},
+ {"matrix": [8, 4], "x": 11.75, "y": 2},
+ {"matrix": [8, 5], "x": 12.75, "y": 2},
+ {"matrix": [8, 6], "x": 13.75, "y": 2},
+ {"matrix": [8, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [11, 6], "x": 16, "y": 2},
+ {"matrix": [11, 5], "x": 17, "y": 2},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":7.5, "y":1},
- {"label":"U", "x":8.5, "y":1},
- {"label":"I", "x":9.5, "y":1},
- {"label":"O", "x":10.5, "y":1},
- {"label":"P", "x":11.5, "y":1},
- {"label":"\u00c5", "x":12.5, "y":1},
- {"label":"\u00a8\u005e", "x":13.5, "y":1},
- {"label":"End", "x":16, "y":1},
- {"label":"Delete", "x":17, "y":1},
+ {"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},
- {"label":"Esc", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":7.75, "y":2},
- {"label":"J", "x":8.75, "y":2},
- {"label":"K", "x":9.75, "y":2},
- {"label":"L", "x":10.75, "y":2},
- {"label":"\u00d8", "x":11.75, "y":2},
- {"label":"\u00c6", "x":12.75, "y":2},
- {"label":"'*", "x":13.75, "y":2},
- {"label":"Enter", "x":14.75, "y":1, "w":1.25, "h":2},
- {"label":"PgUp", "x":16, "y":2},
- {"label":"Insert", "x":17, "y":2},
+ {"matrix": [9, 0], "x": 8.25, "y": 3},
+ {"matrix": [9, 1], "x": 9.25, "y": 3},
+ {"matrix": [9, 2], "x": 10.25, "y": 3},
+ {"matrix": [9, 3], "x": 11.25, "y": 3},
+ {"matrix": [9, 4], "x": 12.25, "y": 3},
+ {"matrix": [9, 5], "x": 13.25, "y": 3, "w": 1.75},
+ {"matrix": [9, 6], "x": 15, "y": 3},
+ {"matrix": [9, 7], "x": 16, "y": 3},
+ {"matrix": [11, 7], "x": 17, "y": 3},
- {"label":"Shift", "x":0, "y":3, "w":1.25},
- {"label":"<>", "x":1.25, "y":3},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":8.25, "y":3},
- {"label":"M", "x":9.25, "y":3},
- {"label":",;", "x":10.25, "y":3},
- {"label":".:", "x":11.25, "y":3},
- {"label":"-_", "x":12.25, "y":3},
- {"label":"Shift", "x":13.25, "y":3, "w":1.75},
- {"label":"\u2191", "x":15, "y":3},
- {"label":"PgDn", "x":16, "y":3},
- {"label":"Copy", "x":17, "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, 4], "x": 3.75, "y": 4, "w": 2.25},
+ {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25},
- {"label":"Win", "x":1.25, "y":4, "w":1.25},
- {"label":"Alt", "x":2.5, "y":4, "w":1.25},
- {"label":"Space", "x":3.75, "y":4, "w":2.25},
- {"label":"Space", "x":6, "y":4, "w":1.25},
- {"label":"Space", "x":8.25, "y":4, "w":2.75},
- {"label":"AltGr", "x":11, "y":4},
- {"label":"Mod", "x":12, "y":4},
- {"label":"Ctrl", "x":13, "y":4},
- {"label":"\u2190", "x":14, "y":4},
- {"label":"\u2193", "x":15, "y":4},
- {"label":"\u2192", "x":16, "y":4},
- {"label":"Paste", "x":17, "y":4}
+ {"matrix": [10, 0], "x": 8.25, "y": 4, "w": 2.75},
+ {"matrix": [10, 1], "x": 11, "y": 4},
+ {"matrix": [10, 2], "x": 12, "y": 4},
+ {"matrix": [10, 3], "x": 13, "y": 4},
+ {"matrix": [10, 4], "x": 14, "y": 4},
+ {"matrix": [10, 5], "x": 15, "y": 4},
+ {"matrix": [10, 6], "x": 16, "y": 4},
+ {"matrix": [10, 7], "x": 17, "y": 4}
]
}
}
diff --git a/keyboards/keyprez/unicorn/unicorn.c b/keyboards/keyprez/unicorn/unicorn.c
deleted file mode 100644
index 0ddd49658b..0000000000
--- a/keyboards/keyprez/unicorn/unicorn.c
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2022 Keyprez (https://github.com/keyprez)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "unicorn.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- if (index == 0) {
- if (clockwise) {
- tap_code_delay(KC_VOLU, 10);
- } else {
- tap_code_delay(KC_VOLD, 10);
- }
- }
- return true;
-}
-#endif
diff --git a/keyboards/keyprez/unicorn/unicorn.h b/keyboards/keyprez/unicorn/unicorn.h
deleted file mode 100644
index 5eb036f50a..0000000000
--- a/keyboards/keyprez/unicorn/unicorn.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2022 Keyprez (https://github.com/keyprez)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- LA1, LA2, LA3, LA4, LA5, LA6, LA7, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
- LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
- LC1, LC2, LC3, LC4, LC5, LC6, RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, RC10, \
- LD1, LD2, LD3, LD4, LD5, LD6, LD7, RD1, RD2, RD3, RD4, RD5, RD6, RD7, RD8, RD9, \
- LE1, LE2, LE3, LE5, LE6, RE1, RE2, RE3, RE4, RE5, RE6, RE7, RE8 \
- ) \
- { \
- { LA1, LA2, LA3, LA4, LA5, LA6, LA7, KC_NO }, \
- { LB1, LB2, LB3, LB4, LB5, LB6, KC_NO, KC_NO }, \
- { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO, KC_NO }, \
- { LD1, LD2, LD3, LD4, LD5, LD6, LD7, KC_NO }, \
- { LE1, LE2, LE3, KC_NO, LE5, LE6, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8 }, \
- { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO }, \
- { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8 }, \
- { RD1, RD2, RD3, RD4, RD5, RD6, RD7, RD8 }, \
- { RE1, RE2, RE3, RE4, RE5, RE6, RE7, RE8 }, \
- { KC_NO, KC_NO, RA9, RB9, RB8, RC10, RC9, RD9 } \
- }
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 19:35:13 +0000