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

2 files changed, 128 insertions, 126 deletions

diff --git a/keyboards/kabedon/kabedon78s/info.json b/keyboards/kabedon/kabedon78s/info.json
index 3d99357320..345fdba511 100644
--- a/keyboards/kabedon/kabedon78s/info.json
+++ b/keyboards/kabedon/kabedon78s/info.json
@@ -21,111 +21,134 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-			{"label":"Esc", "x":1.5, "y":0}, 
-			{"label":"F1", "x":3.5, "y":0}, 
-			{"label":"F2", "x":4.5, "y":0}, 
-			{"label":"F3", "x":5.5, "y":0}, 
-			{"label":"F4", "x":6.5, "y":0}, 
-			{"label":"F5", "x":8, "y":0}, 
-			{"label":"F6", "x":10, "y":0}, 
-			{"label":"F7", "x":11, "y":0}, 
-			{"label":"F8", "x":12, "y":0}, 
-			{"label":"F9", "x":13.5, "y":0},
-			{"label":"F10", "x":14.5, "y":0},
-			{"label":"F11", "x":15.5, "y":0}, 
-			{"label":"F12", "x":16.5, "y":0}, 
-			{"label":"Delete", "x":18.25, "y":0},
-			{"label":"Home", "x":19.25, "y":0},
-			{"label":"PgUp", "x":20.25, "y":0}, 
-			{"label":"PgDn", "x":21.25, "y":0}, 
-			{"label":"Insert", "x":0, "y":1.25},
-			{"label":"~", "x":1.5, "y":1.25}, 
-			{"label":"!", "x":2.5, "y":1.25}, 
-			{"label":"@", "x":3.5, "y":1.25}, 
-			{"label":"#", "x":4.5, "y":1.25}, 
-			{"label":"$", "x":5.5, "y":1.25}, 
-			{"label":"%", "x":6.5, "y":1.25}, 
-			{"label":"^", "x":7.5, "y":1.25}, 
-			{"label":"&", "x":9.5, "y":1.25}, 
-			{"label":"*", "x":10.5, "y":1.25}, 
-			{"label":"(", "x":11.5, "y":1.25}, 
-			{"label":")", "x":12.5, "y":1.25}, 
-			{"label":"_", "x":13.5, "y":1.25}, 
-			{"label":"+", "x":14.5, "y":1.25}, 
-			{"label":"Backspace", "x":15.5, "y":1.25, "w":2}, 
-			{"label":"Num Lock", "x":18.25, "y":1.25}, 
-			{"label":"/", "x":19.25, "y":1.25}, 
-			{"label":"*", "x":20.25, "y":1.25}, 
-			{"label":"-", "x":21.25, "y":1.25}, 
-			{"label":"Pause", "x":0, "y":2.25}, 
-			{"label":"Tab", "x":1.5, "y":2.25, "w":1.5}, 
-			{"label":"Q", "x":3, "y":2.25}, 
-			{"label":"W", "x":4, "y":2.25}, 
-			{"label":"E", "x":5, "y":2.25}, 
-			{"label":"R", "x":6, "y":2.25}, 
-			{"label":"T", "x":7, "y":2.25}, 
-			{"label":"Y", "x":9, "y":2.25}, 
-			{"label":"U", "x":10, "y":2.25}, 
-			{"label":"I", "x":11, "y":2.25}, 
-			{"label":"O", "x":12, "y":2.25}, 
-			{"label":"P", "x":13, "y":2.25}, 
-			{"label":"{", "x":14, "y":2.25}, 
-			{"label":"}", "x":15, "y":2.25}, 
-			{"label":"|", "x":16, "y":2.25, "w":1.5}, 
-			{"label":"7", "x":18.25, "y":2.25}, 
-			{"label":"8", "x":19.25, "y":2.25}, 
-			{"label":"9", "x":20.25, "y":2.25}, 
-			{"label":"+", "x":21.25, "y":2.25, "h":2}, 
-			{"label":"ScrLk", "x":0, "y":3.25}, 
-			{"label":"Caps Lock", "x":1.5, "y":3.25, "w":1.75}, 
-			{"label":"A", "x":3.25, "y":3.25}, 
-			{"label":"S", "x":4.25, "y":3.25}, 
-			{"label":"D", "x":5.25, "y":3.25}, 
-			{"label":"F", "x":6.25, "y":3.25}, 
-			{"label":"G", "x":7.25, "y":3.25}, 
-			{"label":"H", "x":9.25, "y":3.25}, 
-			{"label":"J", "x":10.25, "y":3.25}, 
-			{"label":"K", "x":11.25, "y":3.25}, 
-			{"label":"L", "x":12.25, "y":3.25}, 
-			{"label":":", "x":13.25, "y":3.25}, 
-			{"label":"\"", "x":14.25, "y":3.25}, 
-			{"label":"Enter", "x":15.25, "y":3.25, "w":2.25}, 
-			{"label":"4", "x":18.25, "y":3.25}, 
-			{"label":"5", "x":19.25, "y":3.25}, 
-			{"label":"6", "x":20.25, "y":3.25}, 
-			{"label":"PrtSc", "x":0, "y":4.25}, 
-			{"label":"Shift", "x":1.5, "y":4.25, "w":2.25}, 
-			{"label":"Z", "x":3.75, "y":4.25}, 
-			{"label":"X", "x":4.75, "y":4.25}, 
-			{"label":"C", "x":5.75, "y":4.25}, 
-			{"label":"V", "x":6.75, "y":4.25}, 
-			{"label":"B", "x":7.75, "y":4.25}, 
-			{"label":"N", "x":9.75, "y":4.25}, 
-			{"label":"M", "x":10.75, "y":4.25}, 
-			{"label":"<", "x":11.75, "y":4.25}, 
-			{"label":">", "x":12.75, "y":4.25}, 
-			{"label":"Shift", "x":13.75, "y":4.25, "w":1.75}, 
-			{"label":"UP", "x":15.5, "y":4.25}, 
-			{"label":"?", "x":16.5, "y":4.25}, 
-			{"label":"1", "x":18.25, "y":4.25}, 
-			{"label":"2", "x":19.25, "y":4.25}, 
-			{"label":"3", "x":20.25, "y":4.25}, 
-			{"label":"Enter", "x":21.25, "y":4.25, "h":2}, 
-			{"label":"NmLk", "x":0, "y":5.25}, 
-			{"label":"Ctrl", "x":1.5, "y":5.25, "w":1.25}, 
-			{"label":"Win", "x":2.75, "y":5.25}, 
-			{"label":"Fn", "x":3.75, "y":5.25}, 
-			{"label":"Alt", "x":4.75, "y":5.25, "w":1.25}, 
-			{"label":"space", "x":6, "y":5.25, "w":2.75}, 
-			{"label":"space", "x":9.75, "y":5.25, "w":2.25}, 
-			{"label":"Alt", "x":12, "y":5.25, "w":1.25}, 
-			{"label":"Ctrl", "x":13.25, "y":5.25, "w":1.25}, 
-			{"label":"LEFT", "x":14.5, "y":5.25}, 
-			{"label":"Down", "x":15.5, "y":5.25}, 
-			{"label":"Right", "x":16.5, "y":5.25}, 
-			{"label":"0", "x":18.25, "y":5.25, "w":2}, 
-			{"label":".", "x":20.25, "y":5.25}
-		    ]
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+
+                {"matrix": [0, 5], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+
+                {"matrix": [0, 10], "x": 13.5, "y": 0},
+                {"matrix": [0, 11], "x": 14.5, "y": 0},
+                {"matrix": [0, 12], "x": 15.5, "y": 0},
+                {"matrix": [0, 13], "x": 16.5, "y": 0},
+
+                {"matrix": [0, 14], "x": 18.25, "y": 0},
+                {"matrix": [0, 15], "x": 19.25, "y": 0},
+                {"matrix": [0, 16], "x": 20.25, "y": 0},
+                {"matrix": [0, 17], "x": 21.25, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1.25},
+                {"matrix": [1, 0], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+                {"matrix": [5, 5], "x": 7.5, "y": 1.25},
+
+                {"matrix": [1, 7], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 18.25, "y": 1.25},
+                {"matrix": [1, 15], "x": 19.25, "y": 1.25},
+                {"matrix": [1, 16], "x": 20.25, "y": 1.25},
+                {"matrix": [1, 17], "x": 21.25, "y": 1.25},
+
+                {"matrix": [2, 6], "x": 0, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 3, "y": 2.25},
+                {"matrix": [2, 2], "x": 4, "y": 2.25},
+                {"matrix": [2, 3], "x": 5, "y": 2.25},
+                {"matrix": [2, 4], "x": 6, "y": 2.25},
+                {"matrix": [2, 5], "x": 7, "y": 2.25},
+
+                {"matrix": [5, 7], "x": 9, "y": 2.25},
+                {"matrix": [2, 7], "x": 10, "y": 2.25},
+                {"matrix": [2, 8], "x": 11, "y": 2.25},
+                {"matrix": [2, 9], "x": 12, "y": 2.25},
+                {"matrix": [2, 10], "x": 13, "y": 2.25},
+                {"matrix": [2, 11], "x": 14, "y": 2.25},
+                {"matrix": [2, 12], "x": 15, "y": 2.25},
+                {"matrix": [2, 13], "x": 16, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 18.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 19.25, "y": 2.25},
+                {"matrix": [2, 16], "x": 20.25, "y": 2.25},
+                {"matrix": [2, 17], "x": 21.25, "y": 2.25, "h": 2},
+
+                {"matrix": [3, 6], "x": 0, "y": 3.25},
+
+                {"matrix": [3, 0], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 7.25, "y": 3.25},
+
+                {"matrix": [3, 7], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 14], "x": 18.25, "y": 3.25},
+                {"matrix": [3, 15], "x": 19.25, "y": 3.25},
+                {"matrix": [3, 16], "x": 20.25, "y": 3.25},
+
+                {"matrix": [4, 6], "x": 0, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 1.5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 1], "x": 3.75, "y": 4.25},
+                {"matrix": [4, 2], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 3], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 4], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 7.75, "y": 4.25},
+
+                {"matrix": [4, 7], "x": 9.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 10.75, "y": 4.25},
+                {"matrix": [4, 9], "x": 11.75, "y": 4.25},
+                {"matrix": [4, 10], "x": 12.75, "y": 4.25},
+                {"matrix": [4, 11], "x": 13.75, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 12], "x": 15.5, "y": 4.25},
+                {"matrix": [4, 13], "x": 16.5, "y": 4.25},
+
+                {"matrix": [4, 14], "x": 18.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 19.25, "y": 4.25},
+                {"matrix": [4, 16], "x": 20.25, "y": 4.25},
+                {"matrix": [4, 17], "x": 21.25, "y": 4.25, "h": 2},
+
+                {"matrix": [5, 6], "x": 0, "y": 5.25},
+
+                {"matrix": [5, 0], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 2.75, "y": 5.25},
+                {"matrix": [5, 2], "x": 3.75, "y": 5.25},
+                {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.75},
+
+                {"matrix": [5, 8], "x": 9.75, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 9], "x": 12, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 13.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 14.5, "y": 5.25},
+                {"matrix": [5, 12], "x": 15.5, "y": 5.25},
+                {"matrix": [5, 13], "x": 16.5, "y": 5.25},
+
+                {"matrix": [5, 14], "x": 18.25, "y": 5.25, "w": 2},
+                {"matrix": [5, 16], "x": 20.25, "y": 5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/kabedon/kabedon78s/kabedon78s.h b/keyboards/kabedon/kabedon78s/kabedon78s.h
deleted file mode 100644
index 64709a9bf4..0000000000
--- a/keyboards/kabedon/kabedon78s/kabedon78s.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-                KA00, KA01, KA02, KA03, KA04, KA05,         KA07, KA08, KA09, KA10, KA11, KA12, KA13,         KA14, KA15, KA16, KA17, \
-        KB06,   KB00, KB01, KB02, KB03, KB04, KB05, KF05,   KB07, KB08, KB09, KB10, KB11, KB12, KB13,         KB14, KB15, KB16, KB17, \
-        KC06,   KC00, KC01, KC02, KC03, KC04, KC05,   KF07, KC07, KC08, KC09, KC10, KC11, KC12, KC13,         KC14, KC15, KC16, KC17, \
-        KD06,   KD00, KD01, KD02, KD03, KD04, KD05,         KD07, KD08, KD09, KD10, KD11, KD12, KD13,         KD14, KD15, KD16,       \
-        KE06,   KE00, KE01, KE02, KE03, KE04, KE05,         KE07, KE08, KE09, KE10, KE11, KE12, KE13,         KE14, KE15, KE16, KE17, \
-        KF06,   KF00, KF01, KF02, KF03,    KF04,               KF08,    KF09, KF10, KF11, KF12, KF13,            KF14,   KF16        \
-) { \
-  { KA00, KA01, KA02, KA03, KA04, KA05,KC_NO, KA07, KA08, KA09, KA10, KA11, KA12, KA13, KA14, KA15, KA16, KA17}, \
-  { KB00, KB01, KB02, KB03, KB04, KB05, KB06, KB07, KB08, KB09, KB10, KB11, KB12, KB13, KB14, KB15, KB16, KB17}, \
-  { KC00, KC01, KC02, KC03, KC04, KC05, KC06, KC07, KC08, KC09, KC10, KC11, KC12, KC13, KC14, KC15, KC16, KC17}, \
-  { KD00, KD01, KD02, KD03, KD04, KD05, KD06, KD07, KD08, KD09, KD10, KD11, KD12, KD13, KD14, KD15, KD16,KC_NO}, \
-  { KE00, KE01, KE02, KE03, KE04, KE05, KE06, KE07, KE08, KE09, KE10, KE11, KE12, KE13, KE14, KE15, KE16, KE17}, \
-  { KF00, KF01, KF02, KF03, KF04, KF05, KF06, KF07, KF08, KF09, KF10, KF11, KF12, KF13, KF14,KC_NO, KF16,KC_NO}  \
-}
-
-