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

2 files changed, 82 insertions, 127 deletions

diff --git a/keyboards/converter/palm_usb/stowaway/info.json b/keyboards/converter/palm_usb/stowaway/info.json
index 34b1e1f83f..9a263327ad 100644
--- a/keyboards/converter/palm_usb/stowaway/info.json
+++ b/keyboards/converter/palm_usb/stowaway/info.json
@@ -1,77 +1,85 @@
 {
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"label":"1", "x":0.5, "y":0},
-        {"label":"2", "x":1.5, "y":0},
-        {"label":"3", "x":2.5, "y":0},
-        {"label":"4", "x":3.5, "y":0},
-        {"label":"5", "x":4.5, "y":0},
-        {"label":"6", "x":5.5, "y":0},
-        {"label":"7", "x":6.5, "y":0},
-        {"label":"8", "x":7.5, "y":0},
-        {"label":"9", "x":8.5, "y":0},
-        {"label":"0", "x":9.5, "y":0},
-        {"label":"MINS", "x":10.5, "y":0},
-        {"label":"EQL", "x":11.5, "y":0},
-        {"label":"BACK", "x":12.5, "y":0, "w":1.5},
-        {"label":"APP0", "x":14.25, "y":1, "h":0.6875},
-        {"label":"TAB", "x":0, "y":1},
-        {"label":"Q", "x":1, "y":1},
-        {"label":"W", "x":2, "y":1},
-        {"label":"E", "x":3, "y":1},
-        {"label":"R", "x":4, "y":1},
-        {"label":"T", "x":5, "y":1},
-        {"label":"Y", "x":6, "y":1},
-        {"label":"U", "x":7, "y":1},
-        {"label":"I", "x":8, "y":1},
-        {"label":"O", "x":9, "y":1},
-        {"label":"P", "x":10, "y":1},
-        {"label":"LBRC", "x":11, "y":1},
-        {"label":"RBRC", "x":12, "y":1},
-        {"label":"BSLS", "x":13, "y":1},
-        {"label":"APP1", "x":14.25, "y":1.6875, "h":0.6875},
-        {"label":"CAPS", "x":0, "y":2, "w":1.25},
-        {"label":"A", "x":1.25, "y":2},
-        {"label":"S", "x":2.25, "y":2},
-        {"label":"D", "x":3.25, "y":2},
-        {"label":"F", "x":4.25, "y":2},
-        {"label":"G", "x":5.25, "y":2},
-        {"label":"H", "x":6.25, "y":2},
-        {"label":"J", "x":7.25, "y":2},
-        {"label":"K", "x":8.25, "y":2},
-        {"label":"L", "x":9.25, "y":2},
-        {"label":"SCLN", "x":10.25, "y":2},
-        {"label":"QUOT", "x":11.25, "y":2},
-        {"label":"ENT", "x":12.25, "y":2, "w":1.75},
-        {"label":"APP2", "x":14.25, "y":2.375, "h":0.6875},
-        {"label":"LSFT", "x":0, "y":3, "w":1.75},
-        {"label":"Z", "x":1.75, "y":3},
-        {"label":"X", "x":2.75, "y":3},
-        {"label":"C", "x":3.75, "y":3},
-        {"label":"V", "x":4.75, "y":3},
-        {"label":"B", "x":5.75, "y":3},
-        {"label":"N", "x":6.75, "y":3},
-        {"label":"M", "x":7.75, "y":3},
-        {"label":"COMM", "x":8.75, "y":3},
-        {"label":"DOT", "x":9.75, "y":3},
-        {"label":"SLSH", "x":10.75, "y":3},
-        {"label":"RSFT", "x":11.75, "y":3, "w":1.25},
-        {"label":"UP", "x":13, "y":3},
-        {"label":"APP3", "x":14.25, "y":3.0625, "h":0.6875},
-        {"label":"LCTL", "x":0, "y":4, "w":1.25},
-        {"label":"FN", "x":1.25, "y":4},
-        {"label":"LALT", "x":2.25, "y":4},
-        {"label":"CMD", "x":3.25, "y":4},
-        {"label":"SPACE", "x":4.25, "y":4, "w":3.5},
-        {"label":"SPACE/New", "x":7.75, "y":4},
-        {"label":"GRAVE", "x":8.75, "y":4},
-        {"label":"DONE", "x":9.75, "y":4},
-        {"label":"DEL", "x":10.75, "y":4, "w":1.25},
-        {"label":"LEFT", "x":12, "y":4},
-        {"label":"DOWN", "x":13, "y":4},
-        {"label":"RIGHT", "x":14, "y":4}
-      ]
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 4], "x": 3.5, "y": 0},
+                {"matrix": [0, 5], "x": 4.5, "y": 0},
+                {"matrix": [0, 6], "x": 5.5, "y": 0},
+                {"matrix": [0, 7], "x": 6.5, "y": 0},
+                {"matrix": [6, 4], "x": 7.5, "y": 0},
+                {"matrix": [6, 5], "x": 8.5, "y": 0},
+                {"matrix": [6, 6], "x": 9.5, "y": 0},
+                {"matrix": [6, 0], "x": 10.5, "y": 0},
+                {"matrix": [6, 1], "x": 11.5, "y": 0},
+                {"matrix": [6, 2], "x": 12.5, "y": 0, "w": 1.5},
+
+                {"matrix": [6, 3], "x": 14.25, "y": 1, "h": 0.6875},
+
+                {"matrix": [3, 1], "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": [7, 4], "x": 7, "y": 1},
+                {"matrix": [7, 5], "x": 8, "y": 1},
+                {"matrix": [7, 6], "x": 9, "y": 1},
+                {"matrix": [7, 7], "x": 10, "y": 1},
+                {"matrix": [7, 0], "x": 11, "y": 1},
+                {"matrix": [7, 1], "x": 12, "y": 1},
+                {"matrix": [7, 2], "x": 13, "y": 1},
+
+                {"matrix": [7, 3], "x": 14.25, "y": 1.6875, "h": 0.6875},
+
+                {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [8, 4], "x": 7.25, "y": 2},
+                {"matrix": [8, 5], "x": 8.25, "y": 2},
+                {"matrix": [8, 6], "x": 9.25, "y": 2},
+                {"matrix": [8, 7], "x": 10.25, "y": 2},
+                {"matrix": [8, 0], "x": 11.25, "y": 2},
+                {"matrix": [8, 1], "x": 12.25, "y": 2, "w": 1.75},
+
+                {"matrix": [8, 2], "x": 14.25, "y": 2.375, "h": 0.6875},
+
+                {"matrix": [11, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [0, 3], "x": 1.75, "y": 3},
+                {"matrix": [2, 0], "x": 2.75, "y": 3},
+                {"matrix": [5, 4], "x": 3.75, "y": 3},
+                {"matrix": [5, 5], "x": 4.75, "y": 3},
+                {"matrix": [5, 6], "x": 5.75, "y": 3},
+                {"matrix": [5, 7], "x": 6.75, "y": 3},
+                {"matrix": [9, 4], "x": 7.75, "y": 3},
+                {"matrix": [9, 5], "x": 8.75, "y": 3},
+                {"matrix": [9, 6], "x": 9.75, "y": 3},
+                {"matrix": [9, 0], "x": 10.75, "y": 3},
+                {"matrix": [11, 1], "x": 11.75, "y": 3, "w": 1.25},
+                {"matrix": [9, 1], "x": 13, "y": 3},
+
+                {"matrix": [9, 2], "x": 14.25, "y": 3.0625, "h": 0.6875},
+
+                {"matrix": [3, 2], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4},
+                {"matrix": [4, 3], "x": 2.25, "y": 4},
+                {"matrix": [1, 0], "x": 3.25, "y": 4},
+                {"matrix": [2, 7], "x": 4.25, "y": 4, "w": 3.5},
+                {"matrix": [6, 7], "x": 7.75, "y": 4},
+                {"matrix": [1, 7], "x": 8.75, "y": 4},
+                {"matrix": [9, 7], "x": 9.75, "y": 4},
+                {"matrix": [10, 0], "x": 10.75, "y": 4, "w": 1.25},
+                {"matrix": [10, 1], "x": 12, "y": 4},
+                {"matrix": [10, 2], "x": 13, "y": 4},
+                {"matrix": [10, 3], "x": 14, "y": 4}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/converter/palm_usb/stowaway/stowaway.h b/keyboards/converter/palm_usb/stowaway/stowaway.h
deleted file mode 100644
index 71af9bf4a8..0000000000
--- a/keyboards/converter/palm_usb/stowaway/stowaway.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright 2018 milestogo
-
-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"
-
-
-/* Stowaway Keyboard
- based on matrix from http://www.splorp.com/pdf/stowawayhwref.pdf
-
-    1,    2,    3,    4,    5,    6,    7,    8,    9,    0,   MINS, EQL,   BACK         APP0,
-    TAB,  Q,    W,    E,    R,    T,    Y,    U,    I,    O,   P,    LBRC,  RBRC, BSLS,  APP1,  
-    CAPS, A,    S,    D,    F,    G,    H,    J,    K,    L,   SCLN, QUOT,  ENT,         APP2,  
-    LSFT, Z,    X,    C,    V,    B,    N,    M,    COMM, DOT, SLSH, RSFT,  UP,          APP3, 
-    LCTL, FN,   LALT, CMD,  SPACE,SPACE,GRAVE,DONE, DEL, LEFT, DOWN, RIGHT     
-
-*/
-#define LAYOUT(                                                         \
-    K000, K001, K002, K004, K005, K006, K007, K064, K065, K066, K060, K061, K062,       K063,\
-    K031, K011, K012, K013, K014, K015, K016, K074, K075, K076, K077, K070, K071, K072, K073,\
-    K030, K021, K022, K023, K024, K025, K026, K084, K085, K086, K087, K080, K081,       K082,\
-    K110, K003, K020, K054, K055, K056, K057, K094, K095, K096, K090, K111, K091,       K092,\
-    K032, K042, K043, K010, K027, K067, K017, K097, K100, K101, K102, K103 \
-) { \
-    { K000,  K001,   K002 , K003, K004,  K005, K006,  K007 }, \
-    { K010,  K011,   K012 , K013, K014,  K015, K016,  K017 }, \
-    { K020,  K021,   K022 , K023, K024,  K025, K026,  K027 }, \
-    { K030,  K031,   K032 , KC_NO,KC_NO, KC_NO,KC_NO, KC_NO }, \
-    { KC_NO, KC_NO,  K042 , K043, KC_NO, KC_NO,KC_NO, KC_NO }, \
-    { KC_NO, KC_NO,  KC_NO, KC_NO,K054,  K055, K056,  K057 }, \
-    { K060,  K061,   K062 , K063, K064,  K065, K066,  K067 }, \
-    { K070,  K071,   K072 , K073, K074,  K075, K076,  K077 }, \
-    { K080,  K081,   K082 , KC_NO,K084,  K085, K086,  K087 }, \
-    { K090,  K091,   K092 , KC_NO,K094,  K095, K096,  K097 }, \
-    { K100,  K101,   K102 , K103, KC_NO, KC_NO,KC_NO, KC_NO }, \
-    { K110,  K111,   KC_NO, KC_NO,KC_NO, KC_NO,KC_NO, KC_NO } \
-}
-