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

2 files changed, 70 insertions, 37 deletions

diff --git a/keyboards/fr4/unix60/info.json b/keyboards/fr4/unix60/info.json
index 8703ebd5e2..e89273785b 100644
--- a/keyboards/fr4/unix60/info.json
+++ b/keyboards/fr4/unix60/info.json
@@ -17,7 +17,76 @@
     "bootloader": "caterina",
     "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, "w":0.6}, {"x":13.6, "y":0, "w":0.8}, {"x":14.4, "y":0, "w":0.6}, {"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}, {"x":13.75, "y":2, "w":1.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":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}]
+            "layout": [
+                {"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": [1, 0], "x": 9, "y": 0},
+                {"matrix": [1, 1], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+                {"matrix": [1, 3], "x": 12, "y": 0},
+
+                {"matrix": [1, 4], "x": 13, "y": 0, "w": 0.6},
+                {"matrix": [1, 5], "x": 13.6, "y": 0, "w": 0.8},
+                {"matrix": [1, 6], "x": 14.4, "y": 0, "w": 0.6},
+
+                {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 8], "x": 1.5, "y": 1},
+                {"matrix": [2, 0], "x": 2.5, "y": 1},
+                {"matrix": [2, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [2, 3], "x": 5.5, "y": 1},
+                {"matrix": [2, 4], "x": 6.5, "y": 1},
+                {"matrix": [2, 5], "x": 7.5, "y": 1},
+                {"matrix": [2, 6], "x": 8.5, "y": 1},
+                {"matrix": [2, 7], "x": 9.5, "y": 1},
+                {"matrix": [2, 8], "x": 10.5, "y": 1},
+                {"matrix": [3, 0], "x": 11.5, "y": 1},
+                {"matrix": [3, 1], "x": 12.5, "y": 1},
+                {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 3], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [3, 4], "x": 1.75, "y": 2},
+                {"matrix": [3, 5], "x": 2.75, "y": 2},
+                {"matrix": [3, 6], "x": 3.75, "y": 2},
+                {"matrix": [3, 7], "x": 4.75, "y": 2},
+                {"matrix": [3, 8], "x": 5.75, "y": 2},
+                {"matrix": [4, 0], "x": 6.75, "y": 2},
+                {"matrix": [4, 1], "x": 7.75, "y": 2},
+                {"matrix": [4, 2], "x": 8.75, "y": 2},
+                {"matrix": [4, 3], "x": 9.75, "y": 2},
+                {"matrix": [4, 4], "x": 10.75, "y": 2},
+                {"matrix": [4, 5], "x": 11.75, "y": 2},
+                {"matrix": [4, 6], "x": 12.75, "y": 2},
+                {"matrix": [4, 7], "x": 13.75, "y": 2, "w": 1.25},
+
+                {"matrix": [4, 8], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [5, 0], "x": 1.25, "y": 3},
+                {"matrix": [5, 1], "x": 2.25, "y": 3},
+                {"matrix": [5, 2], "x": 3.25, "y": 3},
+                {"matrix": [5, 3], "x": 4.25, "y": 3},
+                {"matrix": [5, 4], "x": 5.25, "y": 3},
+                {"matrix": [5, 5], "x": 6.25, "y": 3},
+                {"matrix": [5, 6], "x": 7.25, "y": 3},
+                {"matrix": [5, 7], "x": 8.25, "y": 3},
+                {"matrix": [5, 8], "x": 9.25, "y": 3},
+                {"matrix": [6, 0], "x": 10.25, "y": 3},
+                {"matrix": [6, 1], "x": 11.25, "y": 3},
+                {"matrix": [6, 2], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [6, 3], "x": 14, "y": 3},
+
+                {"matrix": [6, 4], "x": 1.5, "y": 4},
+                {"matrix": [6, 5], "x": 2.5, "y": 4, "w": 1.5},
+                {"matrix": [6, 6], "x": 4, "y": 4, "w": 7},
+                {"matrix": [6, 7], "x": 11, "y": 4, "w": 1.5},
+                {"matrix": [6, 8], "x": 12.5, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/fr4/unix60/unix60.h b/keyboards/fr4/unix60/unix60.h
deleted file mode 100644
index fa238da9eb..0000000000
--- a/keyboards/fr4/unix60/unix60.h
+++ /dev/null
@@ -1,36 +0,0 @@
- /*
- Copyright 2020 Lasse Küchenmeister
-
- 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"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, \
-    K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32,           \
-    K33, K34, K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47,           \
-    K48, K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63,           \
-         K64, K65,                K66,                     K67, K68                 \
-) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18 }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28 }, \
-	{ K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38 }, \
-	{ K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48 }, \
-	{ K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58 }, \
-	{ K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68 }  \
-}