Move `default` layouts to data driven (#20349)

2 files changed, 83 insertions, 122 deletions

diff --git a/keyboards/qpockets/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json
index 5b4806e832..32d744c0a9 100644
--- a/keyboards/qpockets/space_space/rev1/info.json
+++ b/keyboards/qpockets/space_space/rev1/info.json
@@ -24,86 +24,92 @@
   "debounce": 7,
   "layouts": {
     "LAYOUT_default": {
-	  "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Fn", "x":2.5, "y":3.35}, 
-			{"label":"Backspace", "x":3.5, "y":3.35, "w":2}, 
-			{"label":"Space", "x":5.5, "y":3.35, "w":2.25}, 
-			{"label":"Gui", "x":7.75, "y":3.35}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
+      "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": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0, "w": 1.5},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+        {"matrix": [0, 10], "x": 10.5, "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": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 3], "x": 2.5, "y": 3.35},
+        {"matrix": [3, 4], "x": 3.5, "y": 3.35, "w": 2},
+        {"matrix": [3, 6], "x": 5.5, "y": 3.35, "w": 2.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.35},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
       ]
     },
-	    "LAYOUT_big_space": {
+    "LAYOUT_big_space": {
       "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Space", "x":2.5, "y":3.35, "w":6.25}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
+        {"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, "w": 1.5},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+        {"matrix": [0, 10], "x": 10.5, "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": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1, "w": 1.5},
+        {"matrix": [1, 6], "x": 6.5, "y": 1},
+        {"matrix": [1, 7], "x": 7.5, "y": 1},
+        {"matrix": [1, 8], "x": 8.5, "y": 1},
+        {"matrix": [1, 9], "x": 9.5, "y": 1},
+        {"matrix": [1, 10], "x": 10.5, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2, "w": 1.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2},
+        {"matrix": [2, 7], "x": 7.5, "y": 2},
+        {"matrix": [2, 8], "x": 8.5, "y": 2},
+        {"matrix": [2, 9], "x": 9.5, "y": 2},
+        {"matrix": [2, 10], "x": 10.5, "y": 2},
+
+        {"matrix": [3, 2], "x": 1.25, "y": 3.35, "w": 1.25},
+        {"matrix": [3, 5], "x": 2.5, "y": 3.35, "w": 6.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.35, "w": 1.25}
       ]
     }
   }
diff --git a/keyboards/qpockets/space_space/rev1/rev1.h b/keyboards/qpockets/space_space/rev1/rev1.h
deleted file mode 100644
index e56068ec42..0000000000
--- a/keyboards/qpockets/space_space/rev1/rev1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2020 qpockets
- *
- * 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 XXX KC_NO
-
-#define LAYOUT_default( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32, K33, K34,      K36, K37, K38 \
-) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-    {XXX, XXX, K32, K33, K34, XXX, K36, K37, K38, XXX, XXX} \
-}
-
-#define LAYOUT_big_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32,           K35,           K38 \
-) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-    {XXX, XXX, K32, XXX, XXX, K35, XXX, XXX, K38, XXX, XXX} \
-}