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

3 files changed, 51 insertions, 72 deletions

diff --git a/keyboards/handwired/atreus50/atreus50.c b/keyboards/handwired/atreus50/atreus50.c
index 225a51bcce..7b4e6f9586 100644
--- a/keyboards/handwired/atreus50/atreus50.c
+++ b/keyboards/handwired/atreus50/atreus50.c
@@ -1,4 +1,4 @@
-#include "atreus50.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
 
diff --git a/keyboards/handwired/atreus50/atreus50.h b/keyboards/handwired/atreus50/atreus50.h
deleted file mode 100644
index 710292a187..0000000000
--- a/keyboards/handwired/atreus50/atreus50.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15,           k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25,           k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, kM0, kM1, k36, k37, k38, k39, k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, XXX, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, XXX, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, kM0, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, kM1, k36, k37, k38, k39, k3A, k3B } \
-}
-
-#define KC_ KC_TRNS
diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/info.json
index 70cb5aa1f2..cb1d6f6f0a 100644
--- a/keyboards/handwired/atreus50/info.json
+++ b/keyboards/handwired/atreus50/info.json
@@ -21,63 +21,63 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"Tab", "x":0, "y":0.5},
-        {"label":"Q", "x":1, "y":0.5},
-        {"label":"W", "x":2, "y":0.25},
-        {"label":"E", "x":3, "y":0},
-        {"label":"R", "x":4, "y":0.25},
-        {"label":"T", "x":5, "y":0.5},
+        {"matrix": [0, 0], "x": 0, "y": 0.5},
+        {"matrix": [0, 1], "x": 1, "y": 0.5},
+        {"matrix": [0, 2], "x": 2, "y": 0.25},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0.25},
+        {"matrix": [0, 5], "x": 5, "y": 0.5},
 
-        {"label":"Y", "x":9, "y":0.5},
-        {"label":"U", "x":10, "y":0.25},
-        {"label":"I", "x":11, "y":0},
-        {"label":"O", "x":12, "y":0.25},
-        {"label":"P", "x":13, "y":0.5},
-        {"label":"-", "x":14, "y":0.5},
+        {"matrix": [0, 7], "x": 9, "y": 0.5},
+        {"matrix": [0, 8], "x": 10, "y": 0.25},
+        {"matrix": [0, 9], "x": 11, "y": 0},
+        {"matrix": [0, 10], "x": 12, "y": 0.25},
+        {"matrix": [0, 11], "x": 13, "y": 0.5},
+        {"matrix": [0, 12], "x": 14, "y": 0.5},
 
-        {"label":"Ctrl/Esc", "x":0, "y":1.5},
-        {"label":"A", "x":1, "y":1.5},
-        {"label":"S", "x":2, "y":1.25},
-        {"label":"D", "x":3, "y":1},
-        {"label":"F", "x":4, "y":1.25},
-        {"label":"G", "x":5, "y":1.5},
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
 
-        {"label":"H", "x":9, "y":1.5},
-        {"label":"J", "x":10, "y":1.25},
-        {"label":"K", "x":11, "y":1},
-        {"label":"L", "x":12, "y":1.25},
-        {"label":";", "x":13, "y":1.5},
-        {"label":"'", "x":14, "y":1.5},
+        {"matrix": [1, 7], "x": 9, "y": 1.5},
+        {"matrix": [1, 8], "x": 10, "y": 1.25},
+        {"matrix": [1, 9], "x": 11, "y": 1},
+        {"matrix": [1, 10], "x": 12, "y": 1.25},
+        {"matrix": [1, 11], "x": 13, "y": 1.5},
+        {"matrix": [1, 12], "x": 14, "y": 1.5},
 
-        {"label":"LShift", "x":0, "y":2.5},
-        {"label":"Z", "x":1, "y":2.5},
-        {"label":"X", "x":2, "y":2.25},
-        {"label":"C", "x":3, "y":2},
-        {"label":"V", "x":4, "y":2.25},
-        {"label":"B", "x":5, "y":2.5},
+        {"matrix": [2, 0], "x": 0, "y": 2.5},
+        {"matrix": [2, 1], "x": 1, "y": 2.5},
+        {"matrix": [2, 2], "x": 2, "y": 2.25},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2.25},
+        {"matrix": [2, 5], "x": 5, "y": 2.5},
 
-        {"label":"N", "x":9, "y":2.5},
-        {"label":"M", "x":10, "y":2.25},
-        {"label":",", "x":11, "y":2},
-        {"label":".", "x":12, "y":2.25},
-        {"label":"/", "x":13, "y":2.5},
-        {"label":"Shift/Enter", "x":14, "y":2.5},
+        {"matrix": [2, 7], "x": 9, "y": 2.5},
+        {"matrix": [2, 8], "x": 10, "y": 2.25},
+        {"matrix": [2, 9], "x": 11, "y": 2},
+        {"matrix": [2, 10], "x": 12, "y": 2.25},
+        {"matrix": [2, 11], "x": 13, "y": 2.5},
+        {"matrix": [2, 12], "x": 14, "y": 2.5},
 
-        {"label":"`", "x":0, "y":3.5},
-        {"label":"LCtrl", "x":1, "y":3.5},
-        {"label":"LAlt", "x":2, "y":3.25},
-        {"label":"LGUI", "x":3, "y":3},
-        {"label":"Lower", "x":4, "y":3.25},
-        {"label":"Space", "x":5, "y":3.5},
-        {"label":"Fn", "x":6, "y":2.75, "h":1.5},
+        {"matrix": [3, 0], "x": 0, "y": 3.5},
+        {"matrix": [3, 1], "x": 1, "y": 3.5},
+        {"matrix": [3, 2], "x": 2, "y": 3.25},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3.25},
+        {"matrix": [3, 5], "x": 5, "y": 3.5},
+        {"matrix": [2, 6], "x": 6, "y": 2.75, "h": 1.5},
 
-        {"label":"RShift", "x":8, "y":2.75, "h":1.5},
-        {"label":"Back Space", "x":9, "y":3.5},
-        {"label":"Raise", "x":10, "y":3.25},
-        {"label":"Left", "x":11, "y":3},
-        {"label":"Down", "x":12, "y":3.25},
-        {"label":"Up", "x":13, "y":3.5},
-        {"label":"Right", "x":14, "y":3.5}
+        {"matrix": [3, 6], "x": 8, "y": 2.75, "h": 1.5},
+        {"matrix": [3, 7], "x": 9, "y": 3.5},
+        {"matrix": [3, 8], "x": 10, "y": 3.25},
+        {"matrix": [3, 9], "x": 11, "y": 3},
+        {"matrix": [3, 10], "x": 12, "y": 3.25},
+        {"matrix": [3, 11], "x": 13, "y": 3.5},
+        {"matrix": [3, 12], "x": 14, "y": 3.5}
       ]
     }
   }