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

3 files changed, 116 insertions, 125 deletions

diff --git a/keyboards/kabedon/kabedon980/info.json b/keyboards/kabedon/kabedon980/info.json
index 5c49682917..85edf331b9 100644
--- a/keyboards/kabedon/kabedon980/info.json
+++ b/keyboards/kabedon/kabedon980/info.json
@@ -21,105 +21,121 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-			{"label":"ESC", "x":0, "y":0}, 
-			{"label":"F1", "x":1.6, "y":0}, 
-			{"label":"F2", "x":2.6, "y":0}, 
-			{"label":"F3", "x":3.6, "y":0}, 
-			{"label":"F4", "x":4.6, "y":0}, 
-			{"label":"F5", "x":6.3, "y":0}, 
-			{"label":"F6", "x":7.3, "y":0}, 
-			{"label":"F7", "x":8.3, "y":0}, 
-			{"label":"F8", "x":9.3, "y":0}, 
-			{"label":"F9", "x":11, "y":0}, 
-			{"label":"F10", "x":12, "y":0}, 
-			{"label":"F11", "x":13, "y":0}, 
-			{"label":"F12", "x":14, "y":0}, 
-			{"label":"DELETE", "x":15.3, "y":0}, 
-			{"label":"HOME", "x":16.3, "y":0}, 
-			{"label":"PGUP", "x":17.3, "y":0}, 
-			{"label":"PGDN", "x":18.3, "y":0}, 
-			{"label":"~", "x":0, "y":1.15}, 
-			{"label":"!", "x":1, "y":1.15}, 
-			{"label":"@", "x":2, "y":1.15}, 
-			{"label":"#", "x":3, "y":1.15}, 
-			{"label":"$", "x":4, "y":1.15}, 
-			{"label":"%", "x":5, "y":1.15}, 
-			{"label":"^", "x":6, "y":1.15}, 
-			{"label":"&", "x":7, "y":1.15}, 
-			{"label":"*", "x":8, "y":1.15}, 
-			{"label":"(", "x":9, "y":1.15}, 
-			{"label":")", "x":10, "y":1.15}, 
-			{"label":"_", "x":11, "y":1.15}, 
-			{"label":"+", "x":12, "y":1.15}, 
-			{"label":"BACK SPACE", "x":13, "y":1.15, "w":2}, 
-			{"label":"NUMLK", "x":15.3, "y":1.15}, 
-			{"label":"/", "x":16.3, "y":1.15}, 
-			{"label":"*", "x":17.3, "y":1.15}, 
-			{"label":"-", "x":18.3, "y":1.15}, 
-			{"label":"TAB", "x":0, "y":2.15, "w":1.5}, 
-			{"label":"Q", "x":1.5, "y":2.15}, 
-			{"label":"W", "x":2.5, "y":2.15}, 
-			{"label":"E", "x":3.5, "y":2.15}, 
-			{"label":"R", "x":4.5, "y":2.15}, 
-			{"label":"T", "x":5.5, "y":2.15}, 
-			{"label":"Y", "x":6.5, "y":2.15}, 
-			{"label":"U", "x":7.5, "y":2.15}, 
-			{"label":"I", "x":8.5, "y":2.15}, 
-			{"label":"O", "x":9.5, "y":2.15}, 
-			{"label":"P", "x":10.5, "y":2.15}, 
-			{"label":"[", "x":11.5, "y":2.15}, 
-			{"label":"]", "x":12.5, "y":2.15}, 
-			{"label":"|", "x":13.5, "y":2.15, "w":1.5}, 
-			{"label":"7", "x":15.3, "y":2.15}, 
-			{"label":"8", "x":16.3, "y":2.15}, 
-			{"label":"9", "x":17.3, "y":2.15}, 
-			{"label":"+", "x":18.3, "y":2.15, "h":2}, 
-			{"label":"CAPS LOCK", "x":0, "y":3.15, "w":1.75}, 
-			{"label":"A", "x":1.75, "y":3.15}, 
-			{"label":"S", "x":2.75, "y":3.15}, 
-			{"label":"D", "x":3.75, "y":3.15}, 
-			{"label":"F", "x":4.75, "y":3.15}, 
-			{"label":"G", "x":5.75, "y":3.15}, 
-			{"label":"H", "x":6.75, "y":3.15}, 
-			{"label":"J", "x":7.75, "y":3.15}, 
-			{"label":"K", "x":8.75, "y":3.15}, 
-			{"label":"L", "x":9.75, "y":3.15}, 
-			{"label":":", "x":10.75, "y":3.15}, 
-			{"label":"\"", "x":11.75, "y":3.15}, 
-			{"label":"ENTER", "x":12.75, "y":3.15, "w":2.25}, 
-			{"label":"4", "x":15.3, "y":3.15}, 
-			{"label":"5", "x":16.3, "y":3.15}, 
-			{"label":"6", "x":17.3, "y":3.15}, 
-			{"label":"SHIFT", "x":0, "y":4.15, "w":2.25}, 
-			{"label":"Z", "x":2.25, "y":4.15}, 
-			{"label":"X", "x":3.25, "y":4.15}, 
-			{"label":"C", "x":4.25, "y":4.15}, 
-			{"label":"V", "x":5.25, "y":4.15}, 
-			{"label":"B", "x":6.25, "y":4.15}, 
-			{"label":"N", "x":7.25, "y":4.15}, 
-			{"label":"M", "x":8.25, "y":4.15}, 
-			{"label":"<", "x":9.25, "y":4.15}, 
-			{"label":">", "x":10.25, "y":4.15}, 
-			{"label":"?", "x":11.25, "y":4.15}, 
-			{"label":"SHIFT", "x":12.25, "y":4.15, "w":1.75}, 
-			{"label":"Up", "x":14.15, "y":4.3}, 
-			{"label":"1", "x":15.3, "y":4.15}, 
-			{"label":"2", "x":16.3, "y":4.15}, 
-			{"label":"3", "x":17.3, "y":4.15}, 
-			{"label":"ENTER", "x":18.3, "y":4.15, "h":2}, 
-			{"label":"CTRL", "x":0, "y":5.15, "w":1.25}, 
-			{"label":"WIN", "x":1.25, "y":5.15, "w":1.25}, 
-			{"label":"ALT", "x":2.5, "y":5.15, "w":1.25}, 
-			{"label":"Space", "x":3.75, "y":5.15, "w":6.25}, 
-			{"label":"ALT", "x":10, "y":5.15}, 
-			{"label":"FN", "x":11, "y":5.15}, 
-			{"label":"CTRL", "x":12, "y":5.15}, 
-			{"label":"Left", "x":13.15, "y":5.3}, 
-			{"label":"Down", "x":14.15, "y":5.3}, 
-			{"label":"Right", "x":15.15, "y":5.3}, 
-			{"label":"0", "x":16.3, "y":5.15}, 
-			{"label":".", "x":17.3, "y":5.15} 
-			]
+                {"matrix": [8, 6], "x": 0, "y": 0},
+
+                {"matrix": [2, 4], "x": 1.6, "y": 0},
+                {"matrix": [3, 4], "x": 2.6, "y": 0},
+                {"matrix": [1, 10], "x": 3.6, "y": 0},
+                {"matrix": [0, 5], "x": 4.6, "y": 0},
+
+                {"matrix": [0, 11], "x": 6.3, "y": 0},
+                {"matrix": [0, 2], "x": 7.3, "y": 0},
+                {"matrix": [2, 1], "x": 8.3, "y": 0},
+                {"matrix": [0, 4], "x": 9.3, "y": 0},
+
+                {"matrix": [0, 7], "x": 11, "y": 0},
+                {"matrix": [2, 2], "x": 12, "y": 0},
+                {"matrix": [9, 5], "x": 13, "y": 0},
+                {"matrix": [4, 6], "x": 14, "y": 0},
+
+                {"matrix": [7, 3], "x": 15.3, "y": 0},
+                {"matrix": [9, 1], "x": 16.3, "y": 0},
+                {"matrix": [8, 1], "x": 17.3, "y": 0},
+                {"matrix": [8, 0], "x": 18.3, "y": 0},
+
+                {"matrix": [9, 7], "x": 0, "y": 1.15},
+                {"matrix": [2, 5], "x": 1, "y": 1.15},
+                {"matrix": [2, 6], "x": 2, "y": 1.15},
+                {"matrix": [0, 3], "x": 3, "y": 1.15},
+                {"matrix": [7, 7], "x": 4, "y": 1.15},
+                {"matrix": [9, 6], "x": 5, "y": 1.15},
+                {"matrix": [8, 2], "x": 6, "y": 1.15},
+                {"matrix": [1, 7], "x": 7, "y": 1.15},
+                {"matrix": [6, 3], "x": 8, "y": 1.15},
+                {"matrix": [8, 5], "x": 9, "y": 1.15},
+                {"matrix": [6, 5], "x": 10, "y": 1.15},
+                {"matrix": [6, 6], "x": 11, "y": 1.15},
+                {"matrix": [0, 6], "x": 12, "y": 1.15},
+                {"matrix": [3, 2], "x": 13, "y": 1.15, "w": 2},
+
+                {"matrix": [0, 8], "x": 15.3, "y": 1.15},
+                {"matrix": [5, 1], "x": 16.3, "y": 1.15},
+                {"matrix": [7, 1], "x": 17.3, "y": 1.15},
+                {"matrix": [6, 1], "x": 18.3, "y": 1.15},
+
+                {"matrix": [8, 3], "x": 0, "y": 2.15, "w": 1.5},
+                {"matrix": [9, 2], "x": 1.5, "y": 2.15},
+                {"matrix": [3, 6], "x": 2.5, "y": 2.15},
+                {"matrix": [3, 5], "x": 3.5, "y": 2.15},
+                {"matrix": [1, 4], "x": 4.5, "y": 2.15},
+                {"matrix": [2, 3], "x": 5.5, "y": 2.15},
+                {"matrix": [4, 3], "x": 6.5, "y": 2.15},
+                {"matrix": [5, 7], "x": 7.5, "y": 2.15},
+                {"matrix": [1, 8], "x": 8.5, "y": 2.15},
+                {"matrix": [6, 2], "x": 9.5, "y": 2.15},
+                {"matrix": [1, 11], "x": 10.5, "y": 2.15},
+                {"matrix": [1, 2], "x": 11.5, "y": 2.15},
+                {"matrix": [5, 5], "x": 12.5, "y": 2.15},
+                {"matrix": [4, 1], "x": 13.5, "y": 2.15, "w": 1.5},
+
+                {"matrix": [6, 0], "x": 15.3, "y": 2.15},
+                {"matrix": [0, 1], "x": 16.3, "y": 2.15},
+                {"matrix": [5, 8], "x": 17.3, "y": 2.15},
+                {"matrix": [5, 0], "x": 18.3, "y": 2.15, "h": 2},
+
+                {"matrix": [1, 3], "x": 0, "y": 3.15, "w": 1.75},
+                {"matrix": [1, 0], "x": 1.75, "y": 3.15},
+                {"matrix": [7, 2], "x": 2.75, "y": 3.15},
+                {"matrix": [5, 3], "x": 3.75, "y": 3.15},
+                {"matrix": [1, 1], "x": 4.75, "y": 3.15},
+                {"matrix": [0, 9], "x": 5.75, "y": 3.15},
+                {"matrix": [7, 4], "x": 6.75, "y": 3.15},
+                {"matrix": [7, 5], "x": 7.75, "y": 3.15},
+                {"matrix": [7, 6], "x": 8.75, "y": 3.15},
+                {"matrix": [5, 4], "x": 9.75, "y": 3.15},
+                {"matrix": [1, 6], "x": 10.75, "y": 3.15},
+                {"matrix": [5, 6], "x": 11.75, "y": 3.15},
+                {"matrix": [5, 2], "x": 12.75, "y": 3.15, "w": 2.25},
+
+                {"matrix": [1, 12], "x": 15.3, "y": 3.15},
+                {"matrix": [0, 0], "x": 16.3, "y": 3.15},
+                {"matrix": [6, 8], "x": 17.3, "y": 3.15},
+
+                {"matrix": [9, 12], "x": 0, "y": 4.15, "w": 2.25},
+                {"matrix": [1, 9], "x": 2.25, "y": 4.15},
+                {"matrix": [9, 4], "x": 3.25, "y": 4.15},
+                {"matrix": [0, 10], "x": 4.25, "y": 4.15},
+                {"matrix": [4, 2], "x": 5.25, "y": 4.15},
+                {"matrix": [9, 3], "x": 6.25, "y": 4.15},
+                {"matrix": [3, 7], "x": 7.25, "y": 4.15},
+                {"matrix": [8, 4], "x": 8.25, "y": 4.15},
+                {"matrix": [3, 3], "x": 9.25, "y": 4.15},
+                {"matrix": [1, 5], "x": 10.25, "y": 4.15},
+                {"matrix": [4, 4], "x": 11.25, "y": 4.15},
+                {"matrix": [8, 12], "x": 12.25, "y": 4.15, "w": 1.75},
+
+                {"matrix": [8, 7], "x": 14.15, "y": 4.3},
+
+                {"matrix": [3, 1], "x": 15.3, "y": 4.15},
+                {"matrix": [8, 8], "x": 16.3, "y": 4.15},
+                {"matrix": [7, 8], "x": 17.3, "y": 4.15},
+                {"matrix": [2, 0], "x": 18.3, "y": 4.15, "h": 2},
+
+                {"matrix": [5, 10], "x": 0, "y": 5.15, "w": 1.25},
+                {"matrix": [3, 9], "x": 1.25, "y": 5.15, "w": 1.25},
+                {"matrix": [7, 11], "x": 2.5, "y": 5.15, "w": 1.25},
+                {"matrix": [0, 12], "x": 3.75, "y": 5.15, "w": 6.25},
+                {"matrix": [6, 11], "x": 10, "y": 5.15},
+                {"matrix": [2, 8], "x": 11, "y": 5.15},
+                {"matrix": [4, 10], "x": 12, "y": 5.15},
+
+                {"matrix": [4, 7], "x": 13.15, "y": 5.3},
+                {"matrix": [6, 7], "x": 14.15, "y": 5.3},
+                {"matrix": [2, 7], "x": 15.15, "y": 5.3},
+
+                {"matrix": [3, 0], "x": 16.3, "y": 5.15},
+                {"matrix": [7, 0], "x": 17.3, "y": 5.15}
+            ]
         }
     }
 }
