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

2 files changed, 45 insertions, 78 deletions

diff --git a/keyboards/qpockets/eggman/eggman.h b/keyboards/qpockets/eggman/eggman.h
deleted file mode 100644
index 4d4c4a1241..0000000000
--- a/keyboards/qpockets/eggman/eggman.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Alan Lehners
- *
- * 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( \
-				        K02,      K04, \
-	K10, K00, K11, K01, K12, K13, K14, K05, K15, K06, K16, \
-	K30, K20, K31, K21, K32, K33, K34, K25, K35, K26, K36, \
-	K50, K40, K51, K41, K52, K53, K54, K45, K55, K46, K56, \
-              K61, K62,      K64, K65 \
-) \
-{ \
-{ K00, K01, K02, XXX, K04, K05, K06 }, \
-{ K10, K11, K12, K13, K14, K15, K16 }, \
-{ K20, K21, XXX, XXX, XXX, K25, K26 }, \
-{ K30, K31, K32, K33, K34, K35, K36 }, \
-{ K40, K41, XXX, XXX, XXX, K45, K46 }, \
-{ K50, K51, K52, K53, K54, K55, K56 }, \
-{ XXX, K61, K62, XXX, K64, K65, XXX }, \
-}
-
diff --git a/keyboards/qpockets/eggman/info.json b/keyboards/qpockets/eggman/info.json
index 58d2975169..1dbf27825c 100644
--- a/keyboards/qpockets/eggman/info.json
+++ b/keyboards/qpockets/eggman/info.json
@@ -24,45 +24,51 @@
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-			{"label":"RE", "x":4.25, "y":0}, 
-			{"label":"RE", "x":6.25, "y":0}, 
-			{"label":"Q", "x":0, "y":0.75}, 
-			{"label":"W", "x":1, "y":0.5}, 
-			{"label":"E", "x":2, "y":0.25}, 
-			{"label":"R", "x":3, "y":0.75}, 
-			{"label":"T", "x":4, "y":1}, 
-			{"label":"Delete", "x":5, "y":1, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":1}, 
-			{"label":"U", "x":7.5, "y":0.75}, 
-			{"label":"I", "x":8.5, "y":0.25}, 
-			{"label":"O", "x":9.5, "y":0.5}, 
-			{"label":"P", "x":10.5, "y":0.75}, 
-			{"label":"A", "x":0, "y":1.75}, 
-			{"label":"S", "x":1, "y":1.5},  
-			{"label":"D", "x":2, "y":1.25}, 
-			{"label":"F", "x":3, "y":1.75}, 
-			{"label":"G", "x":4, "y":2}, 
-			{"label":"Tab", "x":5, "y":2, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":2}, 
-			{"label":"J", "x":7.5, "y":1.75}, 
-			{"label":"K", "x":8.5, "y":1.25}, 
-			{"label":"L", "x":9.5, "y":1.5}, 
-			{"label":"\"", "x":10.5, "y":1.75}, 
-			{"label":"Z", "x":0, "y":2.75}, 
-			{"label":"X", "x":1, "y":2.5}, 
-			{"label":"C", "x":2, "y":2.25}, 
-			{"label":"V", "x":3, "y":2.75}, 
-			{"label":"B", "x":4, "y":3}, 
-			{"label":"Shift", "x":5, "y":3, "w":1.5},  
-			{"label":"N", "x":6.5, "y":3}, 
-			{"label":"M", "x":7.5, "y":2.75}, 
-			{"label":"<", "x":8.5, "y":2.25}, 
-			{"label":">", "x":9.5, "y":2.5}, 
-			{"label":"?", "x":10.5, "y":2.75}, 
-			{"label":"Ctrl", "x":2.5, "y":4, "w":1.25}, 
-			{"label":"Backspace", "x":3.75, "y":4, "w":2}, 
-			{"label":"Space", "x":5.75, "y":4, "w":2}, 
-			{"label":"Alt", "x":7.75, "y":4, "w":1.25}] 
+                {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 4], "x": 6.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 0], "x": 1, "y": 0.5},
+                {"matrix": [1, 1], "x": 2, "y": 0.25},
+                {"matrix": [0, 1], "x": 3, "y": 0.75},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 3], "x": 5, "y": 1, "w": 1.5},
+                {"matrix": [1, 4], "x": 6.5, "y": 1},
+                {"matrix": [0, 5], "x": 7.5, "y": 0.75},
+                {"matrix": [1, 5], "x": 8.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 9.5, "y": 0.5},
+                {"matrix": [1, 6], "x": 10.5, "y": 0.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 1.75},
+                {"matrix": [2, 0], "x": 1, "y": 1.5},
+                {"matrix": [3, 1], "x": 2, "y": 1.25},
+                {"matrix": [2, 1], "x": 3, "y": 1.75},
+                {"matrix": [3, 2], "x": 4, "y": 2},
+                {"matrix": [3, 3], "x": 5, "y": 2, "w": 1.5},
+                {"matrix": [3, 4], "x": 6.5, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 1.75},
+                {"matrix": [3, 5], "x": 8.5, "y": 1.25},
+                {"matrix": [2, 6], "x": 9.5, "y": 1.5},
+                {"matrix": [3, 6], "x": 10.5, "y": 1.75},
+
+                {"matrix": [5, 0], "x": 0, "y": 2.75},
+                {"matrix": [4, 0], "x": 1, "y": 2.5},
+                {"matrix": [5, 1], "x": 2, "y": 2.25},
+                {"matrix": [4, 1], "x": 3, "y": 2.75},
+                {"matrix": [5, 2], "x": 4, "y": 3},
+                {"matrix": [5, 3], "x": 5, "y": 3, "w": 1.5},
+                {"matrix": [5, 4], "x": 6.5, "y": 3},
+                {"matrix": [4, 5], "x": 7.5, "y": 2.75},
+                {"matrix": [5, 5], "x": 8.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 9.5, "y": 2.5},
+                {"matrix": [5, 6], "x": 10.5, "y": 2.75},
+
+                {"matrix": [6, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [6, 2], "x": 3.75, "y": 4, "w": 2},
+                {"matrix": [6, 4], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [6, 5], "x": 7.75, "y": 4, "w": 1.25}
+            ]
         }
     }
 }