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

2 files changed, 70 insertions, 92 deletions

diff --git a/keyboards/redox_w/info.json b/keyboards/redox_w/info.json
index 13e2bb3283..c765291258 100644
--- a/keyboards/redox_w/info.json
+++ b/keyboards/redox_w/info.json
@@ -13,89 +13,85 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"_Nav || `", "x":0, "y":0.375, "w":1.25},
-        {"label":"1", "x":1.25, "y":0.375},
-        {"label":"2", "x":2.25, "y":0.125},
-        {"label":"3", "x":3.25, "y":0},
-        {"label":"4", "x":4.25, "y":0.125},
-        {"label":"5", "x":5.25, "y":0.25},
+        {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.25},
+        {"matrix": [0, 1], "x": 1.25, "y": 0.375},
+        {"matrix": [0, 2], "x": 2.25, "y": 0.125},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0.125},
+        {"matrix": [0, 5], "x": 5.25, "y": 0.25},
 
-        {"label":"6", "x":12.25, "y":0.25},
-        {"label":"7", "x":13.25, "y":0.125},
-        {"label":"8", "x":14.25, "y":0},
-        {"label":"9", "x":15.25, "y":0.125},
-        {"label":"0", "x":16.25, "y":0.375},
-        {"label":"_Nav || -", "x":17.25, "y":0.375, "w":1.25},
+        {"matrix": [0, 8], "x": 12.25, "y": 0.25},
+        {"matrix": [0, 9], "x": 13.25, "y": 0.125},
+        {"matrix": [0, 10], "x": 14.25, "y": 0},
+        {"matrix": [0, 11], "x": 15.25, "y": 0.125},
+        {"matrix": [0, 12], "x": 16.25, "y": 0.375},
+        {"matrix": [0, 13], "x": 17.25, "y": 0.375, "w": 1.25},
 