diff --git a/keyboards/kabedon/kabedon980/kabedon980.c b/keyboards/kabedon/kabedon980/kabedon980.c
index f0c8382d66..0614972f5e 100644
--- a/keyboards/kabedon/kabedon980/kabedon980.c
+++ b/keyboards/kabedon/kabedon980/kabedon980.c
@@ -1,4 +1,4 @@
-#include "kabedon980.h"
+#include "quantum.h"
 
  bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
diff --git a/keyboards/kabedon/kabedon980/kabedon980.h b/keyboards/kabedon/kabedon980/kabedon980.h
deleted file mode 100644
index 0355955b66..0000000000
--- a/keyboards/kabedon/kabedon980/kabedon980.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-        KI06,   KC04, KD04, KB10, KA05,   KA11, KA02, KC01, KA04,   KA07, KC02, KJ05, KE06,   KH03, KJ01, KI01, KI00, \
-        KJ07, KC05, KC06, KA03, KH07, KJ06, KI02, KB07, KG03, KI05, KG05, KG06, KA06, KD02,   KA08, KF01, KH01, KG01, \
-        KI03, KJ02, KD06, KD05, KB04, KC03, KE03, KF07, KB08, KG02, KB11, KB02, KF05, KE01,   KG00, KA01, KF08, KF00, \
-        KB03, KB00, KH02, KF03, KB01, KA09, KH04, KH05, KH06, KF04, KB06, KF06,    KF02,      KB12, KA00, KG08,       \
-        KJ12, KB09, KJ04, KA10, KE02, KJ03, KD07, KI04, KD03, KB05, KE04, KI12,       KI07,   KD01, KI08, KH08, KC00, \
-        KF10, KD09, KH11,                KA12,                KG11, KC08, KE10, KE07, KG07, KC07,   KD00, KH00       \
-) { \
-  { KA00,  KA01,  KA02,  KA03,  KA04,  KA05,  KA06,  KA07,  KA08,  KA09,  KA10,  KA11,  KA12 }, \
-  { KB00,  KB01,  KB02,  KB03,  KB04,  KB05,  KB06,  KB07,  KB08,  KB09,  KB10,  KB11,  KB12 }, \
-  { KC00,  KC01,  KC02,  KC03,  KC04,  KC05,  KC06,  KC07,  KC08, KC_NO, KC_NO, KC_NO, KC_NO }, \
-  { KD00,  KD01,  KD02,  KD03,  KD04,  KD05,  KD06,  KD07, KC_NO,  KD09, KC_NO, KC_NO, KC_NO }, \
-  { KC_NO, KE01,  KE02,  KE03,  KE04, KC_NO,  KE06,  KE07, KC_NO, KC_NO,  KE10, KC_NO, KC_NO }, \
-  { KF00,  KF01,  KF02,  KF03,  KF04,  KF05,  KF06,  KF07,  KF08, KC_NO,  KF10, KC_NO, KC_NO }, \
-  { KG00,  KG01,  KG02,  KG03, KC_NO,  KG05,  KG06,  KG07,  KG08, KC_NO, KC_NO,  KG11, KC_NO }, \
-  { KH00,  KH01,  KH02,  KH03,  KH04,  KH05,  KH06,  KH07,  KH08, KC_NO, KC_NO,  KH11, KC_NO }, \
-  { KI00,  KI01,  KI02,  KI03,  KI04,  KI05,  KI06,  KI07,  KI08, KC_NO, KC_NO, KC_NO,  KI12 }, \
-  { KC_NO, KJ01,  KJ02,  KJ03,  KJ04,  KJ05,  KJ06,  KJ07, KC_NO, KC_NO, KC_NO, KC_NO,  KJ12 }  \
-}
-
-