summaryrefslogtreecommitdiff
path: root/keyboards/rominronin/katana60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rominronin/katana60')
-rw-r--r--keyboards/rominronin/katana60/rev1/config.h17
-rw-r--r--keyboards/rominronin/katana60/rev1/info.json149
-rw-r--r--keyboards/rominronin/katana60/rev1/rev1.c16
-rw-r--r--keyboards/rominronin/katana60/rev1/rev1.h37
-rw-r--r--keyboards/rominronin/katana60/rev2/config.h17
-rw-r--r--keyboards/rominronin/katana60/rev2/info.json5
-rw-r--r--keyboards/rominronin/katana60/rev2/rev2.c16
7 files changed, 84 insertions, 173 deletions
diff --git a/keyboards/rominronin/katana60/rev1/config.h b/keyboards/rominronin/katana60/rev1/config.h
index fb00ad9279..6c1b144b58 100644
--- a/keyboards/rominronin/katana60/rev1/config.h
+++ b/keyboards/rominronin/katana60/rev1/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 { F5, F6, F4, F1, D0 }
-#define MATRIX_COL_PINS { B7, B3, B2, B1, B0, C7, D1, D2, C6, B6, B5, B4, D4, D6, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
/* 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/rominronin/katana60/rev1/info.json b/keyboards/rominronin/katana60/rev1/info.json
index 8421147017..f3e827cf85 100644
--- a/keyboards/rominronin/katana60/rev1/info.json
+++ b/keyboards/rominronin/katana60/rev1/info.json
@@ -8,81 +8,90 @@
"pid": "0x0C2C",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B7", "B3", "B2", "B1", "B0", "C7", "D1", "D2", "C6", "B6", "B5", "B4", "D4", "D6", "D7"],
+ "rows": ["F5", "F6", "F4", "F1", "D0"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"k40", "x":0, "y":0},
- {"label":"k41", "x":1, "y":0},
- {"label":"k42", "x":2, "y":0},
- {"label":"k43", "x":3, "y":0},
- {"label":"k44", "x":4, "y":0},
- {"label":"k45", "x":5, "y":0},
- {"label":"k46", "x":6, "y":0},
- {"label":"k47", "x":7, "y":0},
- {"label":"k48", "x":8, "y":0},
- {"label":"k49", "x":9, "y":0},
- {"label":"k4a", "x":10, "y":0},
- {"label":"k4b", "x":11, "y":0},
- {"label":"k4c", "x":12, "y":0},
- {"label":"k4d", "x":13, "y":0},
- {"label":"k4e", "x":14, "y":0},
- {"label":"k30", "x":0, "y":1, "w":1.5},
- {"label":"k31", "x":1.5, "y":1},
- {"label":"k32", "x":2.5, "y":1},
- {"label":"k33", "x":3.5, "y":1},
- {"label":"k34", "x":4.5, "y":1},
- {"label":"k35", "x":5.5, "y":1},
- {"label":"k36", "x":6.5, "y":1},
- {"label":"k37", "x":7.5, "y":1},
- {"label":"k38", "x":8.5, "y":1},
- {"label":"k39", "x":9.5, "y":1},
- {"label":"k3a", "x":10.5, "y":1},
- {"label":"k3b", "x":11.5, "y":1},
- {"label":"k3c", "x":12.5, "y":1},
- {"label":"k3d", "x":13.5, "y":1, "w":1.5},
- {"label":"k20", "x":0, "y":2, "w":1.25},
- {"label":"k21", "x":1.25, "y":2},
- {"label":"k22", "x":2.25, "y":2},
- {"label":"k23", "x":3.25, "y":2},
- {"label":"k24", "x":4.25, "y":2},
- {"label":"k25", "x":5.25, "y":2},
- {"label":"k26", "x":6.25, "y":2},
- {"label":"k27", "x":7.75, "y":2},
- {"label":"k28", "x":8.75, "y":2},
- {"label":"k29", "x":9.75, "y":2},
- {"label":"k2a", "x":10.75, "y":2},
- {"label":"k2b", "x":11.75, "y":2},
- {"label":"k2c", "x":12.75, "y":2},
- {"label":"k2d", "x":13.75, "y":2, "w":1.25},
- {"label":"k10", "x":0, "y":3},
- {"label":"k11", "x":1, "y":3},
- {"label":"k12", "x":2, "y":3},
- {"label":"k13", "x":3, "y":3},
- {"label":"k14", "x":4, "y":3},
- {"label":"k15", "x":5, "y":3},
- {"label":"k16", "x":6, "y":3},
- {"label":"k17", "x":7, "y":3},
- {"label":"k18", "x":8, "y":3},
- {"label":"k19", "x":9, "y":3},
- {"label":"k1a", "x":10, "y":3},
- {"label":"k1b", "x":11, "y":3},
- {"label":"k1c", "x":12, "y":3},
- {"label":"k1d", "x":13, "y":3},
- {"label":"k1e", "x":14, "y":3},
- {"label":"k00", "x":0, "y":4},
- {"label":"k01", "x":1, "y":4, "w":1.25},
- {"label":"k02", "x":2.25, "y":4, "w":1.25},
- {"label":"k03", "x":3.5, "y":4, "w":1.25},
- {"label":"k04", "x":4.75, "y":4, "w":2.25},
- {"label":"k05", "x":7, "y":4},
- {"label":"k06", "x":8, "y":4, "w":2},
- {"label":"k09", "x":10, "y":4},
- {"label":"k0a", "x":11, "y":4},
- {"label":"k0b", "x":12, "y":4},
- {"label":"k0c", "x":13, "y":4},
- {"label":"k0d", "x":14, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 0},
+ {"matrix": [4, 1], "x": 1, "y": 0},
+ {"matrix": [4, 2], "x": 2, "y": 0},
+ {"matrix": [4, 3], "x": 3, "y": 0},
+ {"matrix": [4, 4], "x": 4, "y": 0},
+ {"matrix": [4, 5], "x": 5, "y": 0},
+ {"matrix": [4, 6], "x": 6, "y": 0},
+ {"matrix": [4, 7], "x": 7, "y": 0},
+ {"matrix": [4, 8], "x": 8, "y": 0},
+ {"matrix": [4, 9], "x": 9, "y": 0},
+ {"matrix": [4, 10], "x": 10, "y": 0},
+ {"matrix": [4, 11], "x": 11, "y": 0},
+ {"matrix": [4, 12], "x": 12, "y": 0},
+ {"matrix": [4, 13], "x": 13, "y": 0},
+ {"matrix": [4, 14], "x": 14, "y": 0},
+
+ {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 1},
+ {"matrix": [3, 2], "x": 2.5, "y": 1},
+ {"matrix": [3, 3], "x": 3.5, "y": 1},
+ {"matrix": [3, 4], "x": 4.5, "y": 1},
+ {"matrix": [3, 5], "x": 5.5, "y": 1},
+ {"matrix": [3, 6], "x": 6.5, "y": 1},
+ {"matrix": [3, 7], "x": 7.5, "y": 1},
+ {"matrix": [3, 8], "x": 8.5, "y": 1},
+ {"matrix": [3, 9], "x": 9.5, "y": 1},
+ {"matrix": [3, 10], "x": 10.5, "y": 1},
+ {"matrix": [3, 11], "x": 11.5, "y": 1},
+ {"matrix": [3, 12], "x": 12.5, "y": 1},
+ {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "y": 2},
+ {"matrix": [2, 3], "x": 3.25, "y": 2},
+ {"matrix": [2, 4], "x": 4.25, "y": 2},
+ {"matrix": [2, 5], "x": 5.25, "y": 2},
+ {"matrix": [2, 6], "x": 6.25, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [1, 0], "x": 0, "y": 3},
+ {"matrix": [1, 1], "x": 1, "y": 3},
+ {"matrix": [1, 2], "x": 2, "y": 3},
+ {"matrix": [1, 3], "x": 3, "y": 3},
+ {"matrix": [1, 4], "x": 4, "y": 3},
+ {"matrix": [1, 5], "x": 5, "y": 3},
+ {"matrix": [1, 6], "x": 6, "y": 3},
+ {"matrix": [1, 7], "x": 7, "y": 3},
+ {"matrix": [1, 8], "x": 8, "y": 3},
+ {"matrix": [1, 9], "x": 9, "y": 3},
+ {"matrix": [1, 10], "x": 10, "y": 3},
+ {"matrix": [1, 11], "x": 11, "y": 3},
+ {"matrix": [1, 12], "x": 12, "y": 3},
+ {"matrix": [1, 13], "x": 13, "y": 3},
+ {"matrix": [1, 14], "x": 14, "y": 3},
+
+ {"matrix": [0, 0], "x": 0, "y": 4},
+ {"matrix": [0, 1], "x": 1, "y": 4, "w": 1.25},
+ {"matrix": [0, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [0, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [0, 4], "x": 4.75, "y": 4, "w": 2.25},
+ {"matrix": [0, 5], "x": 7, "y": 4},
+ {"matrix": [0, 6], "x": 8, "y": 4, "w": 2},
+ {"matrix": [0, 9], "x": 10, "y": 4},
+ {"matrix": [0, 10], "x": 11, "y": 4},
+ {"matrix": [0, 11], "x": 12, "y": 4},
+ {"matrix": [0, 12], "x": 13, "y": 4},
+ {"matrix": [0, 13], "x": 14, "y": 4}
]
}
}
diff --git a/keyboards/rominronin/katana60/rev1/rev1.c b/keyboards/rominronin/katana60/rev1/rev1.c
deleted file mode 100644
index e57ae2bbcb..0000000000
--- a/keyboards/rominronin/katana60/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 Baris Tosun
- *
- * 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 "rev1.h"
diff --git a/keyboards/rominronin/katana60/rev1/rev1.h b/keyboards/rominronin/katana60/rev1/rev1.h
deleted file mode 100644
index 52926cc35e..0000000000
--- a/keyboards/rominronin/katana60/rev1/rev1.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2017 Baris Tosun
- *
- * 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 a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
- k00, k01, k02, k03, k04, k05, k06, k09, k0a, k0b, k0c, k0d \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, KC_NO, KC_NO, k09, k0a, k0b, k0c, k0d, KC_NO }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \
-}
diff --git a/keyboards/rominronin/katana60/rev2/config.h b/keyboards/rominronin/katana60/rev2/config.h
index c37f1d0544..0de481d0de 100644
--- a/keyboards/rominronin/katana60/rev2/config.h
+++ b/keyboards/rominronin/katana60/rev2/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 { B0, E6, D5, B4, B5 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, D6, D4, D3, D2, D1, 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/rominronin/katana60/rev2/info.json b/keyboards/rominronin/katana60/rev2/info.json
index a036d85384..2dcc257e62 100644
--- a/keyboards/rominronin/katana60/rev2/info.json
+++ b/keyboards/rominronin/katana60/rev2/info.json
@@ -8,6 +8,11 @@
"pid": "0xF03B",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "D6", "D4", "D3", "D2", "D1", "D0"],
+ "rows": ["B0", "E6", "D5", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/rominronin/katana60/rev2/rev2.c b/keyboards/rominronin/katana60/rev2/rev2.c
deleted file mode 100644
index 3336fd0dc7..0000000000
--- a/keyboards/rominronin/katana60/rev2/rev2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 rominronin
- *
- * 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 "rev2.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 11:05:36 +0000