4 files changed, 22 insertions, 115 deletions
diff --git a/keyboards/dinofizz/fnrow/v1/config.h b/keyboards/dinofizz/fnrow/v1/config.h
deleted file mode 100644
index 0763c887c8..0000000000
--- a/keyboards/dinofizz/fnrow/v1/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2021 Dino Fizzotti 
-
-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
-
-
-#define MATRIX_ROW_PINS { A0, A1 }
-#define MATRIX_COL_PINS {B0, B1, B3, B4, B5, B6, B7 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/dinofizz/fnrow/v1/info.json b/keyboards/dinofizz/fnrow/v1/info.json
index c031e4c163..9beff28ec8 100644
--- a/keyboards/dinofizz/fnrow/v1/info.json
+++ b/keyboards/dinofizz/fnrow/v1/info.json
@@ -8,76 +8,32 @@
     "pid": "0x0100",
     "device_version": "0.0.1"
   },
+  "matrix_pins": {
+    "cols": ["B0", "B1", "B3", "B4", "B5", "B6", "B7"],
+    "rows": ["A0", "A1"]
+  },
+  "diode_direction": "COL2ROW",
   "processor": "STM32F042",
   "bootloader": "stm32-dfu",
   "layouts": {
     "LAYOUT_fn_row": {
       "layout": [
-        {
-          "label": "SW1",
-          "x": 0,
-          "y": 0
-        },
-        {
-          "label": "SW3",
-          "x": 2,
-          "y": 0
-        },
-        {
-          "label": "SW5",
-          "x": 3,
-          "y": 0
-        },
-        {
-          "label": "SW7",
-          "x": 4,
-          "y": 0
-        },
-        {
-          "label": "SW9",
-          "x": 5,
-          "y": 0
-        },
-        {
-          "label": "SW11",
-          "x": 6.5,
-          "y": 0
-        },
-        {
-          "label": "SW13",
-          "x": 7.5,
-          "y": 0
-        },
-        {
-          "label": "SW2",
-          "x": 8.5,
-          "y": 0
-        },
-        {
-          "label": "SW4",
-          "x": 9.5,
-          "y": 0
-        },
-        {
-          "label": "SW6",
-          "x": 11,
-          "y": 0
-        },
-        {
-          "label": "SW8",
-          "x": 12,
-          "y": 0
-        },
-        {
-          "label": "SW10",
-          "x": 13,
-          "y": 0
-        },
-        {
-          "label": "SW12",
-          "x": 14,
-          "y": 0
-        }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [0, 2], "x": 3, "y": 0},
+        {"matrix": [0, 3], "x": 4, "y": 0},
+        {"matrix": [0, 4], "x": 5, "y": 0},
+
+        {"matrix": [0, 5], "x": 6.5, "y": 0},
+        {"matrix": [0, 6], "x": 7.5, "y": 0},
+        {"matrix": [1, 0], "x": 8.5, "y": 0},
+        {"matrix": [1, 1], "x": 9.5, "y": 0},
+
+        {"matrix": [1, 2], "x": 11, "y": 0},
+        {"matrix": [1, 3], "x": 12, "y": 0},
+        {"matrix": [1, 4], "x": 13, "y": 0},
+        {"matrix": [1, 5], "x": 14, "y": 0}
       ]
     }
   }
diff --git a/keyboards/dinofizz/fnrow/v1/v1.c b/keyboards/dinofizz/fnrow/v1/v1.c
index a5c5b21eac..d2a5cd7120 100644
--- a/keyboards/dinofizz/fnrow/v1/v1.c
+++ b/keyboards/dinofizz/fnrow/v1/v1.c
@@ -13,7 +13,7 @@
  * 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 "v1.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // Immediately set the LED pin as an output and set it ON
diff --git a/keyboards/dinofizz/fnrow/v1/v1.h b/keyboards/dinofizz/fnrow/v1/v1.h
deleted file mode 100644
index ce9209cad9..0000000000
--- a/keyboards/dinofizz/fnrow/v1/v1.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2021 Dino Fizzotti 
- *
- * 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 LAYOUT_fn_row( \
-    K000,       K001, K002, K003, K004,    K005, K006, K007, K008,    K009, K010, K011, K012 \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006, }, \
-    { K007,  K008,  K009,  K010,  K011,  K012,  KC_NO }, \
-}