14 files changed, 27 insertions, 160 deletions
diff --git a/keyboards/biacco42/ergo42/ergo42.c b/keyboards/biacco42/ergo42/ergo42.c
index bd7a7ffe19..1407d91689 100644
--- a/keyboards/biacco42/ergo42/ergo42.c
+++ b/keyboards/biacco42/ergo42/ergo42.c
@@ -1,4 +1,4 @@
-#include "ergo42.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/biacco42/ergo42/ergo42.h b/keyboards/biacco42/ergo42/ergo42.h
deleted file mode 100644
index 265e605e6c..0000000000
--- a/keyboards/biacco42/ergo42/ergo42.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_biacco42_ergo42_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h
index 2ce8ad24dc..8f990eb8ed 100644
--- a/keyboards/biacco42/ergo42/rev1/config.h
+++ b/keyboards/biacco42/ergo42/rev1/config.h
@@ -19,22 +19,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* 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 */
 #define LOCKING_RESYNC_ENABLE
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
 #define RGBLED_NUM 12    // Number of LEDs
 
 /*
diff --git a/keyboards/biacco42/ergo42/rev1/info.json b/keyboards/biacco42/ergo42/rev1/info.json
index a519cb23d6..e6f81d54af 100644
--- a/keyboards/biacco42/ergo42/rev1/info.json
+++ b/keyboards/biacco42/ergo42/rev1/info.json
@@ -8,6 +8,14 @@
     "pid": "0x0042",
     "device_version": "1.0.0"
   },
+  "ws2812": {
+    "pin": "D3"
+  },
+  "matrix_pins": {
+    "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+    "rows": ["D7", "E6", "B4", "B5"]
+  },
+  "diode_direction": "COL2ROW",
   "split": {
         "soft_serial_pin": "D0"
     },
diff --git a/keyboards/biacco42/ergo42/rev1/rev1.c b/keyboards/biacco42/ergo42/rev1/rev1.c
deleted file mode 100644
index 626a0893bb..0000000000
--- a/keyboards/biacco42/ergo42/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ergo42.h"
diff --git a/keyboards/biacco42/ergo42/rev1/rev1.h b/keyboards/biacco42/ergo42/rev1/rev1.h
index 9a5aec4d26..5d92ba6752 100644
--- a/keyboards/biacco42/ergo42/rev1/rev1.h
+++ b/keyboards/biacco42/ergo42/rev1/rev1.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "ergo42.h"
-
 #include "quantum.h"
 
 #ifndef FLIP_HALF
diff --git a/keyboards/biacco42/meishi/config.h b/keyboards/biacco42/meishi/config.h
index d01a9f389a..df5455b3c2 100644
--- a/keyboards/biacco42/meishi/config.h
+++ b/keyboards/biacco42/meishi/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 { B5 }
-#define MATRIX_COL_PINS { 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/biacco42/meishi/info.json b/keyboards/biacco42/meishi/info.json
index 629bbd139e..96e67d5078 100644
--- a/keyboards/biacco42/meishi/info.json
+++ b/keyboards/biacco42/meishi/info.json
@@ -8,15 +8,20 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B1", "B3", "B2", "B6"],
+        "rows": ["B5"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "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}
             ]
         }
     }
diff --git a/keyboards/biacco42/meishi/meishi.c b/keyboards/biacco42/meishi/meishi.c
deleted file mode 100644
index 85ede859d3..0000000000
--- a/keyboards/biacco42/meishi/meishi.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Biacco42
- *
- * 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 "meishi.h"
diff --git a/keyboards/biacco42/meishi/meishi.h b/keyboards/biacco42/meishi/meishi.h
deleted file mode 100644
index 61b9f628db..0000000000
--- a/keyboards/biacco42/meishi/meishi.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2019 Biacco42
- *
- * 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( \
-    k00, k01, k02, k03\
-) \
-{ \
-    { k00, k01, k02, k03 }\
-}
-
diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h
index c7614c0dbd..df5455b3c2 100644
--- a/keyboards/biacco42/meishi2/config.h
+++ b/keyboards/biacco42/meishi2/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 { D7, E6 }
-#define MATRIX_COL_PINS { F5, F6 }
-
-/* 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/biacco42/meishi2/info.json b/keyboards/biacco42/meishi2/info.json
index ebdfc39028..fb88356968 100644
--- a/keyboards/biacco42/meishi2/info.json
+++ b/keyboards/biacco42/meishi2/info.json
@@ -8,15 +8,20 @@
     "pid": "0x0003",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["F5", "F6"],
+    "rows": ["D7", "E6"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "atmega32u4",
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [1, 0], "x": 2, "y": 0},
+        {"matrix": [1, 1], "x": 3, "y": 0}
       ]
     }
   }
diff --git a/keyboards/biacco42/meishi2/meishi2.c b/keyboards/biacco42/meishi2/meishi2.c
deleted file mode 100644
index 14525ae175..0000000000
--- a/keyboards/biacco42/meishi2/meishi2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Biacco42
- *
- * 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 "meishi2.h"
diff --git a/keyboards/biacco42/meishi2/meishi2.h b/keyboards/biacco42/meishi2/meishi2.h
deleted file mode 100644
index 776e0b0e1d..0000000000
--- a/keyboards/biacco42/meishi2/meishi2.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019 Biacco42
- *
- * 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 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 \
-) \
-{ \
-    { k00, k01 }, \
-    { k02, k03 } \
-}