summaryrefslogtreecommitdiffstats
path: root/keyboards/kb_elmo/m0116_usb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kb_elmo/m0116_usb')
-rw-r--r--keyboards/kb_elmo/m0116_usb/config.h10
-rw-r--r--keyboards/kb_elmo/m0116_usb/info.json173
-rw-r--r--keyboards/kb_elmo/m0116_usb/m0116_usb.c17
-rw-r--r--keyboards/kb_elmo/m0116_usb/m0116_usb.h42
4 files changed, 92 insertions, 150 deletions
diff --git a/keyboards/kb_elmo/m0116_usb/config.h b/keyboards/kb_elmo/m0116_usb/config.h
index 5b8de9b54f..fd067c7fb7 100644
--- a/keyboards/kb_elmo/m0116_usb/config.h
+++ b/keyboards/kb_elmo/m0116_usb/config.h
@@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS { B1, A0, B2, A2, A1 }
-#define MATRIX_COL_PINS { D6, D5, D1, D0, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, A3 }
-
-/* 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/kb_elmo/m0116_usb/info.json b/keyboards/kb_elmo/m0116_usb/info.json
index e01f965731..e8accd8448 100644
--- a/keyboards/kb_elmo/m0116_usb/info.json
+++ b/keyboards/kb_elmo/m0116_usb/info.json
@@ -8,6 +8,11 @@
"pid": "0x8F7E",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D6", "D5", "D1", "D0", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "A3"],
+ "rows": ["B1", "A0", "B2", "A2", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"bootmagic": {
"matrix": [4, 5]
},
@@ -16,92 +21,98 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Print Screen", "x":5, "y":0, "w":2},
+ {"matrix": [4, 5], "x": 5, "y": 0, "w": 2},
+
+ {"matrix": [0, 0], "x": 0, "y": 1.15},
+ {"matrix": [0, 1], "x": 1, "y": 1.15},
+ {"matrix": [0, 2], "x": 2, "y": 1.15},
+ {"matrix": [0, 3], "x": 3, "y": 1.15},
+ {"matrix": [0, 4], "x": 4, "y": 1.15},
+ {"matrix": [0, 5], "x": 5, "y": 1.15},
+ {"matrix": [0, 6], "x": 6, "y": 1.15},
+ {"matrix": [0, 7], "x": 7, "y": 1.15},
+ {"matrix": [0, 8], "x": 8, "y": 1.15},
+ {"matrix": [0, 9], "x": 9, "y": 1.15},
+ {"matrix": [0, 10], "x": 10, "y": 1.15},
+ {"matrix": [0, 11], "x": 11, "y": 1.15},
+ {"matrix": [0, 12], "x": 12, "y": 1.15},
+ {"matrix": [0, 13], "x": 13, "y": 1.15, "w": 1.5},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 1.15},
+ {"matrix": [0, 15], "x": 16.25, "y": 1.15},
+ {"matrix": [0, 16], "x": 17.25, "y": 1.15},
+ {"matrix": [0, 17], "x": 18.25, "y": 1.15},
+
+ {"matrix": [1, 0], "x": 0, "y": 2.15, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 2.15},
+ {"matrix": [1, 2], "x": 2.5, "y": 2.15},
+ {"matrix": [1, 3], "x": 3.5, "y": 2.15},
+ {"matrix": [1, 4], "x": 4.5, "y": 2.15},
+ {"matrix": [1, 5], "x": 5.5, "y": 2.15},
+ {"matrix": [1, 6], "x": 6.5, "y": 2.15},
+ {"matrix": [1, 7], "x": 7.5, "y": 2.15},
+ {"matrix": [1, 8], "x": 8.5, "y": 2.15},
+ {"matrix": [1, 9], "x": 9.5, "y": 2.15},
+ {"matrix": [1, 10], "x": 10.5, "y": 2.15},
+ {"matrix": [1, 11], "x": 11.5, "y": 2.15},
+ {"matrix": [1, 12], "x": 12.5, "y": 2.15},
+ {"matrix": [1, 14], "x": 15.25, "y": 2.15},
+ {"matrix": [1, 15], "x": 16.25, "y": 2.15},
+ {"matrix": [1, 16], "x": 17.25, "y": 2.15},
+ {"matrix": [1, 17], "x": 18.25, "y": 2.15},
+ {"matrix": [2, 0], "x": 0, "y": 3.15, "w": 1.75},
+
+ {"matrix": [2, 1], "x": 1.75, "y": 3.15},
+ {"matrix": [2, 2], "x": 2.75, "y": 3.15},
+ {"matrix": [2, 3], "x": 3.75, "y": 3.15},
+ {"matrix": [2, 4], "x": 4.75, "y": 3.15},
+ {"matrix": [2, 5], "x": 5.75, "y": 3.15},
+ {"matrix": [2, 6], "x": 6.75, "y": 3.15},
+ {"matrix": [2, 7], "x": 7.75, "y": 3.15},
+ {"matrix": [2, 8], "x": 8.75, "y": 3.15},
+ {"matrix": [2, 9], "x": 9.75, "y": 3.15},
+ {"matrix": [2, 10], "x": 10.75, "y": 3.15},
+ {"matrix": [2, 11], "x": 11.75, "y": 3.15},
+ {"matrix": [1, 13], "x": 13.5, "y": 2.15, "h": 2},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 3.15},
+ {"matrix": [2, 15], "x": 16.25, "y": 3.15},
+ {"matrix": [2, 16], "x": 17.25, "y": 3.15},
+ {"matrix": [2, 17], "x": 18.25, "y": 3.15},
+
+ {"matrix": [3, 0], "x": 0, "y": 4.15, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 4.15},
+ {"matrix": [3, 2], "x": 3.25, "y": 4.15},
+ {"matrix": [3, 3], "x": 4.25, "y": 4.15},
+ {"matrix": [3, 4], "x": 5.25, "y": 4.15},
+ {"matrix": [3, 5], "x": 6.25, "y": 4.15},
+ {"matrix": [3, 6], "x": 7.25, "y": 4.15},
+ {"matrix": [3, 7], "x": 8.25, "y": 4.15},
+ {"matrix": [3, 8], "x": 9.25, "y": 4.15},
+ {"matrix": [3, 9], "x": 10.25, "y": 4.15},
+ {"matrix": [3, 10], "x": 11.25, "y": 4.15},
+ {"matrix": [3, 13], "x": 12.25, "y": 4.15, "w": 2.25},
- {"label":"Esc", "x":0, "y":1.15},
- {"label":"1!", "x":1, "y":1.15},
- {"label":"2@", "x":2, "y":1.15},
- {"label":"3#", "x":3, "y":1.15},
- {"label":"4$", "x":4, "y":1.15},
- {"label":"5%", "x":5, "y":1.15},
- {"label":"6^", "x":6, "y":1.15},
- {"label":"7&", "x":7, "y":1.15},
- {"label":"8*", "x":8, "y":1.15},
- {"label":"9(", "x":9, "y":1.15},
- {"label":"0)", "x":10, "y":1.15},
- {"label":"-_", "x":11, "y":1.15},
- {"label":"=+", "x":12, "y":1.15},
- {"label":"Backspace", "x":13, "y":1.15, "w":1.5},
- {"label":"Delete", "x":15.25, "y":1.15},
- {"label":"=+", "x":16.25, "y":1.15},
- {"label":"/", "x":17.25, "y":1.15},
- {"label":"*", "x":18.25, "y":1.15},
+ {"matrix": [3, 14], "x": 15.25, "y": 4.15},
+ {"matrix": [3, 15], "x": 16.25, "y": 4.15},
+ {"matrix": [3, 16], "x": 17.25, "y": 4.15},
- {"label":"Tab", "x":0, "y":2.15, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.15},
- {"label":"W", "x":2.5, "y":2.15},
- {"label":"E", "x":3.5, "y":2.15},
- {"label":"R", "x":4.5, "y":2.15},
- {"label":"T", "x":5.5, "y":2.15},
- {"label":"Y", "x":6.5, "y":2.15},
- {"label":"U", "x":7.5, "y":2.15},
- {"label":"I", "x":8.5, "y":2.15},
- {"label":"O", "x":9.5, "y":2.15},
- {"label":"P", "x":10.5, "y":2.15},
- {"label":"[{", "x":11.5, "y":2.15},
- {"label":"]}", "x":12.5, "y":2.15},
- {"label":"7", "x":15.25, "y":2.15},
- {"label":"8", "x":16.25, "y":2.15},
- {"label":"9", "x":17.25, "y":2.15},
- {"label":"+", "x":18.25, "y":2.15},
+ {"matrix": [4, 0], "x": 0, "y": 5.15},
+ {"matrix": [4, 1], "x": 1, "y": 5.15},
+ {"matrix": [4, 2], "x": 2, "y": 5.15, "w": 1.75},
+ {"matrix": [4, 3], "x": 3.75, "y": 5.15},
+ {"matrix": [4, 7], "x": 4.75, "y": 5.15, "w": 4.75},
+ {"matrix": [4, 8], "x": 9.5, "y": 5.15},
- {"label":"Ctrl", "x":0, "y":3.15, "w":1.75},
- {"label":"A", "x":1.75, "y":3.15},
- {"label":"S", "x":2.75, "y":3.15},
- {"label":"D", "x":3.75, "y":3.15},
- {"label":"F", "x":4.75, "y":3.15},
- {"label":"G", "x":5.75, "y":3.15},
- {"label":"H", "x":6.75, "y":3.15},
- {"label":"J", "x":7.75, "y":3.15},
- {"label":"K", "x":8.75, "y":3.15},
- {"label":"L", "x":9.75, "y":3.15},
- {"label":";:", "x":10.75, "y":3.15},
- {"label":"'\"", "x":11.75, "y":3.15},
- {"label":"Enter", "x":13.5, "y":2.15, "h":2},
- {"label":"4", "x":15.25, "y":3.15},
- {"label":"5", "x":16.25, "y":3.15},
- {"label":"6", "x":17.25, "y":3.15},
- {"label":"-", "x":18.25, "y":3.15},
+ {"matrix": [4, 9], "x": 10.5, "y": 5.15},
+ {"matrix": [4, 10], "x": 11.5, "y": 5.15},
+ {"matrix": [4, 11], "x": 12.5, "y": 5.15},
- {"label":"Shift", "x":0, "y":4.15, "w":2.25},
- {"label":"Z", "x":2.25, "y":4.15},
- {"label":"X", "x":3.25, "y":4.15},
- {"label":"C", "x":4.25, "y":4.15},
- {"label":"V", "x":5.25, "y":4.15},
- {"label":"B", "x":6.25, "y":4.15},
- {"label":"N", "x":7.25, "y":4.15},
- {"label":"M", "x":8.25, "y":4.15},
- {"label":",<", "x":9.25, "y":4.15},
- {"label":".>", "x":10.25, "y":4.15},
- {"label":"/?", "x":11.25, "y":4.15},
- {"label":"MO(1)", "x":12.25, "y":4.15, "w":2.25},
- {"label":"1", "x":15.25, "y":4.15},
- {"label":"2", "x":16.25, "y":4.15},
- {"label":"3", "x":17.25, "y":4.15},
+ {"matrix": [4, 13], "x": 13.5, "y": 5.15},
- {"label":"Caps Lock", "x":0, "y":5.15},
- {"label":"GUI", "x":1, "y":5.15},
- {"label":"Alt", "x":2, "y":5.15, "w":1.75},
- {"label":"`~", "x":3.75, "y":5.15},
- {"label":"Space", "x":4.75, "y":5.15, "w":4.75},
- {"label":"\\|", "x":9.5, "y":5.15},
- {"label":"Left", "x":10.5, "y":5.15},
- {"label":"Right", "x":11.5, "y":5.15},
- {"label":"Down", "x":12.5, "y":5.15},
- {"label":"Up", "x":13.5, "y":5.15},
- {"label":"0", "x":15.25, "y":5.15, "w":2},
- {"label":".", "x":17.25, "y":5.15},
- {"label":"Enter", "x":18.25, "y":4.15, "h":2}
+ {"matrix": [4, 14], "x": 15.25, "y": 5.15, "w": 2},
+ {"matrix": [4, 16], "x": 17.25, "y": 5.15},
+ {"matrix": [4, 17], "x": 18.25, "y": 4.15, "h": 2}
]
}
}
diff --git a/keyboards/kb_elmo/m0116_usb/m0116_usb.c b/keyboards/kb_elmo/m0116_usb/m0116_usb.c
deleted file mode 100644
index 823e2abd0a..0000000000
--- a/keyboards/kb_elmo/m0116_usb/m0116_usb.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * 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 "m0116_usb.h"
diff --git a/keyboards/kb_elmo/m0116_usb/m0116_usb.h b/keyboards/kb_elmo/m0116_usb/m0116_usb.h
deleted file mode 100644
index 9e98e19ea2..0000000000
--- a/keyboards/kb_elmo/m0116_usb/m0116_usb.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2020 kb-elmo<mail@elmo.space>
- *
- * 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( \
- k71, \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, \
- k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k32, k33, k34, k35, \
- k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k31, k48, k49, k50, k51, \
- k52, k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, \
- k67, k68, k69, k70, k72, k73, k74, k75, k76, k77, k78, k79, k80 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, }, \
- { k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, }, \
- { k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, KC_NO, KC_NO, k48, k49, k50, k51, }, \
- { k52, k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, KC_NO, KC_NO, k63, k64, k65, k66, KC_NO }, \
- { k67, k68, k69, k70, KC_NO, k71, KC_NO, k72, k73, k74, k75, k76, KC_NO, k77, k78, KC_NO, k79, k80, } \
-}