Move single `LAYOUT_all`s to data driven (#20430)

2 files changed, 51 insertions, 107 deletions

diff --git a/keyboards/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/info.json
index f110f0e325..0608f2a9f7 100644
--- a/keyboards/peej/rosaline/staggered/info.json
+++ b/keyboards/peej/rosaline/staggered/info.json
@@ -21,60 +21,60 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0, "w":1.5},
-                {"x":1.5, "y":0},
-                {"x":2.5, "y":0},
-                {"x":3.5, "y":0},
-                {"x":4.5, "y":0},
-                {"x":5.5, "y":0},
-                {"x":6.5, "y":0},
-                {"x":7.5, "y":0},
-                {"x":8.5, "y":0},
-                {"x":9.5, "y":0},
-                {"x":10.5, "y":0},
-                {"x":11.5, "y":0},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0, "w":1.5},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [1, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [1, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [1, 3], "x": 6.5, "y": 0},
+                {"matrix": [0, 4], "x": 7.5, "y": 0},
+                {"matrix": [1, 4], "x": 8.5, "y": 0},
+                {"matrix": [0, 5], "x": 9.5, "y": 0},
+                {"matrix": [0, 6], "x": 10.5, "y": 0},
+                {"matrix": [1, 6], "x": 11.5, "y": 0},
+                {"matrix": [0, 7], "x": 12.5, "y": 0},
+                {"matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5},
 
-                {"x":0, "y":1, "w":1.75},
-                {"x":1.75, "y":1},
-                {"x":2.75, "y":1},
-                {"x":3.75, "y":1},
-                {"x":4.75, "y":1},
-                {"x":5.75, "y":1},
-                {"x":6.75, "y":1},
-                {"x":7.75, "y":1},
-                {"x":8.75, "y":1},
-                {"x":9.75, "y":1},
-                {"x":10.75, "y":1},
-                {"x":11.75, "y":1},
-                {"x":12.75, "y":1, "w":2.25},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 1},
+                {"matrix": [2, 1], "x": 2.75, "y": 1},
+                {"matrix": [2, 2], "x": 3.75, "y": 1},
+                {"matrix": [3, 2], "x": 4.75, "y": 1},
+                {"matrix": [2, 3], "x": 5.75, "y": 1},
+                {"matrix": [3, 3], "x": 6.75, "y": 1},
+                {"matrix": [2, 4], "x": 7.75, "y": 1},
+                {"matrix": [1, 5], "x": 8.75, "y": 1},
+                {"matrix": [2, 5], "x": 9.75, "y": 1},
+                {"matrix": [2, 6], "x": 10.75, "y": 1},
+                {"matrix": [3, 6], "x": 11.75, "y": 1},
+                {"matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25},
 
-                {"x":0, "y":2, "w":2.25},
-                {"x":2.25, "y":2},
-                {"x":3.25, "y":2},
-                {"x":4.25, "y":2},
-                {"x":5.25, "y":2},
-                {"x":6.25, "y":2},
-                {"x":7.25, "y":2},
-                {"x":8.25, "y":2},
-                {"x":9.25, "y":2},
-                {"x":10.25, "y":2},
-                {"x":11.25, "y":2},
-                {"x":12.25, "y":2, "w":1.75},
-                {"x":14, "y":2},
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 2},
+                {"matrix": [4, 1], "x": 3.25, "y": 2},
+                {"matrix": [4, 2], "x": 4.25, "y": 2},
+                {"matrix": [4, 3], "x": 5.25, "y": 2},
+                {"matrix": [5, 3], "x": 6.25, "y": 2},
+                {"matrix": [3, 4], "x": 7.25, "y": 2},
+                {"matrix": [4, 4], "x": 8.25, "y": 2},
+                {"matrix": [3, 5], "x": 9.25, "y": 2},
+                {"matrix": [4, 5], "x": 10.25, "y": 2},
+                {"matrix": [4, 6], "x": 11.25, "y": 2},
+                {"matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75},
+                {"matrix": [4, 7], "x": 14, "y": 2},
 
-                {"x":0, "y":3, "w":1.5},
-                {"x":1.5, "y":3},
-                {"x":2.5, "y":3, "w":1.5},
-                {"x":4, "y":3, "w":2.75},
-                {"x":6.75, "y":3},
-                {"x":7.75, "y":3, "w":2.25},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
-                {"x":14, "y":3}
+                {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 3},
+                {"matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5},
+                {"matrix": [5, 2], "x": 4, "y": 3, "w": 2.75},
+                {"matrix": [5, 4], "x": 6.75, "y": 3},
+                {"matrix": [5, 5], "x": 7.75, "y": 3, "w": 2.25},
+                {"matrix": [6, 5], "x": 10, "y": 3},
+                {"matrix": [5, 6], "x": 11, "y": 3},
+                {"matrix": [6, 6], "x": 12, "y": 3},
+                {"matrix": [5, 7], "x": 13, "y": 3},
+                {"matrix": [6, 7], "x": 14, "y": 3}
             ]
         }
     }
diff --git a/keyboards/peej/rosaline/staggered/staggered.h b/keyboards/peej/rosaline/staggered/staggered.h
deleted file mode 100644
index 98186320a5..0000000000
--- a/keyboards/peej/rosaline/staggered/staggered.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2021 Paul James
- *
- * 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"
-
-/*
- * ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
- * │00   │10 │01 │02 │12 │03 │13 │04 │14 │05 │06 │16 │07 │17   │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │20    │11 │21 │22 │32 │23 │33 │24 │15 │25 │26 │36 │27      │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌───┬──────────┐                  ┌──────┬───┬───┐
- * │30      │31 │41 │42 │43 │53 │34 │44 │35 │45 │46 │37    │47 │   │46 │37        │ 1u/2.75u RShift  │46    │37 │47 │ 1.75u/1u/1u RShift
- * ├─────┬──┴┬──┴──┬┴───┴───┴─┬─┴───┴──┬┴──┬┴──┬┴──┬┴──┬───┼───┤   └───┴──────────┘                  └──────┴───┴───┘
- * │40   │50 │51   │52        │54      │55 │65 │56 │66 │57 │67 │
- * └─────┴───┴─────┴──────────┴────────┴───┴───┴───┴───┴───┴───┘
- *                 ┌───────────────────────────┬─────┬───┬─────┐
- *        7u Space │54                         │56   │66 │57   │ Tsangan Right Mods
- *                 └───────────────────────────┴─────┴───┴─────┘
- *                 ┌──────────┬───┬────────┬───┐
- *  2.75/1/2.25/1u │52        │54 │55      │65 │
- *                 └──────────┴───┴────────┴───┘
- */
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
-	k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k06, k16, k07, k17, \
-	k20, k11, k21, k22, k32, k23, k33, k24, k15, k25, k26, k36,      k27, \
-	k30,      k31, k41, k42, k43, k53, k34, k44, k35, k45, k46, k37, k47, \
-	k40, k50, k51,           k52, k54,      k55, k65, k56, k66, k57, k67  \
-) \
-{ \
-	{ k00, k01, k02, k03, k04, k05, k06, k07 }, \
-	{ k10, k11, k12, k13, k14, k15, k16, k17 }, \
-	{ k20, k21, k22, k23, k24, k25, k26, k27 }, \
-	{ k30, k31, k32, k33, k34, k35, k36, k37 }, \
-	{ k40, k41, k42, k43, k44, k45, k46, k47 }, \
-	{ k50, k51, k52, k53, k54, k55, k56, k57 }, \
-	{ XXX, XXX, XXX, XXX, XXX, k65, k66, k67 }, \
-	{ XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
-}