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

3 files changed, 60 insertions, 17 deletions

diff --git a/keyboards/shambles/info.json b/keyboards/shambles/info.json
index b57cdd3a00..b49849b5c6 100644
--- a/keyboards/shambles/info.json
+++ b/keyboards/shambles/info.json
@@ -17,7 +17,65 @@
   "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT": {
-      "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1.5, "y":0}, {"label":"K02", "x":2.5, "y":0}, {"label":"K03", "x":3.5, "y":0}, {"label":"K04", "x":4.75, "y":0}, {"label":"K05", "x":5.75, "y":0}, {"label":"K06", "x":6.75, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"K08", "x":9, "y":0}, {"label":"K09", "x":10.25, "y":0}, {"label":"K10", "x":11.25, "y":0}, {"label":"K11", "x":12.25, "y":0}, {"label":"K12", "x":0, "y":1.5}, {"label":"K13", "x":1, "y":1.5}, {"label":"K14", "x":2, "y":1.5}, {"label":"K15", "x":3, "y":1.5}, {"label":"K16", "x":4, "y":1.5}, {"label":"K17", "x":5, "y":1.5}, {"label":"K18", "x":6, "y":1.5}, {"label":"K19", "x":7, "y":1.5}, {"label":"K20", "x":8, "y":1.5}, {"label":"K21", "x":9, "y":1.5}, {"label":"K22", "x":10.25, "y":1.25}, {"label":"K23", "x":11.25, "y":1.25}, {"label":"K24", "x":12.25, "y":1.25}, {"label":"K25", "x":0, "y":2.5}, {"label":"K26", "x":1, "y":2.5}, {"label":"K27", "x":2, "y":2.5}, {"label":"K28", "x":3, "y":2.5}, {"label":"K29", "x":4, "y":2.5}, {"label":"K30", "x":5, "y":2.5}, {"label":"K31", "x":6, "y":2.5}, {"label":"K32", "x":7, "y":2.5}, {"label":"K33", "x":8, "y":2.5}, {"label":"K34", "x":9, "y":2.5}, {"label":"K35", "x":11.25, "y":2.5}, {"label":"K36", "x":0.5, "y":3.5}, {"label":"K37", "x":1.5, "y":3.5}, {"label":"K38", "x":2.5, "y":3.5}, {"label":"K39", "x":3.5, "y":3.5}, {"label":"K40", "x":4.5, "y":3.5, "w":2}, {"label":"K41", "x":6.5, "y":3.5}, {"label":"K42", "x":7.5, "y":3.5}, {"label":"K43", "x":8.5, "y":3.5}, {"label":"K44", "x":10.25, "y":3.5}, {"label":"K45", "x":11.25, "y":3.5}, {"label":"K43", "x":12.25, "y":3.5}]
+      "layout": [
+          {"matrix": [0, 0], "x": 0, "y": 0},
+
+          {"matrix": [0, 1], "x": 1.5, "y": 0},
+          {"matrix": [0, 2], "x": 2.5, "y": 0},
+          {"matrix": [0, 3], "x": 3.5, "y": 0},
+
+          {"matrix": [0, 5], "x": 4.75, "y": 0},
+          {"matrix": [0, 6], "x": 5.75, "y": 0},
+          {"matrix": [0, 7], "x": 6.75, "y": 0},
+
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [0, 9], "x": 9, "y": 0},
+
+          {"matrix": [0, 10], "x": 10.25, "y": 0},
+          {"matrix": [0, 11], "x": 11.25, "y": 0},
+          {"matrix": [0, 12], "x": 12.25, "y": 0},
+
+          {"matrix": [1, 0], "x": 0, "y": 1.5},
+          {"matrix": [1, 1], "x": 1, "y": 1.5},
+          {"matrix": [1, 2], "x": 2, "y": 1.5},
+          {"matrix": [1, 3], "x": 3, "y": 1.5},
+          {"matrix": [1, 4], "x": 4, "y": 1.5},
+          {"matrix": [1, 5], "x": 5, "y": 1.5},
+          {"matrix": [1, 6], "x": 6, "y": 1.5},
+          {"matrix": [1, 7], "x": 7, "y": 1.5},
+          {"matrix": [1, 8], "x": 8, "y": 1.5},
+          {"matrix": [1, 9], "x": 9, "y": 1.5},
+
+          {"matrix": [1, 10], "x": 10.25, "y": 1.25},
+          {"matrix": [1, 11], "x": 11.25, "y": 1.25},
+          {"matrix": [1, 12], "x": 12.25, "y": 1.25},
+
+          {"matrix": [2, 0], "x": 0, "y": 2.5},
+          {"matrix": [2, 1], "x": 1, "y": 2.5},
+          {"matrix": [2, 2], "x": 2, "y": 2.5},
+          {"matrix": [2, 3], "x": 3, "y": 2.5},
+          {"matrix": [2, 4], "x": 4, "y": 2.5},
+          {"matrix": [2, 5], "x": 5, "y": 2.5},
+          {"matrix": [2, 6], "x": 6, "y": 2.5},
+          {"matrix": [2, 7], "x": 7, "y": 2.5},
+          {"matrix": [2, 8], "x": 8, "y": 2.5},
+          {"matrix": [2, 9], "x": 9, "y": 2.5},
+
+          {"matrix": [2, 11], "x": 11.25, "y": 2.5},
+
+          {"matrix": [3, 0], "x": 0.5, "y": 3.5},
+          {"matrix": [3, 1], "x": 1.5, "y": 3.5},
+          {"matrix": [3, 2], "x": 2.5, "y": 3.5},
+          {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+          {"matrix": [3, 5], "x": 4.5, "y": 3.5, "w": 2},
+          {"matrix": [3, 6], "x": 6.5, "y": 3.5},
+          {"matrix": [3, 7], "x": 7.5, "y": 3.5},
+          {"matrix": [3, 8], "x": 8.5, "y": 3.5},
+
+          {"matrix": [3, 10], "x": 10.25, "y": 3.5},
+          {"matrix": [3, 11], "x": 11.25, "y": 3.5},
+          {"matrix": [3, 12], "x": 12.25, "y": 3.5}
+      ]
     }
   }
 }
diff --git a/keyboards/shambles/keymaps/default/keymap.c b/keyboards/shambles/keymaps/default/keymap.c
index 6a076f7090..4ddda3b919 100644
--- a/keyboards/shambles/keymaps/default/keymap.c
+++ b/keyboards/shambles/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "shambles.h"
+#include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
diff --git a/keyboards/shambles/shambles.h b/keyboards/shambles/shambles.h
deleted file mode 100644
index 5fb13b6358..0000000000
--- a/keyboards/shambles/shambles.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K000, K001, K002, K003,       K005, K006, K007, K008, K009, K010, K011, K012, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209,       K211,       \
-	K300, K301, K302, K303,       K305, K306, K307, K308,       K310, K311, K312  \
-) { \
-	{ K000,  K001,  K002,  K003,  KC_NO, K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  KC_NO, K211,  KC_NO }, \
-	{ K300,  K301,  K302,  K303,  KC_NO, K305,  K306,  K307,  K308,  KC_NO, K310,  K311,  K312 }  \
-}