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

2 files changed, 68 insertions, 104 deletions

diff --git a/keyboards/handwired/ortho5x14/info.json b/keyboards/handwired/ortho5x14/info.json
index 5faccec8af..67b4cc4c2e 100644
--- a/keyboards/handwired/ortho5x14/info.json
+++ b/keyboards/handwired/ortho5x14/info.json
@@ -18,80 +18,78 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Delete", "x":0, "y":0},
-                {"label":"Bkspc", "x":1, "y":0},
-                {"label":"1", "x":2, "y":0},
-                {"label":"2", "x":3, "y":0},
-                {"label":"3", "x":4, "y":0},
-                {"label":"4", "x":5, "y":0},
-                {"label":"5", "x":6, "y":0},
-                {"label":"6", "x":7, "y":0},
-                {"label":"7", "x":8, "y":0},
-                {"label":"8", "x":9, "y":0},
-                {"label":"9", "x":10, "y":0},
-                {"label":"0", "x":11, "y":0},
-                {"label":"-", "x":12, "y":0},
-                {"label":"=", "x":13, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "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, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
 
-                {"label":"Home", "x":0, "y":1},
-                {"label":"Tab", "x":1, "y":1},
-                {"label":"Q", "x":2, "y":1},
-                {"label":"W", "x":3, "y":1},
-                {"label":"E", "x":4, "y":1},
-                {"label":"R", "x":5, "y":1},
-                {"label":"T", "x":6, "y":1},
-                {"label":"Y", "x":7, "y":1},
-                {"label":"U", "x":8, "y":1},
-                {"label":"I", "x":9, "y":1},
-                {"label":"O", "x":10, "y":1},
-                {"label":"P", "x":11, "y":1},
-                {"label":"[", "x":12, "y":1},
-                {"label":"]", "x":13, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
 
-                {"label":"PgUp", "x":0, "y":2},
-                {"label":"Caps", "x":1, "y":2},
-                {"label":"A", "x":2, "y":2},
-                {"label":"S", "x":3, "y":2},
-                {"label":"D", "x":4, "y":2},
-                {"label":"F", "x":5, "y":2},
-                {"label":"G", "x":6, "y":2},
-                {"label":"H", "x":7, "y":2},
-                {"label":"J", "x":8, "y":2},
-                {"label":"K", "x":9, "y":2},
-                {"label":"L", "x":10, "y":2},
-                {"label":";", "x":11, "y":2},
-                {"label":"'", "x":12, "y":2},
-                {"label":"Enter", "x":13, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
 
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
 
-
-                {"label":"PgDn", "x":0, "y":3},
-                {"label":"Shift", "x":1, "y":3},
-                {"label":"Z", "x":2, "y":3},
-                {"label":"X", "x":3, "y":3},
-                {"label":"C", "x":4, "y":3},
-                {"label":"V", "x":5, "y":3},
-                {"label":"B", "x":6, "y":3},
-                {"label":"N", "x":7, "y":3},
-                {"label":"M", "x":8, "y":3},
-                {"label":",", "x":9, "y":3},
-                {"label":".", "x":10, "y":3},
-                {"label":"/", "x":11, "y":3},
-                {"label":"\\", "x":12, "y":3},
-                {"label":"Shift", "x":13, "y":3},
-
-                {"label":"End", "x":0, "y":4},
-                {"label":"Ctrl", "x":1, "y":4},
-                {"label":"Hyper", "x":2, "y":4},
-                {"label":"Alt", "x":3, "y":4},
-                {"label":"Lower", "x":4, "y":4},
-                {"label":"Space", "x":5, "y":4, "w":2},
-                {"label":"Space", "x":7, "y":4, "w":2},
-                {"label":"Raise", "x":9, "y":4},
-                {"label":"Alt", "x":10, "y":4},
-                {"label":"Prop", "x":11, "y":4},
-                {"label":"Ctrl", "x":12, "y":4},
-                {"label":"Esc", "x":13, "y":4}
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+                {"matrix": [4, 8], "x": 7, "y": 4, "w": 2},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4}
             ]
         }
     }
diff --git a/keyboards/handwired/ortho5x14/ortho5x14.h b/keyboards/handwired/ortho5x14/ortho5x14.h
deleted file mode 100644
index 0c3d5b861e..0000000000
--- a/keyboards/handwired/ortho5x14/ortho5x14.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Richard Nunez
- *
- * 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( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
-  k40, k41, k42, k43, k44, k45,           k48, k49, k4a, k4b, k4c, k4d  \
-) \
-{ \
-  { k00, k01, k02, k03, k04, k05,  k06,    k07, k08, k09, k0a, k0b, k0c, k0d }, \
-  { k10, k11, k12, k13, k14, k15,  k16,    k17, k18, k19, k1a, k1b, k1c, k1d }, \
-  { k20, k21, k22, k23, k24, k25,  k26,    k27, k28, k29, k2a, k2b, k2c, k2d }, \
-  { k30, k31, k32, k33, k34, k35,  k36,    k37, k38, k39, k3a, k3b, k3c, k3d }, \
-  { k40, k41, k42, k43, k44, k45, KC_NO, KC_NO, k48, k49, k4a, k4b, k4c, k4d } \
-}