Merge branch 'develop'

4 files changed, 25 insertions, 98 deletions

diff --git a/keyboards/handwired/bstk100/bstk100.c b/keyboards/handwired/bstk100/bstk100.c
deleted file mode 100644
index 004b97004b..0000000000
--- a/keyboards/handwired/bstk100/bstk100.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2021 FREE WING,Y.Sakamoto
- * http://www.neko.ne.jp/~freewing/
- *
- * 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 "bstk100.h"
diff --git a/keyboards/handwired/bstk100/bstk100.h b/keyboards/handwired/bstk100/bstk100.h
deleted file mode 100644
index 42a6da437f..0000000000
--- a/keyboards/handwired/bstk100/bstk100.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 FREE WING,Y.Sakamoto
- * http://www.neko.ne.jp/~freewing/
- *
- * 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, \
-    k34, k03, k02, k13, \
-    k10, k11, k12, k01, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k43 \
-) { \
-    { k00, k01, k02,   k03, KC_NO }, \
-    { k10, k11, k12,   k13, KC_NO }, \
-    { k20, k21, k22,   k23, KC_NO }, \
-    { k30, k31, k32,   k33, k34   }, \
-    { k40, k41, KC_NO, k43, KC_NO }  \
-}
diff --git a/keyboards/handwired/bstk100/config.h b/keyboards/handwired/bstk100/config.h
index 2a14eca16a..2a30bd3363 100644
--- a/keyboards/handwired/bstk100/config.h
+++ b/keyboards/handwired/bstk100/config.h
@@ -18,23 +18,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 { B6, B2, B3, B1, F7 }
-#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
-
-/* 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/handwired/bstk100/info.json b/keyboards/handwired/bstk100/info.json
index 03580c3332..257203511a 100644
--- a/keyboards/handwired/bstk100/info.json
+++ b/keyboards/handwired/bstk100/info.json
@@ -8,6 +8,11 @@
         "pid": "0xB100",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B5", "B4", "E6", "D7", "C6"],
+        "rows": ["B6", "B2", "B3", "B1", "F7"]
+    },
+    "diode_direction": "COL2ROW",
     "indicators": {
         "caps_lock": "D5",
         "num_lock": "D4",
@@ -19,31 +24,31 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label": "k00", "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"label": "k34", "x": 0, "y": 1},
-                {"label": "k03", "x": 1, "y": 1},
-                {"label": "k02", "x": 2, "y": 1},
-                {"label": "k13", "x": 3, "y": 1},
+                {"matrix": [3, 4], "x": 0, "y": 1},
+                {"matrix": [0, 3], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label": "k10", "x": 0, "y": 2},
-                {"label": "k11", "x": 1, "y": 2},
-                {"label": "k12", "x": 2, "y": 2},
-                {"label": "k01", "x": 3, "y": 2},
+                {"matrix": [1, 0], "x": 0, "y": 2},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 2},
+                {"matrix": [0, 1], "x": 3, "y": 2},
 
-                {"label": "k20", "x": 0, "y": 3},
-                {"label": "k21", "x": 1, "y": 3},
-                {"label": "k22", "x": 2, "y": 3},
-                {"label": "k23", "x": 3, "y": 3},
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3},
+                {"matrix": [2, 3], "x": 3, "y": 3},
 
-                {"label": "k30", "x": 0, "y": 4},
-                {"label": "k31", "x": 1, "y": 4},
-                {"label": "k32", "x": 2, "y": 4},
-                {"label": "k33", "x": 3, "y": 4, "h": 2},
+                {"matrix": [3, 0], "x": 0, "y": 4},
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 4},
+                {"matrix": [3, 3], "x": 3, "y": 4, "h": 2},
 
-                {"label": "k40", "x": 0, "y": 5},
-                {"label": "k41", "x": 1, "y": 5},
-                {"label": "k43", "x": 2, "y": 5}
+                {"matrix": [4, 0], "x": 0, "y": 5},
+                {"matrix": [4, 1], "x": 1, "y": 5},
+                {"matrix": [4, 3], "x": 2, "y": 5}
             ]
         }
     }