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

2 files changed, 91 insertions, 111 deletions

diff --git a/keyboards/orange75/info.json b/keyboards/orange75/info.json
index dba6b25208..59665c2cb0 100644
--- a/keyboards/orange75/info.json
+++ b/keyboards/orange75/info.json
@@ -21,88 +21,97 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":2, "y":0},
-                {"label":"F2", "x":3, "y":0},
-                {"label":"F3", "x":4, "y":0},
-                {"label":"F4", "x":5, "y":0},
-                {"label":"F5", "x":6.5, "y":0},
-                {"label":"F6", "x":7.5, "y":0},
-                {"label":"F7", "x":8.5, "y":0},
-                {"label":"F8", "x":9.5, "y":0},
-                {"label":"F9", "x":11, "y":0},
-                {"label":"F10", "x":12, "y":0},
-                {"label":"F11", "x":13, "y":0},
-                {"label":"F12", "x":14, "y":0},
-                {"label":"`", "x":0, "y":1.25},
-                {"label":"1", "x":1, "y":1.25},
-                {"label":"2", "x":2, "y":1.25},
-                {"label":"3", "x":3, "y":1.25},
-                {"label":"4", "x":4, "y":1.25},
-                {"label":"5", "x":5, "y":1.25},
-                {"label":"6", "x":6, "y":1.25},
-                {"label":"7", "x":7, "y":1.25},
-                {"label":"8", "x":8, "y":1.25},
-                {"label":"9", "x":9, "y":1.25},
-                {"label":"0", "x":10, "y":1.25},
-                {"label":"-", "x":11, "y":1.25},
-                {"label":"=", "x":12, "y":1.25},
-                {"label":"Delete", "x":13, "y":1.25},
-                {"label":"Back Space", "x":14, "y":1.25},
-                {"label":"Home", "x":15, "y":1.25},
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"[", "x":11.5, "y":2.25},
-                {"label":"]", "x":12.5, "y":2.25},
-                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"End", "x":15, "y":2.25},
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":";", "x":10.75, "y":3.25},
-                {"label":"'", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"PgUp", "x":15, "y":3.25},
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"ISO\\", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":",", "x":9.25, "y":4.25},
-                {"label":".", "x":10.25, "y":4.25},
-                {"label":"/", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Up", "x":14, "y":4.25},
-                {"label":"PgDn", "x":15, "y":4.25},
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Left", "x":13, "y":5.25},
-                {"label":"Down", "x":14, "y":5.25},
-                {"label":"Right", "x":15, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [2, 0], "x": 2, "y": 0},
+                {"matrix": [3, 0], "x": 3, "y": 0},
+                {"matrix": [4, 0], "x": 4, "y": 0},
+                {"matrix": [5, 0], "x": 5, "y": 0},
+
+                {"matrix": [6, 0], "x": 6.5, "y": 0},
+                {"matrix": [7, 0], "x": 7.5, "y": 0},
+                {"matrix": [8, 0], "x": 8.5, "y": 0},
+                {"matrix": [9, 0], "x": 9.5, "y": 0},
+
+                {"matrix": [10, 0], "x": 11, "y": 0},
+                {"matrix": [11, 0], "x": 12, "y": 0},
+                {"matrix": [12, 0], "x": 13, "y": 0},
+                {"matrix": [13, 0], "x": 14, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [4, 1], "x": 4, "y": 1.25},
+                {"matrix": [5, 1], "x": 5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6, "y": 1.25},
+                {"matrix": [7, 1], "x": 7, "y": 1.25},
+                {"matrix": [8, 1], "x": 8, "y": 1.25},
+                {"matrix": [9, 1], "x": 9, "y": 1.25},
+                {"matrix": [10, 1], "x": 10, "y": 1.25},
+                {"matrix": [11, 1], "x": 11, "y": 1.25},
+                {"matrix": [12, 1], "x": 12, "y": 1.25},
+                {"matrix": [14, 0], "x": 13, "y": 1.25},
+                {"matrix": [13, 1], "x": 14, "y": 1.25},
+                {"matrix": [14, 1], "x": 15, "y": 1.25},
+
+                {"matrix": [0, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [6, 2], "x": 6.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 7.5, "y": 2.25},
+                {"matrix": [8, 2], "x": 8.5, "y": 2.25},
+                {"matrix": [9, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [10, 2], "x": 10.5, "y": 2.25},
+                {"matrix": [11, 2], "x": 11.5, "y": 2.25},
+                {"matrix": [12, 2], "x": 12.5, "y": 2.25},
+                {"matrix": [13, 2], "x": 13.5, "y": 2.25, "w": 1.5},
+                {"matrix": [14, 2], "x": 15, "y": 2.25},
+
+                {"matrix": [0, 3], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [1, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 3], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 3.25},
+                {"matrix": [5, 3], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 8.75, "y": 3.25},
+                {"matrix": [9, 3], "x": 9.75, "y": 3.25},
+                {"matrix": [10, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [11, 3], "x": 11.75, "y": 3.25},
+                {"matrix": [12, 3], "x": 12.75, "y": 3.25, "w": 2.25},
+                {"matrix": [14, 3], "x": 15, "y": 3.25},
+
+                {"matrix": [0, 4], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [1, 4], "x": 1.25, "y": 4.25},
+                {"matrix": [2, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 4], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [5, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [6, 4], "x": 6.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 7.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [10, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [11, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [12, 4], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [13, 4], "x": 14, "y": 4.25},
+                {"matrix": [14, 4], "x": 15, "y": 4.25},
+
+                {"matrix": [0, 5], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [1, 5], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [2, 5], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [12, 5], "x": 13, "y": 5.25},
+                {"matrix": [13, 5], "x": 14, "y": 5.25},
+                {"matrix": [14, 5], "x": 15, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/orange75/orange75.h b/keyboards/orange75/orange75.h
deleted file mode 100644
index a7ddd5a06d..0000000000
--- a/keyboards/orange75/orange75.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K000,       K002, K003, K004, K005,    K006, K007, K008, K009,    K010, K011, K012, K013, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K014, K113, K114, \
-	K200,    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,    K213, K214, \
-	K300,     K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,         K312, K314, \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,    K412,    K413, K414, \
-	K500, K501, K502,                   K506,                   K510, K511,       K512, K513, K514  \
-) { \
-    { K000,  K100,  K200, K300, K400, K500 }, \
-    { KC_NO, K101,  K201, K301, K401, K501 }, \
-    { K002,  K102,  K202, K302, K402, K502 }, \
-    { K003,  K103,  K203, K303, K403, KC_NO}, \
-    { K004,  K104,  K204, K304, K404, KC_NO}, \
-    { K005,  K105,  K205, K305, K405, KC_NO}, \
-    { K006,  K106,  K206, K306, K406, K506 }, \
-    { K007,  K107,  K207, K307, K407, KC_NO}, \
-    { K008,  K108,  K208, K308, K408, KC_NO}, \
-    { K009,  K109,  K209, K309, K409, KC_NO}, \
-    { K010,  K110,  K210, K310, K410, K510 }, \
-    { K011,  K111,  K211, K311, K411, K511 }, \
-    { K012,  K112,  K212, K312, K412, K512 }, \
-    { K013,  K113,  K213, KC_NO,K413, K513 }, \
-    { K014,  K114,  K214, K314, K414, K514 } \
-}
-