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

3 files changed, 60 insertions, 95 deletions

diff --git a/keyboards/xenon/info.json b/keyboards/xenon/info.json
index 0e3cb5af10..2bc916fde4 100644
--- a/keyboards/xenon/info.json
+++ b/keyboards/xenon/info.json
@@ -26,64 +26,69 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":0, "y":0.75},
-        {"x":1, "y":0.75},
-        {"x":2, "y":0.25},
-        {"x":3, "y":0},
-        {"x":4, "y":0.25},
-        {"x":5, "y":0.5},
-        {"x":9, "y":0.5},
-        {"x":10, "y":0.25},
-        {"x":11, "y":0},
-        {"x":12, "y":0.25},
-        {"x":13, "y":0.75},
-        {"x":14, "y":0.75},
+        {"matrix": [0, 6], "x": 0, "y": 0.75},
+        {"matrix": [0, 5], "x": 1, "y": 0.75},
+        {"matrix": [0, 4], "x": 2, "y": 0.25},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 2], "x": 4, "y": 0.25},
+        {"matrix": [0, 1], "x": 5, "y": 0.5},
 
-        {"x":0, "y":1.75},
-        {"x":1, "y":1.75},
-        {"x":2, "y":1.25},
-        {"x":3, "y":1},
-        {"x":4, "y":1.25},
-        {"x":5, "y":1.5},
-        {"x":9, "y":1.5},
-        {"x":10, "y":1.25},
-        {"x":11, "y":1},
-        {"x":12, "y":1.25},
-        {"x":13, "y":1.75},
-        {"x":14, "y":1.75},
+        {"matrix": [5, 1], "x": 9, "y": 0.5},
+        {"matrix": [5, 2], "x": 10, "y": 0.25},
+        {"matrix": [5, 3], "x": 11, "y": 0},
+        {"matrix": [5, 4], "x": 12, "y": 0.25},
+        {"matrix": [5, 5], "x": 13, "y": 0.75},
+        {"matrix": [5, 6], "x": 14, "y": 0.75},
 
-        {"x":0, "y":2.75},
-        {"x":1, "y":2.75},
-        {"x":2, "y":2.25},
-        {"x":3, "y":2},
-        {"x":4, "y":2.25},
-        {"x":5, "y":2.5},
-        {"x":9, "y":2.5},
-        {"x":10, "y":2.25},
-        {"x":11, "y":2},
-        {"x":12, "y":2.25},
-        {"x":13, "y":2.75},
-        {"x":14, "y":2.75},
+        {"matrix": [1, 6], "x": 0, "y": 1.75},
+        {"matrix": [1, 5], "x": 1, "y": 1.75},
+        {"matrix": [1, 4], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 2], "x": 4, "y": 1.25},
+        {"matrix": [1, 1], "x": 5, "y": 1.5},
 
-        {"x":2, "y":3.25},
-        {"x":3, "y":3},
-        {"x":4, "y":3.25},
-        {"x":5, "y":3.5},
-        {"x":6, "y":3.5},
-        {"x":8, "y":3.5},
-        {"x":9, "y":3.5},
-        {"x":10, "y":3.25},
-        {"x":11, "y":3},
-        {"x":12, "y":3.25},
+        {"matrix": [6, 1], "x": 9, "y": 1.5},
+        {"matrix": [6, 2], "x": 10, "y": 1.25},
+        {"matrix": [6, 3], "x": 11, "y": 1},
+        {"matrix": [6, 4], "x": 12, "y": 1.25},
+        {"matrix": [6, 5], "x": 13, "y": 1.75},
+        {"matrix": [6, 6], "x": 14, "y": 1.75},
 
-        {"x":3, "y":4},
-        {"x":4, "y":4.25},
-        {"x":5, "y":4.5},
-        {"x":6, "y":4.5},
-        {"x":8, "y":4.5},
-        {"x":9, "y":4.5},
-        {"x":10, "y":4.25},
-        {"x":11, "y":4}
+        {"matrix": [2, 6], "x": 0, "y": 2.75},
+        {"matrix": [2, 5], "x": 1, "y": 2.75},
+        {"matrix": [2, 4], "x": 2, "y": 2.25},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 2], "x": 4, "y": 2.25},
+        {"matrix": [2, 1], "x": 5, "y": 2.5},
+
+        {"matrix": [7, 1], "x": 9, "y": 2.5},
+        {"matrix": [7, 2], "x": 10, "y": 2.25},
+        {"matrix": [7, 3], "x": 11, "y": 2},
+        {"matrix": [7, 4], "x": 12, "y": 2.25},
+        {"matrix": [7, 5], "x": 13, "y": 2.75},
+        {"matrix": [7, 6], "x": 14, "y": 2.75},
+
+        {"matrix": [3, 4], "x": 2, "y": 3.25},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 2], "x": 4, "y": 3.25},
+        {"matrix": [3, 1], "x": 5, "y": 3.5},
+        {"matrix": [3, 0], "x": 6, "y": 3.5},
+
+        {"matrix": [8, 0], "x": 8, "y": 3.5},
+        {"matrix": [8, 1], "x": 9, "y": 3.5},
+        {"matrix": [8, 2], "x": 10, "y": 3.25},
+        {"matrix": [8, 3], "x": 11, "y": 3},
+        {"matrix": [8, 4], "x": 12, "y": 3.25},
+
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 2], "x": 4, "y": 4.25},
+        {"matrix": [4, 1], "x": 5, "y": 4.5},
+        {"matrix": [4, 0], "x": 6, "y": 4.5},
+
+        {"matrix": [9, 0], "x": 8, "y": 4.5},
+        {"matrix": [9, 1], "x": 9, "y": 4.5},
+        {"matrix": [9, 2], "x": 10, "y": 4.25},
+        {"matrix": [9, 3], "x": 11, "y": 4}
       ]
     }
   }
diff --git a/keyboards/xenon/xenon.c b/keyboards/xenon/xenon.c
index 9ca5720776..e298c6667f 100644
--- a/keyboards/xenon/xenon.c
+++ b/keyboards/xenon/xenon.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "xenon.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/xenon/xenon.h b/keyboards/xenon/xenon.h
deleted file mode 100644
index 030d9bcb8c..0000000000
--- a/keyboards/xenon/xenon.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 Kyrre Havik Eriksen
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05,              R06, R07, R08, R09, R10, R11, \
-    L12, L13, L14, L15, L16, L17,              R18, R19, R20, R21, R22, R23, \
-    L24, L25, L26, L27, L28, L29,              R30, R31, R32, R33, R34, R35, \
-              L36, L37, L38, L39, L40,    R41, R42, R43, R44, R45,	     \
-                   L46, L47, L48, L49,    R50, R51, R52, R53		     \
-) \
-{ \
-    { XXX, L05, L04, L03, L02, L01, L00 }, \
-    { XXX, L17, L16, L15, L14, L13, L12 }, \
-    { XXX, L29, L28, L27, L26, L25, L24 }, \
-    { L40, L39, L38, L37, L36, XXX, XXX }, \
-    { L49, L48, L47, L46, XXX, XXX, XXX }, \
-    { XXX, R06, R07, R08, R09, R10, R11 }, \
-    { XXX, R18, R19, R20, R21, R22, R23 }, \
-    { XXX, R30, R31, R32, R33, R34, R35 }, \
-    { R41, R42, R43, R44, R45, XXX, XXX }, \
-    { R50, R51, R52, R53, XXX, XXX, XXX }  \
-}