Move small macropad-ish layouts to data driven (#20341)

8 files changed, 49 insertions, 94 deletions

diff --git a/keyboards/kingly_keys/romac/info.json b/keyboards/kingly_keys/romac/info.json
index 668b4d2f0b..236cc335a2 100644
--- a/keyboards/kingly_keys/romac/info.json
+++ b/keyboards/kingly_keys/romac/info.json
@@ -17,7 +17,23 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-	  "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}]
+	  "layout": [
+      {"matrix": [0, 0], "x": 0, "y": 0},
+      {"matrix": [0, 1], "x": 1, "y": 0},
+      {"matrix": [0, 2], "x": 2, "y": 0},
+
+      {"matrix": [1, 0], "x": 0, "y": 1},
+      {"matrix": [1, 1], "x": 1, "y": 1},
+      {"matrix": [1, 2], "x": 2, "y": 1},
+
+      {"matrix": [2, 0], "x": 0, "y": 2},
+      {"matrix": [2, 1], "x": 1, "y": 2},
+      {"matrix": [2, 2], "x": 2, "y": 2},
+
+      {"matrix": [3, 0], "x": 0, "y": 3},
+      {"matrix": [3, 1], "x": 1, "y": 3},
+      {"matrix": [3, 2], "x": 2, "y": 3}
+    ]
 	}
   }
 }
diff --git a/keyboards/kingly_keys/romac/romac.h b/keyboards/kingly_keys/romac/romac.h
deleted file mode 100644
index e6fb9694d2..0000000000
--- a/keyboards/kingly_keys/romac/romac.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, \
-	K10, K11, K12, \
-	K20, K21, K22, \
-	K30, K31, K32  \
-) \
-{ \
-	{ K00,   K01,   K02 }, \
-	{ K10,   K11,   K12 }, \
-	{ K20,   K21,   K22 }, \
-	{ K30,   K31,   K32 }  \
-}
diff --git a/keyboards/kingly_keys/romac_plus/info.json b/keyboards/kingly_keys/romac_plus/info.json
index 5976a3ff86..abaf8e99f4 100644
--- a/keyboards/kingly_keys/romac_plus/info.json
+++ b/keyboards/kingly_keys/romac_plus/info.json
@@ -22,7 +22,23 @@
   "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
-	  "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}]
+	  "layout": [
+      {"matrix": [0, 0], "x": 0, "y": 0},
+      {"matrix": [0, 1], "x": 1, "y": 0},
+      {"matrix": [0, 2], "x": 2, "y": 0},
+
+      {"matrix": [1, 0], "x": 0, "y": 1},
+      {"matrix": [1, 1], "x": 1, "y": 1},
+      {"matrix": [1, 2], "x": 2, "y": 1},
+
+      {"matrix": [2, 0], "x": 0, "y": 2},
+      {"matrix": [2, 1], "x": 1, "y": 2},
+      {"matrix": [2, 2], "x": 2, "y": 2},
+
+      {"matrix": [3, 0], "x": 0, "y": 3},
+      {"matrix": [3, 1], "x": 1, "y": 3},
+      {"matrix": [3, 2], "x": 2, "y": 3}
+    ]
 	}
   }
 }
diff --git a/keyboards/kingly_keys/romac_plus/romac_plus.h b/keyboards/kingly_keys/romac_plus/romac_plus.h
deleted file mode 100644
index e6fb9694d2..0000000000
--- a/keyboards/kingly_keys/romac_plus/romac_plus.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, \
-	K10, K11, K12, \
-	K20, K21, K22, \
-	K30, K31, K32  \
-) \
-{ \
-	{ K00,   K01,   K02 }, \
-	{ K10,   K11,   K12 }, \
-	{ K20,   K21,   K22 }, \
-	{ K30,   K31,   K32 }  \
-}
diff --git a/keyboards/kingly_keys/smd_milk/info.json b/keyboards/kingly_keys/smd_milk/info.json
index 8aa1f12dbf..bf84afdccc 100644
--- a/keyboards/kingly_keys/smd_milk/info.json
+++ b/keyboards/kingly_keys/smd_milk/info.json
@@ -17,7 +17,10 @@
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
-      "layout": [ {"x": 0, "y": 0 }, {"x": 0, "y": 1 }]
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [1, 0], "x": 0, "y": 1}
+      ]
     }
   }
 }
diff --git a/keyboards/kingly_keys/smd_milk/smd_milk.h b/keyboards/kingly_keys/smd_milk/smd_milk.h
deleted file mode 100644
index 8f294817f9..0000000000
--- a/keyboards/kingly_keys/smd_milk/smd_milk.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Sebastian Williams
- *
- * 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( \
-  K00,  \
-  K01  \
-) { \
-  { K00 }, \
-  { K01 } \
-}
diff --git a/keyboards/kingly_keys/soap/info.json b/keyboards/kingly_keys/soap/info.json
index 16f229f043..61deb7d6e0 100644
--- a/keyboards/kingly_keys/soap/info.json
+++ b/keyboards/kingly_keys/soap/info.json
@@ -22,7 +22,17 @@
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":4, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":4, "y":1}]
+      "layout": [
+        {"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": 4, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 4, "y": 1}
+      ]
     }
   }
 }
diff --git a/keyboards/kingly_keys/soap/soap.h b/keyboards/kingly_keys/soap/soap.h
deleted file mode 100644
index 8d5eba3ad2..0000000000
--- a/keyboards/kingly_keys/soap/soap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2019 Garret G. (TheRoyalSweatshirt)
- *
- * 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/>.
- * 
- * Note:  Matrix is a little wacky with the rotary encoder click mapping being
- * on the opposite side of the board.  Remember to pay attention to 
- * the 13th column where the lone key mapped for rotary encoder click (K132).
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-
-#define LAYOUT( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13 \
-) { \
-    { K00, K01, K02, K03 }, \
-    { K10, K11, K12, K13 } \
-}