Move single `LAYOUT_all`s to data driven (#20430)

2 files changed, 72 insertions, 109 deletions

diff --git a/keyboards/nightly_boards/daily60/daily60.h b/keyboards/nightly_boards/daily60/daily60.h
deleted file mode 100644
index 03e7e221d2..0000000000
--- a/keyboards/nightly_boards/daily60/daily60.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2022 DeskDaily
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.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_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
-    K40, K42, K43, K45, K47, K48, K49, K4A, K4B, K4C, K4D  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-    { K40, KC_NO, K42, K43, KC_NO, K45, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D }, \
-}
diff --git a/keyboards/nightly_boards/daily60/info.json b/keyboards/nightly_boards/daily60/info.json
index d8fd05b824..f1551f3a3e 100644
--- a/keyboards/nightly_boards/daily60/info.json
+++ b/keyboards/nightly_boards/daily60/info.json
@@ -17,74 +17,78 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-			{"x":0, "y":0}, 
-			{"x":1, "y":0}, 
-			{"x":2, "y":0}, 
-			{"x":3, "y":0}, 
-			{"x":4, "y":0}, 
-			{"x":5, "y":0}, 
-			{"x":6, "y":0}, 
-			{"x":7, "y":0}, 
-			{"x":8, "y":0}, 
-			{"x":9, "y":0}, 
-			{"x":10, "y":0}, 
-			{"x":11, "y":0}, 
-			{"x":12, "y":0}, 
-			{"x":13, "y":0}, 
-			{"x":14, "y":0}, 
-			{"x":0, "y":1, "w":1.5}, 
-			{"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":6.5, "y":1}, 
-			{"x":7.5, "y":1}, 
-			{"x":8.5, "y":1}, 
-			{"x":9.5, "y":1}, 
-			{"x":10.5, "y":1}, 
-			{"x":11.5, "y":1}, 
-			{"x":12.5, "y":1}, 
-			{"x":13.5, "y":1, "w":1.5}, 
-			{"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":6.75, "y":2}, 
-			{"x":7.75, "y":2}, 
-			{"x":8.75, "y":2}, 
-			{"x":9.75, "y":2}, 
-			{"x":10.75, "y":2}, 
-			{"x":11.75, "y":2}, 
-			{"x":12.75, "y":2, "w":2.25}, 
-			{"x":0, "y":3, "w":1.25}, 
-			{"x":1.25, "y":3}, 
-			{"x":2.25, "y":3}, 
-			{"x":3.25, "y":3}, 
-			{"x":4.25, "y":3}, 
-			{"x":5.25, "y":3}, 
-			{"x":6.25, "y":3}, 
-			{"x":7.25, "y":3}, 
-			{"x":8.25, "y":3}, 
-			{"x":9.25, "y":3}, 
-			{"x":10.25, "y":3}, 
-			{"x":11.25, "y":3}, 
-			{"x":12.25, "y":3, "w":1.75}, 
-			{"x":14, "y":3}, 
-			{"x":0, "y":4, "w":1.25}, 
-			{"x":1.25, "y":4, "w":1.25}, 
-			{"x":2.5, "y":4, "w":1.25}, 
-			{"x":3.75, "y":4, "w":1.75}, 
-			{"x":5.5, "y":4}, 
-			{"x":6.5, "y":4}, 
-			{"x":7.5, "y":4, "w":2.5}, 
-			{"x":10, "y":4, "w":1.25}, 
-			{"x":11.25, "y":4, "w":1.25}, 
-			{"x":12.5, "y":4, "w":1.25}, 
-			{"x":13.75, "y":4, "w":1.25}
-			]
+                {"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": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [1, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"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": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"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": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 1.75},
+                {"matrix": [4, 7], "x": 5.5, "y": 4},
+                {"matrix": [4, 8], "x": 6.5, "y": 4},
+                {"matrix": [4, 9], "x": 7.5, "y": 4, "w": 2.5},
+                {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+            ]
         }
     }
 }
\ No newline at end of file