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

keyboards/soup10/info.json

@@ -21,16 +21,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K01 (D1,E6)", "x":1, "y":0},
-                {"label":"K10 (D0,D7)", "x":0, "y":1},
-                {"label":"K11 (D0,E6)", "x":1, "y":1},
-                {"label":"K12 (D0,B4)", "x":2, "y":1},
-                {"label":"K20 (D4,D7)", "x":0, "y":2},
-                {"label":"K21 (D4,E6)", "x":1, "y":2},
-                {"label":"K22 (D4,B4)", "x":2, "y":2},
-                {"label":"K30 (C6,D7)", "x":0, "y":3},
-                {"label":"K31 (C6,E6)", "x":1, "y":3},
-                {"label":"K32 (C6,B4)", "x":2, "y":3}
+                {"matrix": [0, 1], "x": 1, "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}
             ]
         }
     }

keyboards/soup10/soup10.h

@@ -1,39 +0,0 @@
-/* Copyright 2021 icesoup
- *
- * 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 is 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( \
-         K01,      \
-    K10, K11, K12, \
-    K20, K21, K22, \
-    K30, K31, K32  \
-) { \
-    { KC_NO, K01,   KC_NO }, \
-    { K10,   K11,   K12 }, \
-    { K20,   K21,   K22 }, \
-    { K30,   K31,   K32 }  \
-}