summaryrefslogtreecommitdiff
path: root/keyboards/keebzdotnet
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keebzdotnet')
-rw-r--r--keyboards/keebzdotnet/fme/config.h8
-rw-r--r--keyboards/keebzdotnet/fme/fme.c17
-rw-r--r--keyboards/keebzdotnet/fme/fme.h32
-rw-r--r--keyboards/keebzdotnet/fme/info.json32
-rw-r--r--keyboards/keebzdotnet/wazowski/config.h17
-rw-r--r--keyboards/keebzdotnet/wazowski/info.json39
-rw-r--r--keyboards/keebzdotnet/wazowski/wazowski.c17
-rw-r--r--keyboards/keebzdotnet/wazowski/wazowski.h38
8 files changed, 44 insertions, 156 deletions
diff --git a/keyboards/keebzdotnet/fme/config.h b/keyboards/keebzdotnet/fme/config.h
index 03fa828fa5..bdd65f7f63 100644
--- a/keyboards/keebzdotnet/fme/config.h
+++ b/keyboards/keebzdotnet/fme/config.h
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B6, B5, B7, D2 }
-#define MATRIX_COL_PINS { B0, B4, B1, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/keebzdotnet/fme/fme.c b/keyboards/keebzdotnet/fme/fme.c
deleted file mode 100644
index e4b37fa4a9..0000000000
--- a/keyboards/keebzdotnet/fme/fme.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 keebnewb
- *
- * 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 "fme.h"
diff --git a/keyboards/keebzdotnet/fme/fme.h b/keyboards/keebzdotnet/fme/fme.h
deleted file mode 100644
index ff8da5d409..0000000000
--- a/keyboards/keebzdotnet/fme/fme.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 keebnewb
-
-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"
-
-#define ___ KC_NO
-
-#define LAYOUT_all( \
- k00, k13, k14, k12, k10, \
- k11, k04, k02, k03, \
- k22, k32, k21, k01 \
-){ \
- { k00, k01, k02, k03, k04 }, \
- { k10, k11, k12, k13, k14 }, \
- { ___, k21, k22, ___, ___ }, \
- { ___, ___, k32, ___, ___ } \
-}
diff --git a/keyboards/keebzdotnet/fme/info.json b/keyboards/keebzdotnet/fme/info.json
index 51691bbce4..72466f53d1 100644
--- a/keyboards/keebzdotnet/fme/info.json
+++ b/keyboards/keebzdotnet/fme/info.json
@@ -8,6 +8,11 @@
"pid": "0x8008",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B0", "B4", "B1", "B3", "B2"],
+ "rows": ["B6", "B5", "B7", "D2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
@@ -16,21 +21,22 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"k00", "x":0, "y":0},
- {"label":"k13", "x":1, "y":0},
- {"label":"k14", "x":2, "y":0},
- {"label":"k12", "x":3, "y":0},
- {"label":"k10", "x":4, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 3], "x": 1, "y": 0},
+ {"matrix": [1, 4], "x": 2, "y": 0},
+ {"matrix": [1, 2], "x": 3, "y": 0},
+ {"matrix": [1, 0], "x": 4, "y": 0},
+
+ {"matrix": [1, 1], "x": 0.25, "y": 1},
+ {"matrix": [0, 4], "x": 1.25, "y": 1},
+ {"matrix": [0, 2], "x": 2.25, "y": 1},
+ {"matrix": [0, 3], "x": 3.25, "y": 1, "w": 1.75},
- {"label":"k11", "x":0.25, "y":1},
- {"label":"k04", "x":1.25, "y":1},
- {"label":"k02", "x":2.25, "y":1},
- {"label":"k03", "x":3.25, "y":1, "w":1.75},
+ {"matrix": [2, 2], "x": 0.25, "y": 2, "w": 2.75},
+ {"matrix": [3, 2], "x": 3, "y": 3},
- {"label":"k22", "x":0.25, "y":2, "w":2.75},
- {"label":"k32", "x":3, "y":3},
- {"label":"k21", "x":3, "y":2, "w":2},
- {"label":"k01", "x":4, "y":3}
+ {"matrix": [2, 1], "x": 3, "y": 2, "w": 2},
+ {"matrix": [0, 1], "x": 4, "y": 3}
]
}
}
diff --git a/keyboards/keebzdotnet/wazowski/config.h b/keyboards/keebzdotnet/wazowski/config.h
index be85b72768..a1746ba0a6 100644
--- a/keyboards/keebzdotnet/wazowski/config.h
+++ b/keyboards/keebzdotnet/wazowski/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 { F4, F5, F6 }
-#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 }
-
-/* 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/keebzdotnet/wazowski/info.json b/keyboards/keebzdotnet/wazowski/info.json
index c5884b6402..c993b41ac9 100644
--- a/keyboards/keebzdotnet/wazowski/info.json
+++ b/keyboards/keebzdotnet/wazowski/info.json
@@ -8,25 +8,36 @@
"pid": "0x53FC",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F7", "B1", "B3", "B2", "B6"],
+ "rows": ["F4", "F5", "F6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"k01", "x":1, "y":1},
- {"label":"k04", "x":3, "y":2},
- {"label":"k06", "x":4, "y":2},
- {"label":"k08", "x":5, "y":2},
- {"label":"k12", "x":7, "y":3},
- {"label":"k00", "x":0, "y":3},
- {"label":"k03", "x":2, "y":3},
- {"label":"k07", "x":4, "y":3},
- {"label":"k09", "x":5, "y":3},
- {"label":"k10", "x":6, "y":2},
- {"label":"k02", "x":1, "y":4},
- {"label":"k05", "x":3, "y":4},
- {"label":"k11", "x":7, "y":1},
- {"label":"k13", "x":8, "y":2}
+ {"matrix": [0, 0], "x": 1, "y": 0},
+
+ {"matrix": [0, 1], "x": 3, "y": 1},
+ {"matrix": [0, 2], "x": 4, "y": 1},
+ {"matrix": [0, 3], "x": 5, "y": 1},
+
+ {"matrix": [0, 4], "x": 7, "y": 2},
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 2, "y": 2},
+ {"matrix": [1, 2], "x": 4, "y": 2},
+ {"matrix": [1, 3], "x": 5, "y": 2},
+
+ {"matrix": [1, 4], "x": 6, "y": 1},
+
+ {"matrix": [2, 0], "x": 1, "y": 3},
+ {"matrix": [2, 1], "x": 3, "y": 3},
+
+ {"matrix": [2, 3], "x": 7, "y": 0},
+
+ {"matrix": [2, 4], "x": 8, "y": 1}
]
}
}
diff --git a/keyboards/keebzdotnet/wazowski/wazowski.c b/keyboards/keebzdotnet/wazowski/wazowski.c
deleted file mode 100644
index d4d6119ae5..0000000000
--- a/keyboards/keebzdotnet/wazowski/wazowski.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 keebzdotnet
- *
- * 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 "wazowski.h"
diff --git a/keyboards/keebzdotnet/wazowski/wazowski.h b/keyboards/keebzdotnet/wazowski/wazowski.h
deleted file mode 100644
index 98af75a0e8..0000000000
--- a/keyboards/keebzdotnet/wazowski/wazowski.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 keebzdotnet
- *
- * 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( \
- k00, k01, k02, k03, k04, \
- k05, k06, k07, k08, k09, \
- k10, k11, k12, k13 \
-) \
-{ \
- { k00, k01, k02, k03, k04 }, \
- { k05, k06, k07, k08, k09 }, \
- { k10, k11, KC_NO, k12, k13 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 11:02:30 +0000