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

3 files changed, 51 insertions, 68 deletions

diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json
index b6598be8e8..91fe9e1cf4 100644
--- a/keyboards/handwired/traveller/info.json
+++ b/keyboards/handwired/traveller/info.json
@@ -21,63 +21,63 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 1.2},
-                {"x": 1, "y": 0.8},
-                {"x": 2, "y": 0.4},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0.4},
-                {"x": 5, "y": 0.8},
+                {"matrix": [0, 0], "x": 0, "y": 1.2},
+                {"matrix": [0, 1], "x": 1, "y": 0.8},
+                {"matrix": [0, 2], "x": 2, "y": 0.4},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.4},
+                {"matrix": [0, 5], "x": 5, "y": 0.8},
 
-                {"x": 9, "y": 0.8},
-                {"x": 10, "y": 0.4},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0.4},
-                {"x": 13, "y": 0.8},
-                {"x": 14, "y": 1.2},
+                {"matrix": [0, 7], "x": 9, "y": 0.8},
+                {"matrix": [0, 8], "x": 10, "y": 0.4},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0.4},
+                {"matrix": [0, 11], "x": 13, "y": 0.8},
+                {"matrix": [0, 12], "x": 14, "y": 1.2},
 
-                {"x": 0, "y": 2.2},
-                {"x": 1, "y": 1.8},
-                {"x": 2, "y": 1.4},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1.4},
-                {"x": 5, "y": 1.8},
+                {"matrix": [1, 0], "x": 0, "y": 2.2},
+                {"matrix": [1, 1], "x": 1, "y": 1.8},
+                {"matrix": [1, 2], "x": 2, "y": 1.4},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.4},
+                {"matrix": [1, 5], "x": 5, "y": 1.8},
 
-                {"x": 9, "y": 1.8},
-                {"x": 10, "y": 1.4},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1.4},
-                {"x": 13, "y": 1.8},
-                {"x": 14, "y": 2.2},
+                {"matrix": [1, 7], "x": 9, "y": 1.8},
+                {"matrix": [1, 8], "x": 10, "y": 1.4},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1.4},
+                {"matrix": [1, 11], "x": 13, "y": 1.8},
+                {"matrix": [1, 12], "x": 14, "y": 2.2},
 
-                {"x": 0, "y": 3.2},
-                {"x": 1, "y": 2.8},
-                {"x": 2, "y": 2.4},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2.4},
-                {"x": 5, "y": 2.8},
+                {"matrix": [2, 0], "x": 0, "y": 3.2},
+                {"matrix": [2, 1], "x": 1, "y": 2.8},
+                {"matrix": [2, 2], "x": 2, "y": 2.4},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.4},
+                {"matrix": [2, 5], "x": 5, "y": 2.8},
 
-                {"x": 9, "y": 2.8},
-                {"x": 10, "y": 2.4},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2.4},
-                {"x": 13, "y": 2.8},
-                {"x": 14, "y": 3.2},
+                {"matrix": [2, 7], "x": 9, "y": 2.8},
+                {"matrix": [2, 8], "x": 10, "y": 2.4},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2.4},
+                {"matrix": [2, 11], "x": 13, "y": 2.8},
+                {"matrix": [2, 12], "x": 14, "y": 3.2},
 
-                {"x": 0, "y": 4.2},
-                {"x": 1, "y": 3.8},
-                {"x": 2, "y": 3.4},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3.4},
-                {"x": 5, "y": 3.8},
-                {"x": 6, "y": 3.05, "h": 1.5},
+                {"matrix": [3, 0], "x": 0, "y": 4.2},
+                {"matrix": [3, 1], "x": 1, "y": 3.8},
+                {"matrix": [3, 2], "x": 2, "y": 3.4},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3.4},
+                {"matrix": [3, 5], "x": 5, "y": 3.8},
+                {"matrix": [2, 6], "x": 6, "y": 3.05, "h": 1.5},
 
-                {"x": 8, "y": 3.05, "h": 1.5},
-                {"x": 9, "y": 3.8},
-                {"x": 10, "y": 3.4},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3.4},
-                {"x": 13, "y": 3.8},
-                {"x": 14, "y": 4.2}
+                {"matrix": [3, 6], "x": 8, "y": 3.05, "h": 1.5},
+                {"matrix": [3, 7], "x": 9, "y": 3.8},
+                {"matrix": [3, 8], "x": 10, "y": 3.4},
+                {"matrix": [3, 9], "x": 11, "y": 3},
+                {"matrix": [3, 10], "x": 12, "y": 3.4},
+                {"matrix": [3, 11], "x": 13, "y": 3.8},
+                {"matrix": [3, 12], "x": 14, "y": 4.2}
             ]
         }
     }
diff --git a/keyboards/handwired/traveller/traveller.c b/keyboards/handwired/traveller/traveller.c
index 409abe7d14..91c6f603b1 100644
--- a/keyboards/handwired/traveller/traveller.c
+++ b/keyboards/handwired/traveller/traveller.c
@@ -1,4 +1,4 @@
-#include "traveller.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
     // put your keyboard start-up code here
diff --git a/keyboards/handwired/traveller/traveller.h b/keyboards/handwired/traveller/traveller.h
deleted file mode 100644
index f78abe46aa..0000000000
--- a/keyboards/handwired/traveller/traveller.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05,           k07, k08, k09, k0A, k0B, k0C, \
-    k10, k11, k12, k13, k14, k15,           k17, k18, k19, k1A, k1B, k1C, \
-    k20, k21, k22, k23, k24, k25,           k27, k28, k29, k2A, k2B, k2C, \
-    k30, k31, k32, k33, k34, k35, k26, k36, k37, k38, k39, k3A, k3B, k3C  \
-) { \
-    { k00, k01, k02, k03, k04, k05, XXX, k07, k08, k09, k0A, k0B, k0C }, \
-    { k10, k11, k12, k13, k14, k15, XXX, k17, k18, k19, k1A, k1B, k1C }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C } \
-}