summaryrefslogtreecommitdiff
path: root/keyboards/kb_elmo/aek2_usb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kb_elmo/aek2_usb')
-rw-r--r--keyboards/kb_elmo/aek2_usb/aek2_usb.c17
-rw-r--r--keyboards/kb_elmo/aek2_usb/aek2_usb.h45
-rw-r--r--keyboards/kb_elmo/aek2_usb/config.h10
-rw-r--r--keyboards/kb_elmo/aek2_usb/info.json234
4 files changed, 129 insertions, 177 deletions
diff --git a/keyboards/kb_elmo/aek2_usb/aek2_usb.c b/keyboards/kb_elmo/aek2_usb/aek2_usb.c
deleted file mode 100644
index 6ce5d21df7..0000000000
--- a/keyboards/kb_elmo/aek2_usb/aek2_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 "aek2_usb.h"
diff --git a/keyboards/kb_elmo/aek2_usb/aek2_usb.h b/keyboards/kb_elmo/aek2_usb/aek2_usb.h
deleted file mode 100644
index 37c252f29a..0000000000
--- a/keyboards/kb_elmo/aek2_usb/aek2_usb.h
+++ /dev/null
@@ -1,45 +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( \
- k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k52, k12, k105, k91, k90, k84, \
- k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k104, k78, k79, k80, k81, k83, k85, \
- k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k92, k93, k94, k95, k82, k97, k99, \
- k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k53, k54, k89, k96, k98, k86, \
- k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k73, k103, k88, k87, \
- k67, k68, k69, k70, k75, k76, k77, k72, k74, k71, k102, k101, k100 \
-) { \
- { k01, KC_NO, k02, k03, k04, k05, k06, k07, k08, k09, KC_NO, 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, k48, k49, k50, k51, k52, k53, k54 }, \
- { k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, KC_NO, KC_NO, k66 }, \
- { k67, k68, k69, KC_NO, KC_NO, k70, k71, k72, k73, k74, k75, k76, KC_NO, k77 }, \
- { k78, k79, k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k90, k91 }, \
- { k92, k93, k94, k95, k96, k97, k98, k99, k100, k101, k102, k103, k104, k105 } \
-}
diff --git a/keyboards/kb_elmo/aek2_usb/config.h b/keyboards/kb_elmo/aek2_usb/config.h
index 2861c4a904..92630de5b4 100644
--- a/keyboards/kb_elmo/aek2_usb/config.h
+++ b/keyboards/kb_elmo/aek2_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 { D5, C1, C4, D0, C3, C2, B3, B4 }
-#define MATRIX_COL_PINS { A1, A0, A2, A3, A4, A5, A6, A7, C7, C6, C5, C0, D6, D1 }
-
-/* 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/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/info.json
index 457762992b..4e5a13f870 100644
--- a/keyboards/kb_elmo/aek2_usb/info.json
+++ b/keyboards/kb_elmo/aek2_usb/info.json
@@ -8,6 +8,11 @@
"pid": "0xDB52",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A1", "A0", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C0", "D6", "D1"],
+ "rows": ["D5", "C1", "C4", "D0", "C3", "C2", "B3", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B1",
"num_lock": "B2",
@@ -18,111 +23,130 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6.5, "y":0},
- {"x":7.5, "y":0},
- {"x":8.5, "y":0},
- {"x":9.5, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
- {"x":22, "y":0},
- {"x":0, "y":2},
- {"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},
- {"x":13, "y":2, "w":2},
- {"x":15.5, "y":2},
- {"x":16.5, "y":2},
- {"x":17.5, "y":2},
- {"x":19, "y":2},
- {"x":20, "y":2},
- {"x":21, "y":2},
- {"x":22, "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},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3, "w":1.5},
- {"x":15.5, "y":3},
- {"x":16.5, "y":3},
- {"x":17.5, "y":3},
- {"x":19, "y":3},
- {"x":20, "y":3},
- {"x":21, "y":3},
- {"x":22, "y":3},
- {"x":0, "y":4, "w":1.75},
- {"x":1.75, "y":4},
- {"x":2.75, "y":4},
- {"x":3.75, "y":4},
- {"x":4.75, "y":4},
- {"x":5.75, "y":4},
- {"x":6.75, "y":4},
- {"x":7.75, "y":4},
- {"x":8.75, "y":4},
- {"x":9.75, "y":4},
- {"x":10.75, "y":4},
- {"x":11.75, "y":4},
- {"x":12.75, "y":4, "w":2.25},
- {"x":19, "y":4},
- {"x":20, "y":4},
- {"x":21, "y":4},
- {"x":22, "y":4},
- {"x":0, "y":5, "w":2.25},
- {"x":2.25, "y":5},
- {"x":3.25, "y":5},
- {"x":4.25, "y":5},
- {"x":5.25, "y":5},
- {"x":6.25, "y":5},
- {"x":7.25, "y":5},
- {"x":8.25, "y":5},
- {"x":9.25, "y":5},
- {"x":10.25, "y":5},
- {"x":11.25, "y":5},
- {"x":12.25, "y":5, "w":2.75},
- {"x":16.5, "y":5},
- {"x":19, "y":5},
- {"x":20, "y":5},
- {"x":21, "y":5},
- {"x":22, "y":5, "h":2},
- {"x":0, "y":6, "w":1.5},
- {"x":1.5, "y":6, "w":1.25},
- {"x":2.75, "y":6, "w":1.5},
- {"x":4.25, "y":6, "w":6.5},
- {"x":10.75, "y":6, "w":1.5},
- {"x":12.25, "y":6, "w":1.25},
- {"x":13.5, "y":6, "w":1.5},
- {"x":15.5, "y":6},
- {"x":16.5, "y":6},
- {"x":17.5, "y":6},
- {"x":19, "y":6, "w":2},
- {"x":21, "y":6}
+ {"matrix": [0, 0], "x": 0, "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.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+ {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [3, 11], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [7, 13], "x": 15.5, "y": 0},
+ {"matrix": [6, 13], "x": 16.5, "y": 0},
+ {"matrix": [6, 12], "x": 17.5, "y": 0},
+
+ {"matrix": [6, 6], "x": 22, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+ {"matrix": [1, 7], "x": 7, "y": 2},
+ {"matrix": [1, 8], "x": 8, "y": 2},
+ {"matrix": [1, 9], "x": 9, "y": 2},
+ {"matrix": [1, 10], "x": 10, "y": 2},
+ {"matrix": [1, 11], "x": 11, "y": 2},
+ {"matrix": [1, 12], "x": 12, "y": 2},
+ {"matrix": [1, 13], "x": 13, "y": 2, "w": 2},
+
+ {"matrix": [7, 12], "x": 15.5, "y": 2},
+ {"matrix": [6, 0], "x": 16.5, "y": 2},
+ {"matrix": [6, 1], "x": 17.5, "y": 2},
+
+ {"matrix": [6, 2], "x": 19, "y": 2},
+ {"matrix": [6, 3], "x": 20, "y": 2},
+ {"matrix": [6, 5], "x": 21, "y": 2},
+ {"matrix": [6, 7], "x": 22, "y": 2},
+
+ {"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": [2, 7], "x": 7.5, "y": 3},
+ {"matrix": [2, 8], "x": 8.5, "y": 3},
+ {"matrix": [2, 9], "x": 9.5, "y": 3},
+ {"matrix": [2, 10], "x": 10.5, "y": 3},
+ {"matrix": [2, 11], "x": 11.5, "y": 3},
+ {"matrix": [2, 12], "x": 12.5, "y": 3},
+ {"matrix": [2, 13], "x": 13.5, "y": 3, "w": 1.5},
+
+ {"matrix": [7, 0], "x": 15.5, "y": 3},
+ {"matrix": [7, 1], "x": 16.5, "y": 3},
+ {"matrix": [7, 2], "x": 17.5, "y": 3},
+
+ {"matrix": [7, 3], "x": 19, "y": 3},
+ {"matrix": [6, 4], "x": 20, "y": 3},
+ {"matrix": [7, 5], "x": 21, "y": 3},
+ {"matrix": [7, 7], "x": 22, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 4},
+ {"matrix": [3, 2], "x": 2.75, "y": 4},
+ {"matrix": [3, 3], "x": 3.75, "y": 4},
+ {"matrix": [3, 4], "x": 4.75, "y": 4},
+ {"matrix": [3, 5], "x": 5.75, "y": 4},
+ {"matrix": [3, 6], "x": 6.75, "y": 4},
+ {"matrix": [3, 7], "x": 7.75, "y": 4},
+ {"matrix": [3, 8], "x": 8.75, "y": 4},
+ {"matrix": [3, 9], "x": 9.75, "y": 4},
+ {"matrix": [3, 10], "x": 10.75, "y": 4},
+ {"matrix": [3, 12], "x": 11.75, "y": 4},
+ {"matrix": [3, 13], "x": 12.75, "y": 4, "w": 2.25},
+
+ {"matrix": [6, 11], "x": 19, "y": 4},
+ {"matrix": [7, 4], "x": 20, "y": 4},
+ {"matrix": [7, 6], "x": 21, "y": 4},
+ {"matrix": [6, 8], "x": 22, "y": 4},
+
+ {"matrix": [4, 0], "x": 0, "y": 5, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 5},
+ {"matrix": [4, 2], "x": 3.25, "y": 5},
+ {"matrix": [4, 3], "x": 4.25, "y": 5},
+ {"matrix": [4, 4], "x": 5.25, "y": 5},
+ {"matrix": [4, 5], "x": 6.25, "y": 5},
+ {"matrix": [4, 6], "x": 7.25, "y": 5},
+ {"matrix": [4, 7], "x": 8.25, "y": 5},
+ {"matrix": [4, 8], "x": 9.25, "y": 5},
+ {"matrix": [4, 9], "x": 10.25, "y": 5},
+ {"matrix": [4, 10], "x": 11.25, "y": 5},
+ {"matrix": [4, 13], "x": 12.25, "y": 5, "w": 2.75},
+
+ {"matrix": [5, 8], "x": 16.5, "y": 5},
+
+ {"matrix": [7, 11], "x": 19, "y": 5},
+ {"matrix": [6, 10], "x": 20, "y": 5},
+ {"matrix": [6, 9], "x": 21, "y": 5},
+ {"matrix": [5, 0], "x": 22, "y": 5, "h": 2},
+
+ {"matrix": [5, 1], "x": 0, "y": 6, "w": 1.5},
+ {"matrix": [5, 2], "x": 1.5, "y": 6, "w": 1.25},
+ {"matrix": [5, 5], "x": 2.75, "y": 6, "w": 1.5},
+ {"matrix": [5, 10], "x": 4.25, "y": 6, "w": 6.5},
+ {"matrix": [5, 11], "x": 10.75, "y": 6, "w": 1.5},
+ {"matrix": [5, 13], "x": 12.25, "y": 6, "w": 1.25},
+ {"matrix": [5, 7], "x": 13.5, "y": 6, "w": 1.5},
+
+ {"matrix": [5, 9], "x": 15.5, "y": 6},
+ {"matrix": [5, 6], "x": 16.5, "y": 6},
+ {"matrix": [7, 10], "x": 17.5, "y": 6},
+
+ {"matrix": [7, 9], "x": 19, "y": 6, "w": 2},
+ {"matrix": [7, 8], "x": 21, "y": 6}
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 06:12:12 +0000