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

2 files changed, 97 insertions, 159 deletions

diff --git a/keyboards/nopunin10did/railroad/rev0/info.json b/keyboards/nopunin10did/railroad/rev0/info.json
index 752078f2f6..04c3f7e5e9 100644
--- a/keyboards/nopunin10did/railroad/rev0/info.json
+++ b/keyboards/nopunin10did/railroad/rev0/info.json
@@ -18,114 +18,103 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"y":0, "x":0, "label":"Scroll"},   
-                {"y":0, "x":1, "label":"Pause"},    
-                {"y":0, "x":2, "label":"Esc"},      
-                {"y":0, "x":3, "label":"`"}, 
-                {"y":0, "x":4, "label":"1"},        
-                {"y":0, "x":5, "label":"2"},    
-                {"y":0, "x":6, "label":"3"},        
-                {"y":0, "x":7, "label":"4"},
-                {"y":0, "x":8, "label":"5"},        
-                {"y":0, "x":9, "label":"-"},
-                    
-                {"y":1, "x":0,   "label":"Print"},    
-                {"y":1, "x":1,   "label":"Backspace", "w":1.5}, 
-                {"y":1, "x":2.5, "label":"Tab", "w":1.5},
-                {"y":1, "x":4,   "label":"Q"},        
-                {"y":1, "x":5,   "label":"W"}, 
-                {"y":1, "x":6,   "label":"E"},        
-                {"y":1, "x":7,   "label":"R"}, 
-                {"y":1, "x":8,   "label":"T"},        
-                {"y":1, "x":9,   "label":"["},
-                
-                {"y":2, "x":0,    "label":"Caps", "w":1.25},
-                {"y":2, "x":1.75, "label":"Control", "w":2.25},
-                {"y":2, "x":4,    "label":"A"},        
-                {"y":2, "x":5,    "label":"S"}, 
-                {"y":2, "x":6,    "label":"D"},
-                {"y":2, "x":7,    "label":"F"}, 
-                {"y":2, "x":8,    "label":"G"},
-                {"y":2, "x":9,    "label":"PgUp"},
-                
-                {"y":3.25, "x":0, "label":"Cut"},
-                {"y":3, "x":1.25, "label":"Shift", "w":2.75},
-                {"y":3,    "x":4, "label":"Z"},        
-                {"y":3,    "x":5, "label":"X"}, 
-                {"y":3,    "x":6, "label":"C"},        
-                {"y":3,    "x":7, "label":"V"}, 
-                {"y":3,    "x":8, "label":"B"},        
-                {"y":3,    "x":9, "label":"PgDn"},
-                
-                {"y":4.25, "x":0,    "label":"Copy"},
-                {"y":4.25, "x":1,    "label":"Paste"},
-                {"y":4, "x":2.25,    "label":"Control", "w":1.5},
-                {"y":4, "x":3.75,    "label":"Super", "w":1.25},
-                {"y":4, "x":5,       "label":"Alt", "w":1.25},
-                {"y":4.25, "x":6.5,  "label":"UK \\|"},
-                {"y":4.25, "x":7.5,  "label":"Space", "w":1.75},
-                {"y":4.25, "x":9.25, "label":"Shift / Del", "w":2.75},
-                
-                {"y":0, "x":10.25, "label":"F1"}, 
-                {"y":0, "x":11.25, "label":"F5"},        
-                {"y":0, "x":12.25, "label":"F9"}, 
-                {"y":1, "x":10.25, "label":"F2"}, 
-                {"y":1, "x":11.25, "label":"F6"},        
-                {"y":1, "x":12.25, "label":"F10"},
-                {"y":2, "x":10.25, "label":"F3"}, 
-                {"y":2, "x":11.25, "label":"F7"},        
-                {"y":2, "x":12.25, "label":"F11"}, 
-                {"y":3, "x":10.25, "label":"F4"}, 
-                {"y":3, "x":11.25, "label":"F8"},        
-                {"y":3, "x":12.25, "label":"F12"},
-                
-                {"y":0, "x":13.5, "label":"="},
-                {"y":0, "x":14.5, "label":"6"},
-                {"y":0, "x":15.5, "label":"7"},
-                {"y":0, "x":16.5, "label":"8"},
-                {"y":0, "x":17.5, "label":"9"},
-                {"y":0, "x":18.5, "label":"0"},
-                {"y":0, "x":19.5, "label":"Backspace", "w":2},
-                {"y":0, "x":21.5, "label":"Ins"},
-                {"y":0, "x":22.5, "label":"Esc"},
-                
-                {"y":1, "x":13.5, "label":"]"},
-                {"y":1, "x":14.5, "label":"Y"},
-                {"y":1, "x":15.5, "label":"U"},
-                {"y":1, "x":16.5, "label":"I"},
-                {"y":1, "x":17.5, "label":"O"},
-                {"y":1, "x":18.5, "label":"P"},
-                {"y":1, "x":19.5, "label":"\\", "w":1.5},
-                {"y":1, "x":21,   "label":"Del"},
-                
-                {"y":2, "x":13.5, "label":"Home"},
-                {"y":2, "x":14.5, "label":"H"},
-                {"y":2, "x":15.5, "label":"J"},
-                {"y":2, "x":16.5, "label":"K"},
-                {"y":2, "x":17.5, "label":"L"},
-                {"y":2, "x":18.5, "label":";"},
-                {"y":2, "x":19.5, "label":"'"},
-                {"y":2, "x":20.5, "label":"Return", "w":1.75},
-                
-                {"y":1, "x":22.25, "label":"ISO Enter", "h":2, "w":1.25},
-                
-                {"y":3, "x":13.5,    "label":"End"},
-                {"y":3, "x":14.5,    "label":"N"},
-                {"y":3, "x":15.5,    "label":"M"},
-                {"y":3, "x":16.5,    "label":","},
-                {"y":3, "x":17.5,    "label":"."},
-                {"y":3, "x":18.5,    "label":"/"},
-                {"y":3, "x":19.5,    "label":"Shift", "w":1.75},
-                {"y":3.25, "x":21.5, "label":"Up"},
-                
-                {"y":4.25, "x":12,    "label":"LShftAlt / Calc", "w":2.25},
-                {"y":4.25, "x":14.25, "label":"Space", "w":1.75},
-                {"y":4.25, "x":16,    "label":"UK #~"},
-                {"y":4, "x":17.25,    "label":"AltGr / Home", "w":1.5},
-                {"y":4, "x":18.75,    "label":"Ctrl / End", "w":1.5},
-                {"y":4.25, "x":20.5,  "label":"Left"},
-                {"y":4.25, "x":21.5,  "label":"Down"},
-                {"y":4.25, "x":22.5,  "label":"Right"}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [5, 0], "x": 1, "y": 0},
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 1], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 2], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 3], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1, "w": 1.5},
+                {"matrix": [2, 1], "x": 2.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 1], "x": 4, "y": 1},
+                {"matrix": [2, 2], "x": 5, "y": 1},
+                {"matrix": [3, 2], "x": 6, "y": 1},
+                {"matrix": [2, 3], "x": 7, "y": 1},
+                {"matrix": [3, 3], "x": 8, "y": 1},
+                {"matrix": [2, 4], "x": 9, "y": 1},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.75, "y": 2, "w": 2.25},
+                {"matrix": [5, 1], "x": 4, "y": 2},
+                {"matrix": [4, 2], "x": 5, "y": 2},
+                {"matrix": [5, 2], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [5, 3], "x": 8, "y": 2},
+                {"matrix": [4, 4], "x": 9, "y": 2},
+                {"matrix": [6, 0], "x": 0, "y": 3.25},
+                {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.75},
+                {"matrix": [7, 1], "x": 4, "y": 3},
+                {"matrix": [6, 2], "x": 5, "y": 3},
+                {"matrix": [7, 2], "x": 6, "y": 3},
+                {"matrix": [6, 3], "x": 7, "y": 3},
+                {"matrix": [7, 3], "x": 8, "y": 3},
+                {"matrix": [6, 4], "x": 9, "y": 3},
+                {"matrix": [8, 0], "x": 0, "y": 4.25},
+                {"matrix": [9, 0], "x": 1, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 5, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 6.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 7.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 4], "x": 9.25, "y": 4.25, "w": 2.75},
+                {"matrix": [1, 4], "x": 10.25, "y": 0},
+                {"matrix": [0, 5], "x": 11.25, "y": 0},
+                {"matrix": [1, 5], "x": 12.25, "y": 0},
+                {"matrix": [3, 4], "x": 10.25, "y": 1},
+                {"matrix": [2, 5], "x": 11.25, "y": 1},
+                {"matrix": [3, 5], "x": 12.25, "y": 1},
+                {"matrix": [5, 4], "x": 10.25, "y": 2},
+                {"matrix": [4, 5], "x": 11.25, "y": 2},
+                {"matrix": [5, 5], "x": 12.25, "y": 2},
+                {"matrix": [7, 4], "x": 10.25, "y": 3},
+                {"matrix": [6, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 5], "x": 12.25, "y": 3},
+                {"matrix": [0, 6], "x": 13.5, "y": 0},
+                {"matrix": [1, 6], "x": 14.5, "y": 0},
+                {"matrix": [0, 7], "x": 15.5, "y": 0},
+                {"matrix": [1, 7], "x": 16.5, "y": 0},
+                {"matrix": [0, 8], "x": 17.5, "y": 0},
+                {"matrix": [1, 8], "x": 18.5, "y": 0},
+                {"matrix": [0, 9], "x": 19.5, "y": 0, "w": 2},
+                {"matrix": [1, 9], "x": 21.5, "y": 0},
+                {"matrix": [0, 10], "x": 22.5, "y": 0},
+                {"matrix": [2, 6], "x": 13.5, "y": 1},
+                {"matrix": [3, 6], "x": 14.5, "y": 1},
+                {"matrix": [2, 7], "x": 15.5, "y": 1},
+                {"matrix": [3, 7], "x": 16.5, "y": 1},
+                {"matrix": [2, 8], "x": 17.5, "y": 1},
+                {"matrix": [3, 8], "x": 18.5, "y": 1},
+                {"matrix": [2, 9], "x": 19.5, "y": 1, "w": 1.5},
+                {"matrix": [3, 9], "x": 21, "y": 1},
+                {"matrix": [4, 6], "x": 13.5, "y": 2},
+                {"matrix": [5, 6], "x": 14.5, "y": 2},
+                {"matrix": [4, 7], "x": 15.5, "y": 2},
+                {"matrix": [5, 7], "x": 16.5, "y": 2},
+                {"matrix": [4, 8], "x": 17.5, "y": 2},
+                {"matrix": [5, 8], "x": 18.5, "y": 2},
+                {"matrix": [4, 9], "x": 19.5, "y": 2},
+                {"matrix": [5, 9], "x": 20.5, "y": 2, "w": 1.75},
+                {"matrix": [4, 10], "x": 22.25, "y": 1, "w": 1.25, "h": 2},
+                {"matrix": [6, 6], "x": 13.5, "y": 3},
+                {"matrix": [7, 6], "x": 14.5, "y": 3},
+                {"matrix": [6, 7], "x": 15.5, "y": 3},
+                {"matrix": [7, 7], "x": 16.5, "y": 3},
+                {"matrix": [6, 8], "x": 17.5, "y": 3},
+                {"matrix": [7, 8], "x": 18.5, "y": 3},
+                {"matrix": [6, 9], "x": 19.5, "y": 3, "w": 1.75},
+                {"matrix": [7, 9], "x": 21.5, "y": 3.25},
+                {"matrix": [9, 5], "x": 12, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 16, "y": 4.25},
+                {"matrix": [8, 8], "x": 17.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 8], "x": 18.75, "y": 4, "w": 1.5},
+                {"matrix": [8, 9], "x": 20.5, "y": 4.25},
+                {"matrix": [9, 9], "x": 21.5, "y": 4.25},
+                {"matrix": [8, 10], "x": 22.5, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/nopunin10did/railroad/rev0/rev0.h b/keyboards/nopunin10did/railroad/rev0/rev0.h
deleted file mode 100644
index ff7c31524e..0000000000
--- a/keyboards/nopunin10did/railroad/rev0/rev0.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2020 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@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"
-
-#define LAYOUT( \
-\
-   K0000,  K0500,  K0100,  K0001,  K0101,  K0002,  K0102,  K0003,  K0103,  K0004,  \
-   K0200,  K0300,      K0201,      K0301,  K0202,  K0302,  K0203,  K0303,  K0204,  \
-   K0400,        K0401,            K0501,  K0402,  K0502,  K0403,  K0503,  K0404,  \
-   K0600,    K0601,                K0701,  K0602,  K0702,  K0603,  K0703,  K0604,  \
-   K0800,  K0900,    K0801,      K0901,    K0802,      K0902,  K0903,        K0904,\
-\
-   K0104,  K0005,  K0105,  \
-   K0304,  K0205,  K0305,  \
-   K0504,  K0405,  K0505,  \
-   K0704,  K0605,  K0705,  \
-\
-   K0006,  K0106,  K0007,  K0107,  K0008,  K0108,  K0009,          K0109,  K0010,  \
-   K0206,  K0306,  K0207,  K0307,  K0208,  K0308,  K0209,      K0309,  \
-   K0406,  K0506,  K0407,  K0507,  K0408,  K0508,  K0409,  K0509,        K0410,    \
-   K0606,  K0706,  K0607,  K0707,  K0608,  K0708,  K0609,          K0709,          \
- K0905,  K0906,        K0907,    K0808,      K0908,        K0809,  K0909,  K0810   \
-) \
-{ \
-   { K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008, K0009, K0010 }, \
-   { K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108, K0109, KC_NO }, \
-   { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208, K0209, KC_NO }, \
-   { K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308, K0309, KC_NO }, \
-   { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408, K0409, K0410 }, \
-   { K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508, K0509, KC_NO }, \
-   { K0600, K0601, K0602, K0603, K0604, K0605, K0606, K0607, K0608, K0609, KC_NO }, \
-   { KC_NO, K0701, K0702, K0703, K0704, K0705, K0706, K0707, K0708, K0709, KC_NO }, \
-   { K0800, K0801, K0802, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0808, K0809, K0810 }, \
-   { K0900, K0901, K0902, K0903, K0904, K0905, K0906, K0907, K0908, K0909, KC_NO }  \
-}