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

2 files changed, 72 insertions, 103 deletions

diff --git a/keyboards/rpiguy9907/southpaw66/info.json b/keyboards/rpiguy9907/southpaw66/info.json
index c16624d8ed..3cebdcb4a8 100644
--- a/keyboards/rpiguy9907/southpaw66/info.json
+++ b/keyboards/rpiguy9907/southpaw66/info.json
@@ -20,73 +20,79 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-
             "layout": [
-                {"label":"Insert", "x":0, "y":0},
-                {"label":"Esc", "x":1.5, "y":0},
-                {"label":"1", "x":2.5, "y":0},
-                {"label":"2", "x":3.5, "y":0},
-                {"label":"3", "x":4.5, "y":0},
-                {"label":"4", "x":5.5, "y":0},
-                {"label":"5", "x":6.5, "y":0},
-                {"label":"6", "x":7.5, "y":0},
-                {"label":"7", "x":8.5, "y":0},
-                {"label":"8", "x":9.5, "y":0},
-                {"label":"9", "x":10.5, "y":0},
-                {"label":"0", "x":11.5, "y":0},
-                {"label":"-", "x":12.5, "y":0},
-                {"label":"=", "x":13.5, "y":0},
-                {"label":"Backspace", "x":14.5, "y":0, "w":2},
-                {"label":"Delete", "x":0, "y":1},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":8, "y":1},
-                {"label":"U", "x":9, "y":1},
-                {"label":"I", "x":10, "y":1},
-                {"label":"O", "x":11, "y":1},
-                {"label":"P", "x":12, "y":1},
-                {"label":"[", "x":13, "y":1},
-                {"label":"]", "x":14, "y":1},
-                {"label":"|", "x":15, "y":1, "w":1.5},
-                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
-                {"label":"A", "x":3.25, "y":2},
-                {"label":"S", "x":4.25, "y":2},
-                {"label":"D", "x":5.25, "y":2},
-                {"label":"F", "x":6.25, "y":2},
-                {"label":"G", "x":7.25, "y":2},
-                {"label":"H", "x":8.25, "y":2},
-                {"label":"J", "x":9.25, "y":2},
-                {"label":"K", "x":10.25, "y":2},
-                {"label":"L", "x":11.25, "y":2},
-                {"label":":", "x":12.25, "y":2},
-                {"label":"\"", "x":13.25, "y":2},
-                {"label":"Enter", "x":14.25, "y":2, "w":2.25},
-                {"label":"Up", "x":1, "y":3},
-                {"label":"Shift", "x":2, "y":3, "w":1.75},
-                {"label":"Z", "x":3.75, "y":3},
-                {"label":"X", "x":4.75, "y":3},
-                {"label":"C", "x":5.75, "y":3},
-                {"label":"V", "x":6.75, "y":3},
-                {"label":"B", "x":7.75, "y":3},
-                {"label":"N", "x":8.75, "y":3},
-                {"label":"M", "x":9.75, "y":3},
-                {"label":",", "x":10.75, "y":3},
-                {"label":".", "x":11.75, "y":3},
-                {"label":"/", "x":12.75, "y":3},
-                {"label":"Shift", "x":13.75, "y":3, "w":2.75},
-                {"label":"Left", "x":0, "y":4},
-                {"label":"Down", "x":1, "y":4},
-                {"label":"Right", "x":2, "y":4},
-                {"label":"Ctrl", "x":3, "y":4, "w":1.5},
-                {"label":"Alt", "x":4.5, "y":4},
-                {"label":"Space", "x":5.5, "y":4, "w":7},
-                {"label":"Win", "x":12.5, "y":4},
-                {"label":"Alt", "x":13.5, "y":4, "w":1.5},
-                {"label":"Ctrl", "x":15, "y":4, "w":1.5}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 0},
+                {"matrix": [2, 0], "x": 2.5, "y": 0},
+                {"matrix": [3, 0], "x": 3.5, "y": 0},
+                {"matrix": [4, 0], "x": 4.5, "y": 0},
+                {"matrix": [5, 0], "x": 5.5, "y": 0},
+                {"matrix": [6, 0], "x": 6.5, "y": 0},
+                {"matrix": [0, 1], "x": 7.5, "y": 0},
+                {"matrix": [1, 1], "x": 8.5, "y": 0},
+                {"matrix": [2, 1], "x": 9.5, "y": 0},
+                {"matrix": [3, 1], "x": 10.5, "y": 0},
+                {"matrix": [4, 1], "x": 11.5, "y": 0},
+                {"matrix": [5, 1], "x": 12.5, "y": 0},
+                {"matrix": [6, 1], "x": 13.5, "y": 0},
+                {"matrix": [0, 2], "x": 14.5, "y": 0, "w": 2},
+
+                {"matrix": [1, 2], "x": 0, "y": 1},
+
+                {"matrix": [2, 2], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 2], "x": 3, "y": 1},
+                {"matrix": [4, 2], "x": 4, "y": 1},
+                {"matrix": [5, 2], "x": 5, "y": 1},
+                {"matrix": [6, 2], "x": 6, "y": 1},
+                {"matrix": [0, 3], "x": 7, "y": 1},
+                {"matrix": [1, 3], "x": 8, "y": 1},
+                {"matrix": [2, 3], "x": 9, "y": 1},
+                {"matrix": [3, 3], "x": 10, "y": 1},
+                {"matrix": [4, 3], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [0, 4], "x": 14, "y": 1},
+                {"matrix": [1, 4], "x": 15, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 4], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [3, 4], "x": 3.25, "y": 2},
+                {"matrix": [4, 4], "x": 4.25, "y": 2},
+                {"matrix": [5, 4], "x": 5.25, "y": 2},
+                {"matrix": [6, 4], "x": 6.25, "y": 2},
+                {"matrix": [0, 5], "x": 7.25, "y": 2},
+                {"matrix": [1, 5], "x": 8.25, "y": 2},
+                {"matrix": [2, 5], "x": 9.25, "y": 2},
+                {"matrix": [3, 5], "x": 10.25, "y": 2},
+                {"matrix": [4, 5], "x": 11.25, "y": 2},
+                {"matrix": [5, 5], "x": 12.25, "y": 2},
+                {"matrix": [6, 5], "x": 13.25, "y": 2},
+                {"matrix": [0, 6], "x": 14.25, "y": 2, "w": 2.25},
+
+                {"matrix": [1, 6], "x": 1, "y": 3},
+                {"matrix": [2, 6], "x": 2, "y": 3, "w": 1.75},
+                {"matrix": [3, 6], "x": 3.75, "y": 3},
+                {"matrix": [4, 6], "x": 4.75, "y": 3},
+                {"matrix": [5, 6], "x": 5.75, "y": 3},
+                {"matrix": [6, 6], "x": 6.75, "y": 3},
+                {"matrix": [0, 7], "x": 7.75, "y": 3},
+                {"matrix": [1, 7], "x": 8.75, "y": 3},
+                {"matrix": [2, 7], "x": 9.75, "y": 3},
+                {"matrix": [3, 7], "x": 10.75, "y": 3},
+                {"matrix": [4, 7], "x": 11.75, "y": 3},
+                {"matrix": [5, 7], "x": 12.75, "y": 3},
+                {"matrix": [6, 7], "x": 13.75, "y": 3, "w": 2.75},
+
+                {"matrix": [0, 8], "x": 0, "y": 4},
+                {"matrix": [1, 8], "x": 1, "y": 4},
+                {"matrix": [2, 8], "x": 2, "y": 4},
+                {"matrix": [3, 8], "x": 3, "y": 4, "w": 1.5},
+                {"matrix": [4, 8], "x": 4.5, "y": 4},
+                {"matrix": [5, 8], "x": 5.5, "y": 4, "w": 7},
+                {"matrix": [6, 8], "x": 12.5, "y": 4},
+                {"matrix": [0, 9], "x": 13.5, "y": 4, "w": 1.5},
+                {"matrix": [1, 9], "x": 15, "y": 4, "w": 1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/rpiguy9907/southpaw66/southpaw66.h b/keyboards/rpiguy9907/southpaw66/southpaw66.h
deleted file mode 100644
index 11f1fc7e8f..0000000000
--- a/keyboards/rpiguy9907/southpaw66/southpaw66.h
+++ /dev/null
@@ -1,37 +0,0 @@
- /* Copyright 2020 gooberpsycho
-  *
-  * 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"
-
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-  k00, k10, k20, k30, k40, k50, k60, k01, k11, k21, k31, k41, k51, k61, k02,    \
-  k12, k22, k32, k42, k52, k62, k03, k13, k23, k33, k43, k53, k63, k04, k14,    \
-  k24, k34, k44, k54, k64, k05, k15, k25, k35, k45, k55, k65, k06,              \
-  k16, k26, k36, k46, k56, k66, k07, k17, k27, k37, k47, k57, k67,              \
-  k08, k18, k28, k38, k48, k58, k68, k09, k19                                   \
-) \
-{ \
-  {k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09}, \
-  {k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19}, \
-  {k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   KC_NO}, \
-  {k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   KC_NO}, \
-  {k40,   k41,   k42,   k43,   k44,   k45,   k46,   k47,   k48,   KC_NO}, \
-  {k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   KC_NO}, \
-  {k60,   k61,   k62,   k63,   k64,   k65,   k66,   k67,   k68,   KC_NO} \
-}