Move single `LAYOUT`s to data driven (#20365)

2 files changed, 70 insertions, 98 deletions

diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/info.json
index da8c72203f..162faca32c 100644
--- a/keyboards/handwired/unk/rev1/info.json
+++ b/keyboards/handwired/unk/rev1/info.json
@@ -30,85 +30,85 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "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},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
 
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0, "w": 2},
+                {"matrix": [5, 1], "x": 9, "y": 0},
+                {"matrix": [5, 2], "x": 10, "y": 0},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 5], "x": 13, "y": 0},
+                {"matrix": [5, 6], "x": 14, "y": 0},
+                {"matrix": [5, 7], "x": 15, "y": 0, "w": 2},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1, "w": 1.5},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
 
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1},
-                {"x": 14.5, "y": 1},
-                {"x": 15.5, "y": 1, "w": 1.5},
+                {"matrix": [6, 0], "x": 8.5, "y": 1},
+                {"matrix": [6, 1], "x": 9.5, "y": 1},
+                {"matrix": [6, 2], "x": 10.5, "y": 1},
+                {"matrix": [6, 3], "x": 11.5, "y": 1},
+                {"matrix": [6, 4], "x": 12.5, "y": 1},
+                {"matrix": [6, 5], "x": 13.5, "y": 1},
+                {"matrix": [6, 6], "x": 14.5, "y": 1},
+                {"matrix": [6, 7], "x": 15.5, "y": 1, "w": 1.5},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2, "w": 1.75},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
 
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2},
-                {"x": 13.75, "y": 2},
-                {"x": 14.75, "y": 2, "w": 2.25},
+                {"matrix": [7, 1], "x": 8.75, "y": 2},
+                {"matrix": [7, 2], "x": 9.75, "y": 2},
+                {"matrix": [7, 3], "x": 10.75, "y": 2},
+                {"matrix": [7, 4], "x": 11.75, "y": 2},
+                {"matrix": [7, 5], "x": 12.75, "y": 2},
+                {"matrix": [7, 6], "x": 13.75, "y": 2},
+                {"matrix": [7, 7], "x": 14.75, "y": 2, "w": 2.25},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3, "w": 2.25},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
 
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3},
-                {"x": 13.25, "y": 3},
-                {"x": 14.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 1], "x": 9.25, "y": 3},
+                {"matrix": [8, 2], "x": 10.25, "y": 3},
+                {"matrix": [8, 3], "x": 11.25, "y": 3},
+                {"matrix": [8, 4], "x": 12.25, "y": 3},
+                {"matrix": [8, 5], "x": 13.25, "y": 3},
+                {"matrix": [8, 6], "x": 14.25, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 16, "y": 3},
 
-                {"x": 16, "y": 3},
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4, "w": 1.25},
-                {"x": 2.25, "y": 4, "w": 1.25},
-                {"x": 3.5, "y": 4, "w": 1.25},
-                {"x": 4.75, "y": 4},
-                {"x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
 
-                {"x": 9, "y": 4, "w": 2.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25},
-                {"x": 15, "y": 4},
-                {"x": 16, "y": 4}
+                {"matrix": [9, 2], "x": 9, "y": 4, "w": 2.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 13.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 15, "y": 4},
+                {"matrix": [9, 7], "x": 16, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/unk/rev1/rev1.h b/keyboards/handwired/unk/rev1/rev1.h
deleted file mode 100644
index 7f3992eebc..0000000000
--- a/keyboards/handwired/unk/rev1/rev1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,               K71,   K72,   K73,   K74,   K75,   K76,   K77, \
-	K10,   K11,   K12,   K13,   K14,   K15,   K16,               K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87, \
-	K20,   K21,   K22,   K23,   K24,   K25,   K26,                      K91,   K92,   K93,   K94,   K95,   K96,   K97, \
-	K30,   K31,   K32,   K33,   K34,   K35,   K36,                      K101,  K102,  K103,  K104,  K105,  K106,  K107, \
-	K40,   K41,   K42,   K43,   K44,   K45,                                    K112,  K113,  K114,  K115,  K116,  K117 \
-	) \
-	{ \
-		{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07}, \
-		{ K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO}, \
-		{ K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO}, \
-		{ K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO}, \
-		{ K40,   K41,   K42,   K43,   K44,   K45,   KC_NO, KC_NO}, \
-\
-		{ KC_NO,  K71,   K72,   K73,   K74,   K75,   K76,   K77}, \
-		{ K80,    K81,   K82,   K83,   K84,   K85,   K86,   K87}, \
-		{ KC_NO,  K91,   K92,   K93,   K94,   K95,   K96,   K97}, \
-		{ KC_NO,  K101,  K102,  K103,  K104,  K105,  K106,  K107}, \
-		{ KC_NO,  KC_NO, K112,  K113,  K114,  K115,  K116,  K117} \
-	}
-
-/*
-*/
-