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

2 files changed, 44 insertions, 79 deletions

diff --git a/keyboards/handwired/swiftrax/unsplit/info.json b/keyboards/handwired/swiftrax/unsplit/info.json
index ea28d0d9c5..b651d29835 100644
--- a/keyboards/handwired/swiftrax/unsplit/info.json
+++ b/keyboards/handwired/swiftrax/unsplit/info.json
@@ -18,57 +18,57 @@
     "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.375},
+                {"matrix": [0, 0], "x": 0, "y": 0.75},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"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.375},
 
-                {"x":11, "y":0.375},
-                {"x":12, "y":0.25},
-                {"x":13, "y":0},
-                {"x":14, "y":0.25},
-                {"x":15, "y":0.75},
-                {"x":16, "y":0.75},
+                {"matrix": [0, 6], "x": 11, "y": 0.375},
+                {"matrix": [0, 7], "x": 12, "y": 0.25},
+                {"matrix": [0, 8], "x": 13, "y": 0},
+                {"matrix": [0, 9], "x": 14, "y": 0.25},
+                {"matrix": [0, 10], "x": 15, "y": 0.75},
+                {"matrix": [0, 11], "x": 16, "y": 0.75},
 
-                {"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.375},
+                {"matrix": [1, 0], "x": 0, "y": 1.75},
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"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.375},
 
-                {"x":11, "y":1.375},
-                {"x":12, "y":1.25},
-                {"x":13, "y":1},
-                {"x":14, "y":1.25},
-                {"x":15, "y":1.75},
-                {"x":16, "y":1.75},
+                {"matrix": [1, 6], "x": 11, "y": 1.375},
+                {"matrix": [1, 7], "x": 12, "y": 1.25},
+                {"matrix": [1, 8], "x": 13, "y": 1},
+                {"matrix": [1, 9], "x": 14, "y": 1.25},
+                {"matrix": [1, 10], "x": 15, "y": 1.75},
+                {"matrix": [1, 11], "x": 16, "y": 1.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.375},
+                {"matrix": [2, 0], "x": 0, "y": 2.75},
+                {"matrix": [2, 1], "x": 1, "y": 2.75},
+                {"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.375},
 
-                {"x":11, "y":2.375},
-                {"x":12, "y":2.25},
-                {"x":13, "y":2},
-                {"x":14, "y":2.25},
-                {"x":15, "y":2.75},
-                {"x":16, "y":2.75},
+                {"matrix": [2, 6], "x": 11, "y": 2.375},
+                {"matrix": [2, 7], "x": 12, "y": 2.25},
+                {"matrix": [2, 8], "x": 13, "y": 2},
+                {"matrix": [2, 9], "x": 14, "y": 2.25},
+                {"matrix": [2, 10], "x": 15, "y": 2.75},
+                {"matrix": [2, 11], "x": 16, "y": 2.75},
 
-                {"x":2.5, "y":3.25},
-                {"x":3.5, "y":3.25},
-                {"x":4.5, "y":3.5},
-                {"x":5.5, "y":3.75},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.75},
 
-                {"x":10.5, "y":3.75},
-                {"x":11.5, "y":3.5},
-                {"x":12.5, "y":3.25},
-                {"x":13.5, "y":3.25}
+                {"matrix": [3, 6], "x": 10.5, "y": 3.75},
+                {"matrix": [3, 7], "x": 11.5, "y": 3.5},
+                {"matrix": [3, 8], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 13.5, "y": 3.25}
             ]
         }
     }
diff --git a/keyboards/handwired/swiftrax/unsplit/unsplit.h b/keyboards/handwired/swiftrax/unsplit/unsplit.h
deleted file mode 100644
index 79109edb7b..0000000000
--- a/keyboards/handwired/swiftrax/unsplit/unsplit.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2020 Swiftrax <swiftrax@gmail.com>
-
-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"
-
-// readability
-#define XXX KC_NO
-
-#define LAYOUT( \
-    K000, K001, K002, K003, K004, K005,                               K011, K012, K013, K014, K015, K016, \
-    K100, K101, K102, K103, K104, K105,                               K111, K112, K113, K114, K115, K116, \
-    K200, K201, K202, K203, K204, K205,                               K211, K212, K213, K214, K215, K216, \
-                K402, K403, K404, K405,                               K411, K412, K413, K414  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K011,  K012,  K013,  K014,  K015,  K016 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K111,  K112,  K113,  K114,  K115,  K116 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K211,  K212,  K213,  K214,  K215,  K216 }, \
-    { XXX,    XXX,  K402,  K403,  K404,  K405,  K411,  K412,  K413,  K414,   XXX,   XXX }  \
-}