Move miscellaneous layouts to data driven (#20516)

2 files changed, 142 insertions, 179 deletions

diff --git a/keyboards/the_royal/schwann/info.json b/keyboards/the_royal/schwann/info.json
index 85b6afb369..df765f747c 100644
--- a/keyboards/the_royal/schwann/info.json
+++ b/keyboards/the_royal/schwann/info.json
@@ -19,148 +19,155 @@
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
-   "LAYOUT_mit": {
+    "LAYOUT_mit": {
       "layout": [
-        {"label":"TAB", "x":0, "y":0},
-        {"label":"Q", "x":1, "y":0}, 
-        {"label":"W", "x":2, "y":0}, 
-        {"label":"E", "x":3, "y":0}, 
-        {"label":"R", "x":4, "y":0}, 
-        {"label":"T", "x":5, "y":0}, 
-        {"label":"Y", "x":6, "y":0}, 
-        {"label":"U", "x":7, "y":0}, 
-        {"label":"I", "x":8, "y":0}, 
-        {"label":"O", "x":9, "y":0}, 
-        {"label":"P", "x":10, "y":0},
-        {"label":"BSPC", "x":11, "y":0},
-        {"label":"LCtl", "x":0, "y":1},
-        {"label":"A", "x":1, "y":1},
-        {"label":"S", "x":2, "y":1},
-        {"label":"D", "x":3, "y":1},
-        {"label":"F", "x":4, "y":1},
-        {"label":"G", "x":5, "y":1},
-        {"label":"H", "x":6, "y":1},
-        {"label":"J", "x":7, "y":1},
-        {"label":"K", "x":8, "y":1},
-        {"label":"L", "x":9, "y":1},
-        {"label":"SCLN", "x":10, "y":1},
-        {"label":"QUOT", "x":11, "y":1},
-        {"label":"LSFT", "x":0, "y":2},
-        {"label":"Z", "x":1, "y":2},
-        {"label":"X", "x":2, "y":2},
-        {"label":"C", "x":3, "y":2},
-        {"label":"V", "x":4, "y":2},
-        {"label":"B", "x":5, "y":2},
-        {"label":"N", "x":6, "y":2},
-        {"label":"M", "x":7, "y":2},
-        {"label":"COMM", "x":8, "y":2},
-        {"label":"DOT", "x":9, "y":2},
-        {"label":"SLSH", "x":10, "y":2},
-        {"label":"ENTER", "x":11, "y":2},
-        {"label":"DEL", "x":1, "y":3},
-        {"label":"LGUI", "x":2, "y":3},
-        {"label":"LALT", "x":3, "y":3},
-        {"label":"LOWER", "x":4, "y":3},
-        {"label":" ", "x":5, "y":3, "w":2},
-        {"label":"RAISE", "x":7, "y":3},
-        {"label":"RALT", "x":8, "y":3},
-        {"label":"MENU", "x":9, "y":3},
-        {"label":"RCTL", "x":10, "y":3}
+        {"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": [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": [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": [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, 6], "x": 5, "y": 3, "w": 2},
+        {"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}
       ]
     },
-
     "LAYOUT_full_ortho": {
-        "layout": [
-        {"label":"TAB", "x":0, "y":0},
-        {"label":"Q", "x":1, "y":0}, 
-        {"label":"W", "x":2, "y":0}, 
-        {"label":"E", "x":3, "y":0}, 
-        {"label":"R", "x":4, "y":0}, 
-        {"label":"T", "x":5, "y":0}, 
-        {"label":"Y", "x":6, "y":0}, 
-        {"label":"U", "x":7, "y":0}, 
-        {"label":"I", "x":8, "y":0}, 
-        {"label":"O", "x":9, "y":0}, 
-        {"label":"P", "x":10, "y":0},
-        {"label":"BSPC", "x":11, "y":0},
-        {"label":"LCtl", "x":0, "y":1},
-        {"label":"A", "x":1, "y":1},
-        {"label":"S", "x":2, "y":1},
-        {"label":"D", "x":3, "y":1},
-        {"label":"F", "x":4, "y":1},
-        {"label":"G", "x":5, "y":1},
-        {"label":"H", "x":6, "y":1},
-        {"label":"J", "x":7, "y":1},
-        {"label":"K", "x":8, "y":1},
-        {"label":"L", "x":9, "y":1},
-        {"label":"SCLN", "x":10, "y":1},
-        {"label":"QUOT", "x":11, "y":1},
-        {"label":"LSFT", "x":0, "y":2},
-        {"label":"Z", "x":1, "y":2},
-        {"label":"X", "x":2, "y":2},
-        {"label":"C", "x":3, "y":2},
-        {"label":"V", "x":4, "y":2},
-        {"label":"B", "x":5, "y":2},
-        {"label":"N", "x":6, "y":2},
-        {"label":"M", "x":7, "y":2},
-        {"label":"COMM", "x":8, "y":2},
-        {"label":"DOT", "x":9, "y":2},
-        {"label":"SLSH", "x":10, "y":2},
-        {"label":"ENTER", "x":11, "y":2},
-        {"label":"DEL", "x":1, "y":3},
-        {"label":"LGUI", "x":2, "y":3},
-        {"label":"LALT", "x":3, "y":3},
-        {"label":"LOWER", "x":4, "y":3},
-        {"label":" ", "x":5, "y":3},
-        {"label":" ", "x":6, "y":3},
-        {"label":"RAISE", "x":7, "y":3},
-        {"label":"RALT", "x":8, "y":3},
-        {"label":"MENU", "x":9, "y":3},
-        {"label":"RCTL", "x":10, "y":3}
+      "layout": [
+        {"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": [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": [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": [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}
       ]
     },
-
     "LAYOUT_big_boy": {
-        "layout": [
-        {"label":"TAB", "x":0, "y":0},
-        {"label":"Q", "x":1, "y":0}, 
-        {"label":"W", "x":2, "y":0}, 
-        {"label":"E", "x":3, "y":0}, 
-        {"label":"R", "x":4, "y":0}, 
-        {"label":"T", "x":5, "y":0}, 
-        {"label":"Y", "x":6, "y":0}, 
-        {"label":"U", "x":7, "y":0}, 
-        {"label":"I", "x":8, "y":0}, 
-        {"label":"O", "x":9, "y":0}, 
-        {"label":"P", "x":10, "y":0},
-        {"label":"BSPC", "x":11, "y":0},
-        {"label":"LCtl", "x":0, "y":1},
-        {"label":"A", "x":1, "y":1},
-        {"label":"S", "x":2, "y":1},
-        {"label":"D", "x":3, "y":1},
-        {"label":"F", "x":4, "y":1},
-        {"label":"G", "x":5, "y":1},
-        {"label":"H", "x":6, "y":1},
-        {"label":"J", "x":7, "y":1},
-        {"label":"K", "x":8, "y":1},
-        {"label":"L", "x":9, "y":1},
-        {"label":"SCLN", "x":10, "y":1},
-        {"label":"QUOT", "x":11, "y":1},
-        {"label":"LSFT", "x":0, "y":2},
-        {"label":"Z", "x":1, "y":2},
-        {"label":"X", "x":2, "y":2},
-        {"label":"C", "x":3, "y":2},
-        {"label":"V", "x":4, "y":2},
-        {"label":"B", "x":5, "y":2},
-        {"label":"N", "x":6, "y":2},
-        {"label":"M", "x":7, "y":2},
-        {"label":"COMM", "x":8, "y":2},
-        {"label":"DOT", "x":9, "y":2},
-        {"label":"SLSH", "x":10, "y":2},
-        {"label":"ENTER", "x":11, "y":2},
-        {"label":"LOWER", "x":1, "y":3, "w":1.5},
-        {"label":" ", "x":2.5, "y":3, "w":7},
-        {"label":"RAISE", "x":9.5, "y":3, "w":1.5}
+      "layout": [
+        {"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": [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": [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": [3, 1], "x": 1, "y": 3, "w": 1.5},
+        {"matrix": [3, 6], "x": 2.5, "y": 3, "w": 7},
+        {"matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.5}
       ]
     }
   }
diff --git a/keyboards/the_royal/schwann/schwann.h b/keyboards/the_royal/schwann/schwann.h
deleted file mode 100644
index 933e903ec2..0000000000
--- a/keyboards/the_royal/schwann/schwann.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_mit( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-       k31, k32, k33, k34,    k36,   k37, k38, k39, k3A       \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B}, \
-  {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B}, \
-  {XXX, k31, k32, k33, k34, XXX, k36, k37, k38, k39, k3A, XXX}  \
-}
-
-#define LAYOUT_full_ortho( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-       k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A       \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B}, \
-  {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B}, \
-  {XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX}  \
-}
-
-#define LAYOUT_big_boy( \
-  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-         k31,                 k36,                 k3A        \
-) \
-{ \
-  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B}, \
-  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B}, \
-  {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B}, \
-  {XXX, k31, XXX, XXX, XXX, XXX, k36, XXX, XXX, XXX, k3A, XXX}  \
-}