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

2 files changed, 86 insertions, 100 deletions

diff --git a/keyboards/charue/sunsetter_r2/info.json b/keyboards/charue/sunsetter_r2/info.json
index 8b7ea90cf0..1a1419915b 100644
--- a/keyboards/charue/sunsetter_r2/info.json
+++ b/keyboards/charue/sunsetter_r2/info.json
@@ -24,90 +24,96 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-              {"x":0, "y":0},
-              {"x":1, "y":0},
-              {"x":2.25, "y":0},
-              {"x":3.25, "y":0},
-              {"x":4.25, "y":0},
-              {"x":5.25, "y":0},
-              {"x":6.25, "y":0},
-              {"x":7.25, "y":0},
-              {"x":8.25, "y":0},
-              {"x":9.25, "y":0},
-              {"x":10.25, "y":0},
-              {"x":11.25, "y":0},
-              {"x":12.25, "y":0},
-              {"x":13.25, "y":0},
-              {"x":14.25, "y":0},
-              {"x":15.25, "y":0},
-              {"x":16.25, "y":0},
-              {"x":17.25, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
 
-              {"x":0, "y":1},
-              {"x":1, "y":1},
-              {"x":2.25, "y":1, "w":1.5},
-              {"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},
-              {"x":13.75, "y":1},
-              {"x":14.75, "y":1},
-              {"x":15.75, "y":1, "w":1.5},
-              {"x":17.25, "y":1},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
+                {"matrix": [0, 8], "x": 8.25, "y": 0},
+                {"matrix": [0, 9], "x": 9.25, "y": 0},
+                {"matrix": [0, 10], "x": 10.25, "y": 0},
+                {"matrix": [0, 11], "x": 11.25, "y": 0},
+                {"matrix": [0, 12], "x": 12.25, "y": 0},
+                {"matrix": [0, 13], "x": 13.25, "y": 0},
+                {"matrix": [0, 14], "x": 14.25, "y": 0},
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+                {"matrix": [0, 16], "x": 16.25, "y": 0},
+                {"matrix": [1, 16], "x": 17.25, "y": 0},
 
-              {"x":0, "y":2},
-              {"x":1, "y":2},
-              {"x":2.25, "y":2, "w":1.75},
-              {"x":4, "y":2},
-              {"x":5, "y":2},
-              {"x":6, "y":2},
-              {"x":7, "y":2},
-              {"x":8, "y":2},
-              {"x":9, "y":2},
-              {"x":10, "y":2},
-              {"x":11, "y":2},
-              {"x":12, "y":2},
-              {"x":13, "y":2},
-              {"x":14, "y":2},
-              {"x":15, "y":2, "w":2.25},
-              {"x":17.25, "y":2},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
 
-              {"x":0, "y":3},
-              {"x":1, "y":3},
-              {"x":2.25, "y":3, "w":1.25},
-              {"x":3.5, "y":3},
-              {"x":4.5, "y":3},
-              {"x":5.5, "y":3},
-              {"x":6.5, "y":3},
-              {"x":7.5, "y":3},
-              {"x":8.5, "y":3},
-              {"x":9.5, "y":3},
-              {"x":10.5, "y":3},
-              {"x":11.5, "y":3},
-              {"x":12.5, "y":3},
-              {"x":13.5, "y":3},
-              {"x":14.5, "y":3, "w":1.75},
-              {"x":16.25, "y":3},
-              {"x":17.25, "y":3},
+                {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1},
+                {"matrix": [1, 12], "x": 12.75, "y": 1},
+                {"matrix": [1, 13], "x": 13.75, "y": 1},
+                {"matrix": [1, 14], "x": 14.75, "y": 1},
+                {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5},
+                {"matrix": [2, 15], "x": 17.25, "y": 1},
 
-              {"x":0, "y":4},
-              {"x":1, "y":4},
-              {"x":2.25, "y":4, "w":1.25},
-              {"x":3.5, "y":4, "w":1.25},
-              {"x":4.75, "y":4, "w":1.25},
-              {"x":6, "y":4, "w":2.25},
-              {"x":8.25, "y":4, "w":1.25},
-              {"x":9.5, "y":4, "w":2.75},
-              {"x":12.25, "y":4},
-              {"x":15.25, "y":4},
-              {"x":16.25, "y":4},
-              {"x":17.25, "y":4}
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+
+                {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 2},
+                {"matrix": [2, 4], "x": 5, "y": 2},
+                {"matrix": [2, 5], "x": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+                {"matrix": [2, 9], "x": 10, "y": 2},
+                {"matrix": [2, 10], "x": 11, "y": 2},
+                {"matrix": [2, 11], "x": 12, "y": 2},
+                {"matrix": [2, 12], "x": 13, "y": 2},
+                {"matrix": [2, 13], "x": 14, "y": 2},
+                {"matrix": [2, 14], "x": 15, "y": 2, "w": 2.25},
+                {"matrix": [3, 15], "x": 17.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+                {"matrix": [3, 6], "x": 6.5, "y": 3},
+                {"matrix": [3, 7], "x": 7.5, "y": 3},
+                {"matrix": [3, 8], "x": 8.5, "y": 3},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 10], "x": 10.5, "y": 3},
+                {"matrix": [3, 11], "x": 11.5, "y": 3},
+                {"matrix": [3, 12], "x": 12.5, "y": 3},
+                {"matrix": [3, 13], "x": 13.5, "y": 3},
+                {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 16.25, "y": 3},
+                {"matrix": [4, 16], "x": 17.25, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 12], "x": 12.25, "y": 4},
+
+                {"matrix": [4, 13], "x": 15.25, "y": 4},
+                {"matrix": [4, 14], "x": 16.25, "y": 4},
+                {"matrix": [4, 15], "x": 17.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/charue/sunsetter_r2/sunsetter_r2.h b/keyboards/charue/sunsetter_r2/sunsetter_r2.h
deleted file mode 100644
index 628b41a943..0000000000
--- a/keyboards/charue/sunsetter_r2/sunsetter_r2.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2022 Charue Design
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    k00, k01,   k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k1g, \
-    k10, k11,    k12,   k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,  k1f,  k2f, \
-    k20, k21,     k22,   k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,    k2e,    k3f, \
-    k30, k31,    k32,  k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,   k3e,  k3g, k4g, \
-    k40, k41,    k42,   k43,   k44,   k45,   k47,      k4a,  k4c,                k4d, k4e, k4f  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06,   k07, k08,   k09,   k0a, k0b,   k0c, k0d, k0e, k0f, k0g   }, \
-    { k10, k11, k12, k13, k14, k15, k16,   k17, k18,   k19,   k1a, k1b,   k1c, k1d, k1e, k1f, k1g   }, \
-    { k20, k21, k22, k23, k24, k25, k26,   k27, k28,   k29,   k2a, k2b,   k2c, k2d, k2e, k2f, KC_NO }, \
-    { k30, k31, k32, k33, k34, k35, k36,   k37, k38,   k39,   k3a, k3b,   k3c, k3d, k3e, k3f, k3g   }, \
-    { k40, k41, k42, k43, k44, k45, KC_NO, k47, KC_NO, KC_NO, k4a, KC_NO, k4c, k4d, k4e, k4f, k4g   }  \
-}