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

2 files changed, 132 insertions, 128 deletions

diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/info.json
index 8c617b015b..7f0f34555e 100644
--- a/keyboards/handwired/selene/info.json
+++ b/keyboards/handwired/selene/info.json
@@ -20,117 +20,137 @@
   "bootloader": "stm32-dfu",
   "board": "QMK_PROTON_C",
   "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":"Print", "x":15.25, "y":0},
-				{"label":"Scroll Lock", "x":16.25, "y":0},
-				{"label":"Pause", "x":17.25, "y":0},
-				{"label":"Out", "x":18.5, "y":0},
-				{"label":"+", "x":19.5, "y":0},
-				{"label":"-", "x":20.5, "y":0},
-				{"label":"~", "x":21.5, "y":0},
-				{"label":"~", "x":0, "y":1.5},
-				{"label":"!", "x":1, "y":1.5},
-				{"label":"@", "x":2, "y":1.5},
-				{"label":"#", "x":3, "y":1.5},
-				{"label":"$", "x":4, "y":1.5},
-				{"label":"%", "x":5, "y":1.5},
-				{"label":"^", "x":6, "y":1.5},
-				{"label":"&", "x":7, "y":1.5},
-				{"label":"*", "x":8, "y":1.5},
-				{"label":"(", "x":9, "y":1.5},
-				{"label":")", "x":10, "y":1.5},
-				{"label":"_", "x":11, "y":1.5},
-				{"label":"+", "x":12, "y":1.5},
-				{"label":"<i class=\"fa fa-long-arrow-left\"></i>", "x":13, "y":1.5, "w":2},
-				{"label":"Insert", "x":15.25, "y":1.5},
-				{"label":"Home", "x":16.25, "y":1.5},
-				{"label":"Pg Up", "x":17.25, "y":1.5},
-				{"label":"Num", "x":18.5, "y":1.5},
-				{"label":"\u00f7", "x":19.5, "y":1.5},
-				{"label":"\u00d7", "x":20.5, "y":1.5},
-				{"label":"-", "x":21.5, "y":1.5},
-				{"label":"<i class='kb kb-Line-Start-End'></i>", "x":0, "y":2.5, "w":1.5},
-				{"label":"Q", "x":1.5, "y":2.5},
-				{"label":"W", "x":2.5, "y":2.5},
-				{"label":"E", "x":3.5, "y":2.5},
-				{"label":"R", "x":4.5, "y":2.5},
-				{"label":"T", "x":5.5, "y":2.5},
-				{"label":"Y", "x":6.5, "y":2.5},
-				{"label":"U", "x":7.5, "y":2.5},
-				{"label":"I", "x":8.5, "y":2.5},
-				{"label":"O", "x":9.5, "y":2.5},
-				{"label":"P", "x":10.5, "y":2.5},
-				{"label":"{", "x":11.5, "y":2.5},
-				{"label":"}", "x":12.5, "y":2.5},
-				{"label":"|", "x":13.5, "y":2.5, "w":1.5},
-				{"label":"Delete", "x":15.25, "y":2.5},
-				{"label":"End", "x":16.25, "y":2.5},
-				{"label":"Pg Dn", "x":17.25, "y":2.5},
-				{"label":"7", "x":18.5, "y":2.5},
-				{"label":"8", "x":19.5, "y":2.5},
-				{"label":"9", "x":20.5, "y":2.5},
-				{"label":"+", "x":21.5, "y":2.5, "h":2},
-				{"label":"\u21e9", "x":0, "y":3.5, "w":1.25},
-				{"label":"A", "x":1.75, "y":3.5},
-				{"label":"S", "x":2.75, "y":3.5},
-				{"label":"D", "x":3.75, "y":3.5},
-				{"label":"F", "x":4.75, "y":3.5},
-				{"label":"G", "x":5.75, "y":3.5},
-				{"label":"H", "x":6.75, "y":3.5},
-				{"label":"J", "x":7.75, "y":3.5},
-				{"label":"K", "x":8.75, "y":3.5},
-				{"label":"L", "x":9.75, "y":3.5},
-				{"label":":", "x":10.75, "y":3.5},
-				{"label":"\"", "x":11.75, "y":3.5},
-				{"label":"<i class='kb kb-Return-2'></i>", "x":12.75, "y":3.5, "w":2.25},
-				{"label":"4", "x":18.5, "y":3.5},
-				{"label":"5", "x":19.5, "y":3.5},
-				{"label":"6", "x":20.5, "y":3.5},
-				{"label":"\u21e7", "x":0, "y":4.5, "w":2.25},
-				{"label":"Z", "x":2.25, "y":4.5},
-				{"label":"X", "x":3.25, "y":4.5},
-				{"label":"C", "x":4.25, "y":4.5},
-				{"label":"V", "x":5.25, "y":4.5},
-				{"label":"B", "x":6.25, "y":4.5},
-				{"label":"N", "x":7.25, "y":4.5},
-				{"label":"M", "x":8.25, "y":4.5},
-				{"label":"<", "x":9.25, "y":4.5},
-				{"label":">", "x":10.25, "y":4.5},
-				{"label":"?", "x":11.25, "y":4.5},
-				{"label":"\u21e7", "x":12.25, "y":4.5, "w":2.75},
-				{"label":"\u2191", "x":16.25, "y":4.5},
-				{"label":"1", "x":18.5, "y":4.5},
-				{"label":"2", "x":19.5, "y":4.5},
-				{"label":"3", "x":20.5, "y":4.5},
-				{"label":"<i class='kb kb-Return-2'></i>", "x":21.5, "y":4.5, "h":2},
-				{"label":"Control", "x":0, "y":5.5, "w":1.25},
-				{"label":"Super", "x":1.25, "y":5.5, "w":1.25},
-				{"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
-				{"x":3.75, "y":5.5, "w":6.25},
-				{"label":"Alt", "x":10, "y":5.5, "w":1.25},
-				{"label":"Super", "x":11.25, "y":5.5, "w":1.25},
-				{"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
-				{"label":"Control", "x":13.75, "y":5.5, "w":1.25},
-				{"label":"\u2190", "x":15.25, "y":5.5},
-				{"label":"\u2193", "x":16.25, "y":5.5},
-				{"label":"\u2192", "x":17.25, "y":5.5},
-				{"label":"0", "x":18.5, "y":5.5},
-				{"label":"00", "x":19.5, "y":5.5},
-				{"label":".", "x":20.5, "y":5.5}]
-      }
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+        {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+        {"matrix": [0, 10], "x": 11, "y": 0},
+        {"matrix": [0, 11], "x": 12, "y": 0},
+        {"matrix": [0, 12], "x": 13, "y": 0},
+        {"matrix": [0, 13], "x": 14, "y": 0},
+
+        {"matrix": [0, 14], "x": 15.25, "y": 0},
+        {"matrix": [0, 15], "x": 16.25, "y": 0},
+        {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+        {"matrix": [0, 17], "x": 18.5, "y": 0},
+        {"matrix": [0, 18], "x": 19.5, "y": 0},
+        {"matrix": [0, 19], "x": 20.5, "y": 0},
+        {"matrix": [0, 20], "x": 21.5, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1.5},
+        {"matrix": [1, 2], "x": 2, "y": 1.5},
+        {"matrix": [1, 3], "x": 3, "y": 1.5},
+        {"matrix": [1, 4], "x": 4, "y": 1.5},
+        {"matrix": [1, 5], "x": 5, "y": 1.5},
+        {"matrix": [1, 6], "x": 6, "y": 1.5},
+        {"matrix": [1, 7], "x": 7, "y": 1.5},
+        {"matrix": [1, 8], "x": 8, "y": 1.5},
+        {"matrix": [1, 9], "x": 9, "y": 1.5},
+        {"matrix": [1, 10], "x": 10, "y": 1.5},
+        {"matrix": [1, 11], "x": 11, "y": 1.5},
+        {"matrix": [1, 12], "x": 12, "y": 1.5},
+        {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+        {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+        {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+        {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+        {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+        {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+        {"matrix": [1, 19], "x": 20.5, "y": 1.5},
+        {"matrix": [1, 20], "x": 21.5, "y": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+        {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+        {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+        {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+        {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+        {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+        {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+        {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+        {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+        {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+        {"matrix": [2, 19], "x": 20.5, "y": 2.5},
+        {"matrix": [2, 20], "x": 21.5, "y": 2.5, "h": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.25},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+        {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+        {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+        {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+
+        {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+        {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+        {"matrix": [3, 19], "x": 20.5, "y": 3.5},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+        {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+        {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+        {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+        {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+        {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+        {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+        {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+        {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+        {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+        {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+
+        {"matrix": [4, 15], "x": 16.25, "y": 4.5},
+
+        {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+        {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+        {"matrix": [4, 19], "x": 20.5, "y": 4.5},
+        {"matrix": [4, 20], "x": 21.5, "y": 4.5, "h": 2},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+        {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+        {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25},
+
+        {"matrix": [5, 14], "x": 15.25, "y": 5.5},
+        {"matrix": [5, 15], "x": 16.25, "y": 5.5},
+        {"matrix": [5, 16], "x": 17.25, "y": 5.5},
+
+        {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+        {"matrix": [5, 18], "x": 19.5, "y": 5.5},
+        {"matrix": [5, 19], "x": 20.5, "y": 5.5}
+      ]
+    }
   }
 }
diff --git a/keyboards/handwired/selene/selene.h b/keyboards/handwired/selene/selene.h
index 1cffc76c1b..bcd4215e36 100644
--- a/keyboards/handwired/selene/selene.h
+++ b/keyboards/handwired/selene/selene.h
@@ -21,19 +21,3 @@
 #define NUM_LOCK_PIN A0
 #define CAPS_LOCK_PIN A2
 #define SCROLL_LOCK_PIN A1
-
-#define LAYOUT( \
-	K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, K020, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                   K317, K318, K319,       \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,       K412,             K415,       K417, K418, K419, K420, \
-	K500, K501, K502,             K505,                   K509, K510, K511,       K513, K514, K515, K516, K517, K518, K519  \
-) { \
-	{ K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018,  K019,  K020 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118,  K119,  K120 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215,  K216,  K217,  K218,  K219,  K220 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  KC_NO, KC_NO, KC_NO, K317,  K318,  K319,  KC_NO }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  KC_NO, K412,  KC_NO, KC_NO, K415,  KC_NO, K417,  K418,  K419,  K420 }, \
-	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, K509,  K510,  K511,  KC_NO, K513,  K514,  K515,  K516,  K517,  K518,  K519,  KC_NO }  \
-}