Move miscellaneous layouts to data driven (#20516)

2 files changed, 111 insertions, 138 deletions

diff --git a/keyboards/nightly_boards/adellein/adellein.h b/keyboards/nightly_boards/adellein/adellein.h
index c78b76fbad..33cf8e0b68 100644
--- a/keyboards/nightly_boards/adellein/adellein.h
+++ b/keyboards/nightly_boards/adellein/adellein.h
@@ -18,38 +18,3 @@
 
 #include "quantum.h"
 #include "encoder_action.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT_40ergo_split_ent( \
-      K00, K01, K02, K03, K04, K05,          K06, K07, K08, K09, K0A, K0B, K0C,       \
-     K10,  K11, K12, K13, K14, K15,            K16, K17, K18, K19, K1A, K1B, K1C,     \
-    K20,    K21, K22, K23, K24, K25,          K26, K27, K28, K29, K2A, K2B, K2C,      \
-     K30,        K32,   K34,       K35,     K37,         K39,                K3C      \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C   }, \
-    { K30,   KC_NO, K32,   KC_NO, K34,   K35,   KC_NO, K37,   KC_NO, K39,   KC_NO, KC_NO, K3C   }, \
-}
-
-#define LAYOUT_40ergo_split_ent_encoder( \
-      K00, K01, K02, K03, K04, K05,          K06, K07, K08, K09, K0A, K0B, K0C,       \
-     K10,  K11, K12, K13, K14, K15,            K16, K17, K18, K19, K1A, K1B, K1C,     \
-    K20,    K21, K22, K23, K24, K25,          K26, K27, K28, K29, K2A, K2B, K2C,      \
-     K30,        K32,   K34,       K35,     K37,         K39,                K3C,      \
-	                            E00A, E00B                                            \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C   }, \
-    { K30,   E00A,  K32,  E00B,   K34,   K35,   KC_NO, K37,   KC_NO, K39,   KC_NO, KC_NO, K3C   }, \
-}
-
diff --git a/keyboards/nightly_boards/adellein/info.json b/keyboards/nightly_boards/adellein/info.json
index d45356262d..5aca4e8a1d 100644
--- a/keyboards/nightly_boards/adellein/info.json
+++ b/keyboards/nightly_boards/adellein/info.json
@@ -26,112 +26,120 @@
     "layouts": {
         "LAYOUT_40ergo_split_ent": {
             "layout": [
-			{"x":0.5, "y":0}, 
-			{"x":1.5, "y":0}, 
-			{"x":2.5, "y":0}, 
-			{"x":3.5, "y":0}, 
-			{"x":4.5, "y":0}, 
-			{"x":5.5, "y":0}, 
-			{"x":8.25, "y":0}, 
-			{"x":9.25, "y":0}, 
-			{"x":10.25, "y":0}, 
-			{"x":11.25, "y":0}, 
-			{"x":12.25, "y":0}, 
-			{"x":13.25, "y":0}, 
-			{"x":14.25, "y":0, "w":1.5}, 
-			
-			{"x":0.25, "y":1, "w":1.25}, 
-			{"x":1.5, "y":1}, 
-			{"x":2.5, "y":1}, 
-			{"x":3.5, "y":1}, 
-			{"x":4.5, "y":1}, 
-			{"x":5.5, "y":1}, 
-			{"x":8.75, "y":1}, 
-			{"x":9.75, "y":1}, 
-			{"x":10.75, "y":1}, 
-			{"x":11.75, "y":1}, 
-			{"x":12.75, "y":1}, 
-			{"x":13.75, "y":1}, 
-			{"x":14.75, "y":1, "w":1.25}, 
-			
-			{"x":0, "y":2, "w":1.75}, 
-			{"x":1.75, "y":2}, 
-			{"x":2.75, "y":2}, 
-			{"x":3.75, "y":2}, 
-			{"x":4.75, "y":2}, 
-			{"x":5.75, "y":2}, 
-			{"x":8.5, "y":2}, 
-			{"x":9.5, "y":2}, 
-			{"x":10.5, "y":2}, 
-			{"x":11.5, "y":2}, 
-			{"x":12.5, "y":2}, 
-			{"x":13.5, "y":2}, 
-			{"x":14.5, "y":2, "w":1.75}, 
-			
-			{"x":0.25, "y":3, "w":1.25}, 
-			{"x":2.75, "y":3, "w":1.25}, 
-			{"x":4, "y":3, "w":2.25}, 
-			{"x":6.25, "y":3}, 
-			{"x":8, "y":3, "w":2.75}, 
-			{"x":10.75, "y":3, "w":1.25}, 
-			{"x":14.75, "y":3, "w":1.25}
-			]
+                {"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, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+                {"matrix": [0, 7], "x": 9.25, "y": 0},
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8.75, "y": 1},
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [2, 6], "x": 8.5, "y": 2},
+                {"matrix": [2, 7], "x": 9.5, "y": 2},
+                {"matrix": [2, 8], "x": 10.5, "y": 2},
+                {"matrix": [2, 9], "x": 11.5, "y": 2},
+                {"matrix": [2, 10], "x": 12.5, "y": 2},
+                {"matrix": [2, 11], "x": 13.5, "y": 2},
+                {"matrix": [2, 12], "x": 14.5, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [3, 7], "x": 8, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.25}
+            ]
         },
         "LAYOUT_40ergo_split_ent_encoder": {
             "layout": [
-			{"x":0.5, "y":0}, 
-			{"x":1.5, "y":0}, 
-			{"x":2.5, "y":0}, 
-			{"x":3.5, "y":0}, 
-			{"x":4.5, "y":0}, 
-			{"x":5.5, "y":0}, 
-			{"x":8.25, "y":0}, 
-			{"x":9.25, "y":0}, 
-			{"x":10.25, "y":0}, 
-			{"x":11.25, "y":0}, 
-			{"x":12.25, "y":0}, 
-			{"x":13.25, "y":0}, 
-			{"x":14.25, "y":0, "w":1.5}, 
-			
-			{"x":0.25, "y":1, "w":1.25}, 
-			{"x":1.5, "y":1}, 
-			{"x":2.5, "y":1}, 
-			{"x":3.5, "y":1}, 
-			{"x":4.5, "y":1}, 
-			{"x":5.5, "y":1}, 
-			{"x":8.75, "y":1}, 
-			{"x":9.75, "y":1}, 
-			{"x":10.75, "y":1}, 
-			{"x":11.75, "y":1}, 
-			{"x":12.75, "y":1}, 
-			{"x":13.75, "y":1}, 
-			{"x":14.75, "y":1, "w":1.25},
-			
-			{"x":0, "y":2, "w":1.75}, 
-			{"x":1.75, "y":2}, 
-			{"x":2.75, "y":2}, 
-			{"x":3.75, "y":2}, 
-			{"x":4.75, "y":2}, 
-			{"x":5.75, "y":2}, 
-			{"x":8.5, "y":2}, 
-			{"x":9.5, "y":2}, 
-			{"x":10.5, "y":2}, 
-			{"x":11.5, "y":2}, 
-			{"x":12.5, "y":2}, 
-			{"x":13.5, "y":2}, 
-			{"x":14.5, "y":2, "w":1.75}, 
-			
-			{"x":0.25, "y":3, "w":1.25}, 
-			{"x":2.75, "y":3, "w":1.25}, 
-			{"x":4, "y":3, "w":2.25}, 
-			{"x":6.25, "y":3}, 
-			{"x":8, "y":3, "w":2.75}, 
-			{"x":10.75, "y":3, "w":1.25}, 
-			{"x":14.75, "y":3, "w":1.25}, 
-			
-			{"x":5.75, "y":4}, 
-			{"x":6.75, "y":4}
-			]
+                {"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, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+                {"matrix": [0, 7], "x": 9.25, "y": 0},
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+                {"matrix": [0, 9], "x": 11.25, "y": 0},
+                {"matrix": [0, 10], "x": 12.25, "y": 0},
+                {"matrix": [0, 11], "x": 13.25, "y": 0},
+                {"matrix": [0, 12], "x": 14.25, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+                {"matrix": [1, 6], "x": 8.75, "y": 1},
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+                {"matrix": [2, 6], "x": 8.5, "y": 2},
+                {"matrix": [2, 7], "x": 9.5, "y": 2},
+                {"matrix": [2, 8], "x": 10.5, "y": 2},
+                {"matrix": [2, 9], "x": 11.5, "y": 2},
+                {"matrix": [2, 10], "x": 12.5, "y": 2},
+                {"matrix": [2, 11], "x": 13.5, "y": 2},
+                {"matrix": [2, 12], "x": 14.5, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+                {"matrix": [3, 7], "x": 8, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 5.75, "y": 4},
+                {"matrix": [3, 3], "x": 6.75, "y": 4}
+            ]
         }
     }
 }