summaryrefslogtreecommitdiff
path: root/keyboards/mntre
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mntre')
-rw-r--r--keyboards/mntre/config.h17
-rw-r--r--keyboards/mntre/info.json169
-rw-r--r--keyboards/mntre/mntre.c2
-rw-r--r--keyboards/mntre/mntre.h30
4 files changed, 88 insertions, 130 deletions
diff --git a/keyboards/mntre/config.h b/keyboards/mntre/config.h
index 54a640366b..55a7a8457e 100644
--- a/keyboards/mntre/config.h
+++ b/keyboards/mntre/config.h
@@ -3,23 +3,6 @@
#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 { B6, B5, B4, D7, D6, D4 }
-#define MATRIX_COL_PINS { D5, F7, E6, C7, B3, B2, B1, B0, F0, F1, F4, F5, F6, C6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_CUSTOM_RESOLUTION 0x400
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/mntre/info.json b/keyboards/mntre/info.json
index 36426c3cc1..90bfc3fc56 100644
--- a/keyboards/mntre/info.json
+++ b/keyboards/mntre/info.json
@@ -8,6 +8,11 @@
"pid": "0x1302",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["D5", "F7", "E6", "C7", "B3", "B2", "B1", "B0", "F0", "F1", "F4", "F5", "F6", "C6"],
+ "rows": ["B6", "B5", "B4", "D7", "D6", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"max_brightness": 84
@@ -17,93 +22,93 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "ESC", "x": 0, "y": 0},
- {"label": "F1", "x": 1, "y": 0},
- {"label": "F2", "x": 2, "y": 0},
- {"label": "F3", "x": 3, "y": 0},
- {"label": "F4", "x": 4, "y": 0},
- {"label": "F5", "x": 5, "y": 0},
- {"label": "F6", "x": 6, "y": 0},
- {"label": "F7", "x": 7, "y": 0},
- {"label": "F8", "x": 8, "y": 0},
- {"label": "F9", "x": 9, "y": 0},
- {"label": "F10", "x": 10, "y": 0},
- {"label": "F11", "x": 11, "y": 0},
- {"label": "F12", "x": 12, "y": 0},
- {"label": "NO", "x": 13, "y": 0, "w": 1.5},
+ {"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": 1.5},
- {"label": "GRAVE", "x": 0, "y": 1},
- {"label": "1", "x": 1, "y": 1},
- {"label": "2", "x": 2, "y": 1},
- {"label": "3", "x": 3, "y": 1},
- {"label": "4", "x": 4, "y": 1},
- {"label": "5", "x": 5, "y": 1},
- {"label": "6", "x": 6, "y": 1},
- {"label": "7", "x": 7, "y": 1},
- {"label": "8", "x": 8, "y": 1},
- {"label": "9", "x": 9, "y": 1},
- {"label": "0", "x": 10, "y": 1},
- {"label": "MINUS", "x": 11, "y": 1},
- {"label": "EQUAL", "x": 12, "y": 1},
- {"label": "BSPACE", "x": 13, "y": 1, "w": 1.5},
+ {"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": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 1.5},
- {"label": "TAB", "x": 0, "y": 2, "w": 1.5},
- {"label": "Q", "x": 1.5, "y": 2},
- {"label": "W", "x": 2.5, "y": 2},
- {"label": "E", "x": 3.5, "y": 2},
- {"label": "R", "x": 4.5, "y": 2},
- {"label": "T", "x": 5.5, "y": 2},
- {"label": "Y", "x": 6.5, "y": 2},
- {"label": "U", "x": 7.5, "y": 2},
- {"label": "I", "x": 8.5, "y": 2},
- {"label": "O", "x": 9.5, "y": 2},
- {"label": "P", "x": 10.5, "y": 2},
- {"label": "LBRACKET", "x": 11.5, "y": 2},
- {"label": "RBRACKET", "x": 12.5, "y": 2},
- {"label": "BSLASH", "x": 13.5, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2},
- {"label": "LCTRL", "x": 0, "y": 3},
- {"label": "APP", "x": 1, "y": 3},
- {"label": "A", "x": 2, "y": 3},
- {"label": "S", "x": 3, "y": 3},
- {"label": "D", "x": 4, "y": 3},
- {"label": "F", "x": 5, "y": 3},
- {"label": "G", "x": 6, "y": 3},
- {"label": "H", "x": 7, "y": 3},
- {"label": "J", "x": 8, "y": 3},
- {"label": "K", "x": 9, "y": 3},
- {"label": "L", "x": 10, "y": 3},
- {"label": "SCOLON", "x": 11, "y": 3},
- {"label": "QUOTE", "x": 12, "y": 3},
- {"label": "ENTER", "x": 13, "y": 3, "w": 1.5},
+ {"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": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3, "w": 1.5},
- {"label": "LSHIFT", "x": 0, "y": 4, "w": 1.5},
- {"label": "DEL", "x": 1.5, "y": 4},
- {"label": "Z", "x": 2.5, "y": 4},
- {"label": "X", "x": 3.5, "y": 4},
- {"label": "C", "x": 4.5, "y": 4},
- {"label": "V", "x": 5.5, "y": 4},
- {"label": "B", "x": 6.5, "y": 4},
- {"label": "N", "x": 7.5, "y": 4},
- {"label": "M", "x": 8.5, "y": 4},
- {"label": "COMMA", "x": 9.5, "y": 4},
- {"label": "DOT", "x": 10.5, "y": 4},
- {"label": "SLASH", "x": 11.5, "y": 4},
- {"label": "UP", "x": 12.5, "y": 4},
- {"label": "RSHIFT", "x": 13.5, "y": 4},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4},
+ {"matrix": [4, 3], "x": 3.5, "y": 4},
+ {"matrix": [4, 4], "x": 4.5, "y": 4},
+ {"matrix": [4, 5], "x": 5.5, "y": 4},
+ {"matrix": [4, 6], "x": 6.5, "y": 4},
+ {"matrix": [4, 7], "x": 7.5, "y": 4},
+ {"matrix": [4, 8], "x": 8.5, "y": 4},
+ {"matrix": [4, 9], "x": 9.5, "y": 4},
+ {"matrix": [4, 10], "x": 10.5, "y": 4},
+ {"matrix": [4, 11], "x": 11.5, "y": 4},
+ {"matrix": [4, 12], "x": 12.5, "y": 4},
+ {"matrix": [4, 13], "x": 13.5, "y": 4},
- {"label": "RGUI", "x": 0, "y": 5, "w": 1.5},
- {"label": "LGUI", "x": 1.5, "y": 5, "w": 1.5},
- {"label": "RCTRL", "x": 3, "y": 5, "w": 1.5},
- {"label": "SPACE", "x": 4.5, "y": 5, "w": 1.5},
- {"label": "LALT", "x": 6, "y": 5},
- {"label": "RALT", "x": 7, "y": 5},
- {"label": "SPACE", "x": 8, "y": 5, "w": 1.5},
- {"label": "PGUP", "x": 9.5, "y": 5},
- {"label": "PGDOWN", "x": 10.5, "y": 5},
- {"label": "LEFT", "x": 11.5, "y": 5},
- {"label": "DOWN", "x": 12.5, "y": 5},
- {"label": "RIGHT", "x": 13.5, "y": 5}
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 2], "x": 3, "y": 5, "w": 1.5},
+ {"matrix": [5, 3], "x": 4.5, "y": 5, "w": 1.5},
+ {"matrix": [5, 4], "x": 6, "y": 5},
+ {"matrix": [5, 5], "x": 7, "y": 5},
+ {"matrix": [5, 6], "x": 8, "y": 5, "w": 1.5},
+ {"matrix": [5, 7], "x": 9.5, "y": 5},
+ {"matrix": [5, 8], "x": 10.5, "y": 5},
+ {"matrix": [5, 9], "x": 11.5, "y": 5},
+ {"matrix": [5, 10], "x": 12.5, "y": 5},
+ {"matrix": [5, 11], "x": 13.5, "y": 5}
]
}
}
diff --git a/keyboards/mntre/mntre.c b/keyboards/mntre/mntre.c
index c21070b23b..80ed074c2f 100644
--- a/keyboards/mntre/mntre.c
+++ b/keyboards/mntre/mntre.c
@@ -1,7 +1,7 @@
// Copyright 2021 Cedric Vincent (@cdc-mkb)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "mntre.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
bool oled_task_kb(void) {
diff --git a/keyboards/mntre/mntre.h b/keyboards/mntre/mntre.h
deleted file mode 100644
index 8a48114423..0000000000
--- a/keyboards/mntre/mntre.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2021 Cedric Vincent (@cdc-mkb)
-// 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( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, \
- k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, KC_NO, KC_NO } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 22:30:52 +0000