7 files changed, 13 insertions, 54 deletions
diff --git a/keyboards/plywrks/ahgase/ahgase.c b/keyboards/plywrks/ahgase/ahgase.c
deleted file mode 100644
index 871101a97e..0000000000
--- a/keyboards/plywrks/ahgase/ahgase.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Ramon Imbao
- *
- * 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 "ahgase.h"
diff --git a/keyboards/plywrks/ahgase/config.h b/keyboards/plywrks/ahgase/config.h
index d11082a188..06b97ae4ab 100644
--- a/keyboards/plywrks/ahgase/config.h
+++ b/keyboards/plywrks/ahgase/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 { B2, B3, B7, D6, D3, D2 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D5, B0, B1, D1 }
-
-/* 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/plywrks/ahgase/info.json b/keyboards/plywrks/ahgase/info.json
index 02c5e0c8b2..3a9116340d 100644
--- a/keyboards/plywrks/ahgase/info.json
+++ b/keyboards/plywrks/ahgase/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7902",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D5", "B0", "B1", "D1"],
+        "rows": ["B2", "B3", "B7", "D6", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {
diff --git a/keyboards/plywrks/allaro/info.json b/keyboards/plywrks/allaro/info.json
index aa56aa1103..fa22b77959 100644
--- a/keyboards/plywrks/allaro/info.json
+++ b/keyboards/plywrks/allaro/info.json
@@ -63,7 +63,7 @@
                 { "matrix": [0, 13], "x": 15.75, "y": 0.1 },
                 { "matrix": [0, 14], "x": 16.75, "y": 0.1 },
 
-                { "matrix": [1, 0], "x": 0.2, "y": 1.0 },
+                { "matrix": [1, 0], "x": 0.2, "y": 1 },
                 { "matrix": [1, 1], "w": 1.5, "x": 1.35, "y": 1.1 },
                 { "matrix": [1, 2], "x": 2.85, "y": 1.1 },
                 { "matrix": [1, 3], "x": 3.85, "y": 1.1 },
@@ -79,7 +79,7 @@
                 { "matrix": [1, 13], "x": 15.45, "y": 1.1 },
                 { "matrix": [1, 14], "w": 1.5, "x": 16.45, "y": 1.1 },
 
-                { "matrix": [2, 0], "x": 0, "y": 2.0 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
                 { "matrix": [2, 1], "w": 1.75, "x": 1.15, "y": 2.1 },
                 { "matrix": [2, 2], "x": 2.9, "y": 2.1 },
                 { "matrix": [2, 3], "x": 3.9, "y": 2.1 },
diff --git a/keyboards/plywrks/lune/config.h b/keyboards/plywrks/lune/config.h
index 6e6827f0e8..e6bfca0aa4 100644
--- a/keyboards/plywrks/lune/config.h
+++ b/keyboards/plywrks/lune/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 { F1, F0, B7, B0, B6, B5, D7, B4, D6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, D4, D5, D3, D2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 8
diff --git a/keyboards/plywrks/lune/info.json b/keyboards/plywrks/lune/info.json
index 2061b282e4..6f3f8b8421 100644
--- a/keyboards/plywrks/lune/info.json
+++ b/keyboards/plywrks/lune/info.json
@@ -8,6 +8,11 @@
         "pid": "0x7901",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "D4", "D5", "D3", "D2"],
+        "rows": ["F1", "F0", "B7", "B0", "B6", "B5", "D7", "B4", "D6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
diff --git a/keyboards/plywrks/lune/lune.h b/keyboards/plywrks/lune/lune.h
index 444f855123..46fd71c775 100644
--- a/keyboards/plywrks/lune/lune.h
+++ b/keyboards/plywrks/lune/lune.h
@@ -42,6 +42,6 @@
     { k40, k41, k42, k43, k44, k45, k46, ___ }, \
     { k50, k51, k52, ___, k54, k55, k56, k57 }, \
     { ___, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k70, k71, k72, ___, k74, k75, k75, k77 }, \
+    { k70, k71, k72, ___, k74, k75, k76, k77 }, \
     { k80, k81, k82, k83, k84, k85, ___, k87 }, \
 }