summaryrefslogtreecommitdiff
path: root/keyboards/kb58
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kb58')
-rw-r--r--keyboards/kb58/config.h19
-rw-r--r--keyboards/kb58/info.json129
-rw-r--r--keyboards/kb58/kb58.c17
-rw-r--r--keyboards/kb58/kb58.h46
4 files changed, 70 insertions, 141 deletions
diff --git a/keyboards/kb58/config.h b/keyboards/kb58/config.h
index 44a674620d..da9f91c5f5 100644
--- a/keyboards/kb58/config.h
+++ b/keyboards/kb58/config.h
@@ -17,25 +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 { F4, B6, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, D7, D4, D0 }
-#define MATRIX_ROW_PINS_RIGHT { F7, B5, B3, B2, B6 }
-#define MATRIX_COL_PINS_RIGHT { F6, B1, E6, D7, C6, D4, D0 }
-
-/* 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/kb58/info.json b/keyboards/kb58/info.json
index 6ba7d24197..b1b1cc9855 100644
--- a/keyboards/kb58/info.json
+++ b/keyboards/kb58/info.json
@@ -8,76 +8,87 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "D7", "D4", "D0"],
+ "rows": ["F4", "B6", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
- "soft_serial_pin": "D2"
+ "soft_serial_pin": "D2",
+ "matrix_pins": {
+ "right": {
+ "cols": ["F6", "B1", "E6", "D7", "C6", "D4", "D0"],
+ "rows": ["F7", "B5", "B3", "B2", "B6"]
+ }
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"-", "x":11, "y":0},
- {"label":"=", "x":12, "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": [5, 0], "x": 6, "y": 0},
+ {"matrix": [5, 1], "x": 7, "y": 0},
+ {"matrix": [5, 2], "x": 8, "y": 0},
+ {"matrix": [5, 3], "x": 9, "y": 0},
+ {"matrix": [5, 4], "x": 10, "y": 0},
+ {"matrix": [5, 5], "x": 11, "y": 0},
+ {"matrix": [5, 6], "x": 12, "y": 0},
- {"label":"Tab", "x":0, "y":1},
- {"label":"Q", "x":1, "y":1},
- {"label":"W", "x":2, "y":1},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1},
- {"label":"T", "x":5, "y":1},
- {"label":"Y", "x":6, "y":1},
- {"label":"U", "x":7, "y":1},
- {"label":"I", "x":8, "y":1},
- {"label":"O", "x":9, "y":1},
- {"label":"P", "x":10, "y":1},
- {"label":"[", "x":11, "y":1},
- {"label":"]", "x":12, "y":1},
+ {"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": [6, 0], "x": 6, "y": 1},
+ {"matrix": [6, 1], "x": 7, "y": 1},
+ {"matrix": [6, 2], "x": 8, "y": 1},
+ {"matrix": [6, 3], "x": 9, "y": 1},
+ {"matrix": [6, 4], "x": 10, "y": 1},
+ {"matrix": [6, 5], "x": 11, "y": 1},
+ {"matrix": [6, 6], "x": 12, "y": 1},
- {"label":"Control", "x":0, "y":2},
- {"label":"A", "x":1, "y":2},
- {"label":"S", "x":2, "y":2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2},
- {"label":"G", "x":5, "y":2},
- {"label":"H", "x":6, "y":2},
- {"label":"J", "x":7, "y":2},
- {"label":"K", "x":8, "y":2},
- {"label":"L", "x":9, "y":2},
- {"label":";", "x":10, "y":2},
- {"label":"'", "x":11, "y":2},
- {"label":"Enter", "x":12, "y":2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [7, 0], "x": 6, "y": 2},
+ {"matrix": [7, 1], "x": 7, "y": 2},
+ {"matrix": [7, 2], "x": 8, "y": 2},
+ {"matrix": [7, 3], "x": 9, "y": 2},
+ {"matrix": [7, 4], "x": 10, "y": 2},
+ {"matrix": [7, 5], "x": 11, "y": 2},
+ {"matrix": [7, 6], "x": 12, "y": 2},
- {"label":"Shift", "x":0, "y":3},
- {"label":"Z", "x":1, "y":3},
- {"label":"X", "x":2, "y":3},
- {"label":"C", "x":3, "y":3},
- {"label":"Y", "x":4, "y":3},
- {"label":"B", "x":5, "y":3},
- {"label":"N", "x":6, "y":3},
- {"label":"M", "x":7, "y":3},
- {"label":",", "x":8, "y":3},
- {"label":".", "x":9, "y":3},
- {"label":"/", "x":10, "y":3},
- {"label":"\\", "x":11, "y":3},
- {"label":"Shift", "x":12, "y":3},
+ {"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": [8, 0], "x": 6, "y": 3},
+ {"matrix": [8, 1], "x": 7, "y": 3},
+ {"matrix": [8, 2], "x": 8, "y": 3},
+ {"matrix": [8, 3], "x": 9, "y": 3},
+ {"matrix": [8, 4], "x": 10, "y": 3},
+ {"matrix": [8, 5], "x": 11, "y": 3},
+ {"matrix": [8, 6], "x": 12, "y": 3},
- {"label":"Alt", "x":3, "y":4},
- {"label":"GUI", "x":4, "y":4},
- {"x":5, "y":4},
- {"x":6, "y":4},
- {"label":"Fn", "x":7, "y":4},
- {"label":"Delete", "x":8, "y":4}
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [9, 0], "x": 6, "y": 4},
+ {"matrix": [9, 1], "x": 7, "y": 4},
+ {"matrix": [9, 2], "x": 8, "y": 4}
]
}
}
diff --git a/keyboards/kb58/kb58.c b/keyboards/kb58/kb58.c
deleted file mode 100644
index 5d189fa321..0000000000
--- a/keyboards/kb58/kb58.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 beanaccle
- *
- * 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 "kb58.h"
diff --git a/keyboards/kb58/kb58.h b/keyboards/kb58/kb58.h
deleted file mode 100644
index d936215ae8..0000000000
--- a/keyboards/kb58/kb58.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2021 beanaccle
- *
- * 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( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, \
- L06, L07, L08, L09, L10, L11, R07, R08, R09, R10, R11, R12, R13, \
- L12, L13, L14, L15, L16, L17, R14, R15, R16, R17, R18, R19, R20, \
- L18, L19, L20, L21, L22, L23, R21, R22, R23, R24, R25, R26, R27, \
- L24, L25, L26, R28, R29, R30 \
-) { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L06, L07, L08, L09, L10, L11 }, \
- { L12, L13, L14, L15, L16, L17 }, \
- { L18, L19, L20, L21, L22, L23 }, \
- { KC_NO, KC_NO, KC_NO, L24, L25, L26 }, \
- { R00, R01, R02, R03, R04, R05, R06 }, \
- { R07, R08, R09, R10, R11, R12, R13 }, \
- { R14, R15, R16, R17, R18, R19, R20 }, \
- { R21, R22, R23, R24, R25, R26, R27 }, \
- { R28, R29, R30, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-13 17:57:34 +0000