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

2 files changed, 100 insertions, 145 deletions

diff --git a/keyboards/qwertlekeys/calice/calice.h b/keyboards/qwertlekeys/calice/calice.h
deleted file mode 100644
index e418266dd9..0000000000
--- a/keyboards/qwertlekeys/calice/calice.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  copyright 2021 Joah Nelson (jels)
-*
-*   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
-*   MERAHANTABILITY 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 <https://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-
-#define LAYOUT_all( \
-    K0B0, K0A0, K0B1, K0A1, K0B2, K0A2, K0B3, K0A4, K0B4, K0A5, K0B5, K0A6, K0B6, K0A7, K0B7, \
-    K1B0, K1A0, K1B1, K1A1, K1B2, K1A2, K1B3, K1A4, K1B4, K1A5, K1B5, K1A6, K1B6, K2B6, K1A7, K1B7, \
-    K2B0, K2A0, K2B1, K2A1, K2B2, K2A2, K2B3, K2A4, K2B4, K2A5, K2B5, K2A6, K3B6, K2A7, K2B7, \
-    K3B0, K3A0, K3B1, K3A1, K3B2, K3A2, K3B3, K3A4, K3B4, K3A5, K3B5, K3A6, K3A7, K3B7, \
-    K4B0, K4A0, K4B1, K4A1, K4B2, K4A2, K4B3, K4A4, K4B4, K4A5, K4B5, K4A6, K4B6, K4A7, \
-    K5B0,       K5A0,       K5B2, K5A2,       K5A4,       K5A5,             K5B6, K5A7, K5B7 \
-){ \
-    {K0A0, K0A1, K0A2, ____, K0A4, K0A5, K0A6, K0A7}, \
-    {K0B0, K0B1, K0B2, K0B3, K0B4, K0B5, K0B6, K0B7}, \
-    {K1A0, K1A1, K1A2, ____, K1A4, K1A5, K1A6, K1A7}, \
-    {K1B0, K1B1, K1B2, K1B3, K1B4, K1B5, K1B6, K1B7}, \
-    {K2A0, K2A1, K2A2, ____, K2A4, K2A5, K2A6, K2A7}, \
-    {K2B0, K2B1, K2B2, K2B3, K2B4, K2B5, K2B6, K2B7}, \
-    {K3A0, K3A1, K3A2, ____, K3A4, K3A5, K3A6, K3A7}, \
-    {K3B0, K3B1, K3B2, K3B3, K3B4, K3B5, K3B6, K3B7}, \
-    {K4A0, K4A1, K4A2, ____, K4A4, K4A5, K4A6, K4A7}, \
-    {K4B0, K4B1, K4B2, K4B3, K4B4, K4B5, K4B6, ____}, \
-    {K5A0, ____, K5A2, ____, K5A4, K5A5, ____, K5A7}, \
-    {K5B0, ____, K5B2, ____, ____, ____, K5B6, K5B7}  \
-}
diff --git a/keyboards/qwertlekeys/calice/info.json b/keyboards/qwertlekeys/calice/info.json
index dc6f25f02c..a0106741f5 100644
--- a/keyboards/qwertlekeys/calice/info.json
+++ b/keyboards/qwertlekeys/calice/info.json
@@ -29,107 +29,106 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":0, "y":0},
-
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-
-                {"x":5.75, "y":0},
-                {"x":6.75, "y":0},
-                {"x":7.75, "y":0},
-                {"x":8.75, "y":0},
-
-                {"x":10.25, "y":0},
-                {"x":11.25, "y":0},
-                {"x":12.25, "y":0},
-                {"x":13.25, "y":0},
-
-                {"x":14.5, "y":0},
-                {"x":16.25, "y":0},
-
-                {"x":0.75, "y":1.25},
-                {"x":1.75, "y":1.25},
-                {"x":2.75, "y":1.25},
-                {"x":3.75, "y":1.25},
-                {"x":4.75, "y":1.25},
-                {"x":5.75, "y":1.25},
-                {"x":6.75, "y":1.25},
-
-                {"x":8.25, "y":1.25},
-                {"x":9.25, "y":1.25},
-                {"x":10.25, "y":1.25},
-                {"x":11.25, "y":1.25},
-                {"x":12.25, "y":1.25},
-                {"x":13.25, "y":1.25},
-                {"x":14.25, "y":1.25},
-                {"x":15.25, "y":1.25},
-
-                {"x":16.5, "y":1},
-
-                {"x":0.5, "y":2.25, "w":1.5},
-                {"x":2, "y":2.25},
-                {"x":3, "y":2.25},
-                {"x":4, "y":2.25},
-                {"x":5, "y":2.25},
-                {"x":6, "y":2.25},
-
-                {"x":8, "y":2.25},
-                {"x":9, "y":2.25},
-                {"x":10, "y":2.25},
-                {"x":11, "y":2.25},
-                {"x":12, "y":2.25},
-                {"x":13, "y":2.25},
-                {"x":14, "y":2.25},
-                {"x":15, "y":2.25, "w":1.5},
-
-                {"x":16.75, "y":2},
-
-                {"x":0.25, "y":3.25, "w":1.75},
-                {"x":2, "y":3.25},
-                {"x":3, "y":3.25},
-                {"x":4, "y":3.25},
-                {"x":5, "y":3.25},
-                {"x":6, "y":3.25},
-
-                {"x":8.5, "y":3.25},
-                {"x":9.5, "y":3.25},
-                {"x":10.5, "y":3.25},
-                {"x":11.5, "y":3.25},
-                {"x":12.5, "y":3.25},
-                {"x":13.5, "y":3.25},
-                {"x":14.5, "y":3.25, "w":2.25},
-
-                {"x":17, "y":3},
-
-                {"x":0, "y":4.25, "w":2.25},
-                {"x":2.25, "y":4.25},
-                {"x":3.25, "y":4.25},
-                {"x":4.25, "y":4.25},
-                {"x":5.25, "y":4.25},
-                {"x":6.25, "y":4.25},
-
-                {"x":8.25, "y":4.25},
-                {"x":9.25, "y":4.25},
-                {"x":10.25, "y":4.25},
-                {"x":11.25, "y":4.25},
-                {"x":12.25, "y":4.25},
-                {"x":13.25, "y":4.25},
-                {"x":14.25, "y":4.25, "w":1.75},
-                {"x":16, "y":4.25},
-
-                {"x":0, "y":5.25, "w":1.5},
-                {"x":2.75, "y":5.25, "w":1.5},
-                {"x":4.25, "y":5.25, "w":2.25},
-                {"x":6.5, "y":5.25},
-
-                {"x":7.75, "y":5.25, "w":2.75},
-                {"x":10.5, "y":5.25, "w":1.5},
-
-                {"x":15, "y":5.25},
-                {"x":16, "y":5.25},
-                {"x":17, "y":5.25}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1.25, "y": 0},
+                {"matrix": [1, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 1], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+                {"matrix": [0, 2], "x": 5.75, "y": 0},
+                {"matrix": [1, 3], "x": 6.75, "y": 0},
+                {"matrix": [0, 4], "x": 7.75, "y": 0},
+                {"matrix": [1, 4], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [1, 5], "x": 11.25, "y": 0},
+                {"matrix": [0, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 6], "x": 13.25, "y": 0},
+
+                {"matrix": [0, 7], "x": 14.5, "y": 0},
+
+                {"matrix": [1, 7], "x": 16.25, "y": 0},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 1.25},
+                {"matrix": [2, 0], "x": 1.75, "y": 1.25},
+                {"matrix": [3, 1], "x": 2.75, "y": 1.25},
+                {"matrix": [2, 1], "x": 3.75, "y": 1.25},
+                {"matrix": [3, 2], "x": 4.75, "y": 1.25},
+                {"matrix": [2, 2], "x": 5.75, "y": 1.25},
+                {"matrix": [3, 3], "x": 6.75, "y": 1.25},
+
+                {"matrix": [2, 4], "x": 8.25, "y": 1.25},
+                {"matrix": [3, 4], "x": 9.25, "y": 1.25},
+                {"matrix": [2, 5], "x": 10.25, "y": 1.25},
+                {"matrix": [3, 5], "x": 11.25, "y": 1.25},
+                {"matrix": [2, 6], "x": 12.25, "y": 1.25},
+                {"matrix": [3, 6], "x": 13.25, "y": 1.25},
+                {"matrix": [5, 6], "x": 14.25, "y": 1.25},
+                {"matrix": [2, 7], "x": 15.25, "y": 1.25},
+
+                {"matrix": [3, 7], "x": 16.5, "y": 1},
+
+                {"matrix": [5, 0], "x": 0.5, "y": 2.25, "w": 1.5},
+                {"matrix": [4, 0], "x": 2, "y": 2.25},
+                {"matrix": [5, 1], "x": 3, "y": 2.25},
+                {"matrix": [4, 1], "x": 4, "y": 2.25},
+                {"matrix": [5, 2], "x": 5, "y": 2.25},
+                {"matrix": [4, 2], "x": 6, "y": 2.25},
+
+                {"matrix": [5, 3], "x": 8, "y": 2.25},
+                {"matrix": [4, 4], "x": 9, "y": 2.25},
+                {"matrix": [5, 4], "x": 10, "y": 2.25},
+                {"matrix": [4, 5], "x": 11, "y": 2.25},
+                {"matrix": [5, 5], "x": 12, "y": 2.25},
+                {"matrix": [4, 6], "x": 13, "y": 2.25},
+                {"matrix": [7, 6], "x": 14, "y": 2.25},
+                {"matrix": [4, 7], "x": 15, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 16.75, "y": 2},
+
+                {"matrix": [7, 0], "x": 0.25, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 0], "x": 2, "y": 3.25},
+                {"matrix": [7, 1], "x": 3, "y": 3.25},
+                {"matrix": [6, 1], "x": 4, "y": 3.25},
+                {"matrix": [7, 2], "x": 5, "y": 3.25},
+                {"matrix": [6, 2], "x": 6, "y": 3.25},
+
+                {"matrix": [7, 3], "x": 8.5, "y": 3.25},
+                {"matrix": [6, 4], "x": 9.5, "y": 3.25},
+                {"matrix": [7, 4], "x": 10.5, "y": 3.25},
+                {"matrix": [6, 5], "x": 11.5, "y": 3.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 3.25},
+                {"matrix": [6, 6], "x": 13.5, "y": 3.25},
+                {"matrix": [6, 7], "x": 14.5, "y": 3.25, "w": 2.25},
+
+                {"matrix": [7, 7], "x": 17, "y": 3},
+
+                {"matrix": [9, 0], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 0], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 12.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 13.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 14.25, "y": 4.25, "w": 1.75},
+                {"matrix": [8, 7], "x": 16, "y": 4.25},
+
+                {"matrix": [11, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 0], "x": 2.75, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 2], "x": 4.25, "y": 5.25, "w": 2.25},
+                {"matrix": [10, 2], "x": 6.5, "y": 5.25},
+
+                {"matrix": [10, 4], "x": 7.75, "y": 5.25, "w": 2.75},
+                {"matrix": [10, 5], "x": 10.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [11, 6], "x": 15, "y": 5.25},
+                {"matrix": [10, 7], "x": 16, "y": 5.25},
+                {"matrix": [11, 7], "x": 17, "y": 5.25}
             ]
         }
     }