-        {"label":"Tab", "x":0, "y":1.375, "w":1.25},
-        {"label":"Q", "x":1.25, "y":1.375},
-        {"label":"W", "x":2.25, "y":1.125},
-        {"label":"E", "x":3.25, "y":1},
-        {"label":"R", "x":4.25, "y":1.125},
-        {"label":"T", "x":5.25, "y":1.25},
-        {"label":"MO(_SYMB)", "x":6.25, "y":0.75},
+        {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.25},
+        {"matrix": [1, 1], "x": 1.25, "y": 1.375},
+        {"matrix": [1, 2], "x": 2.25, "y": 1.125},
+        {"matrix": [1, 3], "x": 3.25, "y": 1},
+        {"matrix": [1, 4], "x": 4.25, "y": 1.125},
+        {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+        {"matrix": [0, 6], "x": 6.25, "y": 0.75},
 
-        {"label":"MO(_SYMB)", "x":11.25, "y":0.75},
-        {"label":"Y", "x":12.25, "y":1.25},
-        {"label":"U", "x":13.25, "y":1.125},
-        {"label":"I", "x":14.25, "y":1},
-        {"label":"O", "x":15.25, "y":1.125},
-        {"label":"P", "x":16.25, "y":1.375},
-        {"label":"=", "x":17.25, "y":1.375, "w":1.25},
+        {"matrix": [0, 7], "x": 11.25, "y": 0.75},
+        {"matrix": [1, 8], "x": 12.25, "y": 1.25},
+        {"matrix": [1, 9], "x": 13.25, "y": 1.125},
+        {"matrix": [1, 10], "x": 14.25, "y": 1},
+        {"matrix": [1, 11], "x": 15.25, "y": 1.125},
+        {"matrix": [1, 12], "x": 16.25, "y": 1.375},
+        {"matrix": [1, 13], "x": 17.25, "y": 1.375, "w": 1.25},
 
-        {"label":"Esc", "x":0, "y":2.375, "w":1.25},
-        {"label":"A", "x":1.25, "y":2.375},
-        {"label":"S", "x":2.25, "y":2.125},
-        {"label":"D", "x":3.25, "y":2},
-        {"label":"F", "x":4.25, "y":2.125},
-        {"label":"G", "x":5.25, "y":2.25},
-        {"label":"[", "x":6.25, "y":1.75, "h":1.5},
+        {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.25},
+        {"matrix": [2, 1], "x": 1.25, "y": 2.375},
+        {"matrix": [2, 2], "x": 2.25, "y": 2.125},
+        {"matrix": [2, 3], "x": 3.25, "y": 2},
+        {"matrix": [2, 4], "x": 4.25, "y": 2.125},
+        {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+        {"matrix": [1, 6], "x": 6.25, "y": 1.75, "h": 1.5},
 
-        {"label":"]", "x":11.25, "y":1.75, "h":1.5},
-        {"label":"H", "x":12.25, "y":2.25},
-        {"label":"J", "x":13.25, "y":2.125},
-        {"label":"K", "x":14.25, "y":2},
-        {"label":"L", "x":15.25, "y":2.125},
-        {"label":";", "x":16.25, "y":2.375},
-        {"label":"'", "x":17.25, "y":2.375, "w":1.25},
+        {"matrix": [1, 7], "x": 11.25, "y": 1.75, "h": 1.5},
+        {"matrix": [2, 8], "x": 12.25, "y": 2.25},
+        {"matrix": [2, 9], "x": 13.25, "y": 2.125},
+        {"matrix": [2, 10], "x": 14.25, "y": 2},
+        {"matrix": [2, 11], "x": 15.25, "y": 2.125},
+        {"matrix": [2, 12], "x": 16.25, "y": 2.375},
+        {"matrix": [2, 13], "x": 17.25, "y": 2.375, "w": 1.25},
 
-        {"label":"Shift", "x":0, "y":3.375, "w":1.25},
-        {"label":"Z", "x":1.25, "y":3.375},
-        {"label":"X", "x":2.25, "y":3.125},
-        {"label":"C", "x":3.25, "y":3},
-        {"label":"V", "x":4.25, "y":3.125},
-        {"label":"B", "x":5.25, "y":3.25},
+        {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.25, "y": 3.375},
+        {"matrix": [3, 2], "x": 2.25, "y": 3.125},
+        {"matrix": [3, 3], "x": 3.25, "y": 3},
+        {"matrix": [3, 4], "x": 4.25, "y": 3.125},
+        {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+        {"matrix": [2, 6], "x": 6.75, "y": 3.75},
+        {"matrix": [3, 6], "x": 7.75, "y": 3.75},
 
-        {"label":"_Adjust/Page Up", "x":6.75, "y":3.75},
-        {"label":"Page Down", "x":7.75, "y":3.75},
+        {"matrix": [3, 7], "x": 9.75, "y": 3.75},
+        {"matrix": [2, 7], "x": 10.75, "y": 3.75},
+        {"matrix": [3, 8], "x": 12.25, "y": 3.25},
+        {"matrix": [3, 9], "x": 13.25, "y": 3.125},
+        {"matrix": [3, 10], "x": 14.25, "y": 3},
+        {"matrix": [3, 11], "x": 15.25, "y": 3.125},
+        {"matrix": [3, 12], "x": 16.25, "y": 3.375},
+        {"matrix": [3, 13], "x": 17.25, "y": 3.375, "w": 1.25},
 
-        {"label":"Home", "x":9.75, "y":3.75},
-        {"label":"_Adjust/End", "x":10.75, "y":3.75},
+        {"matrix": [4, 0], "x": 0.25, "y": 4.375},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.375},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.125},
+        {"matrix": [4, 3], "x": 3.25, "y": 4},
+        {"matrix": [4, 4], "x": 5.5, "y": 5.25, "w": 1.25},
+        {"matrix": [4, 5], "x": 6.75, "y": 4.75, "h": 1.5},
+        {"matrix": [4, 6], "x": 7.75, "y": 4.75, "h": 1.5},
 
-        {"label":"N", "x":12.25, "y":3.25},
-        {"label":"M", "x":13.25, "y":3.125},
-        {"label":",", "x":14.25, "y":3},
-        {"label":",", "x":15.25, "y":3.125},
-        {"label":"\\", "x":16.25, "y":3.375},
-        {"label":"Shift", "x":17.25, "y":3.375, "w":1.25},
-
-        {"label":"LGUI", "x":0.25, "y":4.375},
-        {"label":"P+", "x":1.25, "y":4.375},
-        {"label":"P-", "x":2.25, "y":4.125},
-        {"label":"LAlt || P*", "x":3.25, "y":4},
-
-        {"label":"LCtrl || P/", "x":5.5, "y":5.25, "w":1.25},
-        {"label":"Backspace", "x":6.75, "y":4.75, "h":1.5},
-        {"label":"Delete", "x":7.75, "y":4.75, "h":1.5},
-
-        {"label":"Enter", "x":9.75, "y":4.75, "h":1.5},
-        {"label":"Space", "x":10.75, "y":4.75, "h":1.5},
-        {"label":"RAlt", "x":11.75, "y":5.25, "w":1.25},
-
-        {"label":"Left", "x":14.25, "y":4},
-        {"label":"Down", "x":15.25, "y":4.125},
-        {"label":"Up", "x":16.25, "y":4.375},
-        {"label":"Right", "x":17.25, "y":4.375}
+        {"matrix": [4, 7], "x": 9.75, "y": 4.75, "h": 1.5},
+        {"matrix": [4, 8], "x": 10.75, "y": 4.75, "h": 1.5},
+        {"matrix": [4, 9], "x": 11.75, "y": 5.25, "w": 1.25},
+        {"matrix": [4, 10], "x": 14.25, "y": 4},
+        {"matrix": [4, 11], "x": 15.25, "y": 4.125},
+        {"matrix": [4, 12], "x": 16.25, "y": 4.375},
+        {"matrix": [4, 13], "x": 17.25, "y": 4.375}
       ]
     }
   }
diff --git a/keyboards/redox_w/redox_w.h b/keyboards/redox_w/redox_w.h
index 1ed42c8458..086c8aae31 100644
--- a/keyboards/redox_w/redox_w.h
+++ b/keyboards/redox_w/redox_w.h
@@ -16,21 +16,3 @@
 #define set_led_blue    red_led_off; grn_led_off; blu_led_on;  wht_led_off
 #define set_led_green   red_led_off; grn_led_on;  blu_led_off; wht_led_off
 #define set_led_white   red_led_off;  grn_led_off;  blu_led_off; wht_led_on
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-  k00, k01, k02, k03, k04, k05,                          k08, k09, k10, k11, k12, k13, \
-  k14, k15, k16, k17, k18, k19, k06,                k07, k22, k23, k24, k25, k26, k27, \
-  k28, k29, k30, k31, k32, k33, k20,                k21, k36, k37, k38, k39, k40, k41, \
-  k42, k43, k44, k45, k46, k47, k34, k48,      k49, k35, k50, k51, k52, k53, k54, k55, \
-  k56, k57, k58, k59,    k60,   k61, k62,      k63, k64,   k65,    k66, k67, k68, k69  \
-) \
-{ \
-	{ 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, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41 }, \
-	{ k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55 }, \
-	{ k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }  \
-}