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

3 files changed, 90 insertions, 115 deletions

diff --git a/keyboards/viktus/sp_mini/info.json b/keyboards/viktus/sp_mini/info.json
index 4ac4e95913..d804182f4e 100644
--- a/keyboards/viktus/sp_mini/info.json
+++ b/keyboards/viktus/sp_mini/info.json
@@ -34,79 +34,95 @@
     "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.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.75, "y":0},
-                {"x":8.75, "y":0},
-                {"x":9.75, "y":0},
-                {"x":10.75, "y":0},
-                {"x":11.75, "y":0},
-                {"x":12.75, "y":0},
-                {"x":13.75, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1.25},
-                {"label":"Esc", "x":1.25, "y":1.25},
-                {"label":"Q", "x":2.25, "y":1.25},
-                {"label":"W", "x":3.25, "y":1.25},
-                {"label":"E", "x":4.25, "y":1.25},
-                {"label":"R", "x":5.25, "y":1.25},
-                {"label":"T", "x":6.25, "y":1.25},
-                {"label":"Y", "x":7.75, "y":1.25},
-                {"label":"U", "x":8.75, "y":1.25},
-                {"label":"I", "x":9.75, "y":1.25},
-                {"label":"O", "x":10.75, "y":1.25},
-                {"label":"P", "x":11.75, "y":1.25},
-                {"label":"Delete", "x":12.75, "y":1.25},
-                {"label":"Back", "x":13.75, "y":1.25},
-                {"x":15, "y":1.25},
-
-                {"x":0, "y":2.25},
-                {"label":"Tab", "x":1.25, "y":2.25, "w":1.25},
-                {"label":"A", "x":2.5, "y":2.25},
-                {"label":"S", "x":3.5, "y":2.25},
-                {"label":"D", "x":4.5, "y":2.25},
-                {"label":"F", "x":5.5, "y":2.25},
-                {"label":"G", "x":6.5, "y":2.25},
-                {"label":"H", "x":8, "y":2.25},
-                {"label":"J", "x":9, "y":2.25},
-                {"label":"K", "x":10, "y":2.25},
-                {"label":"L", "x":11, "y":2.25},
-                {"label":"\"", "x":12, "y":2.25},
-                {"label":"Enter", "x":13, "y":2.25, "w":1.75},
-                {"x":15, "y":2.25},
-
-                {"x":0, "y":3.25},
-                {"label":"Shift", "x":1.25, "y":3.25, "w":1.75},
-                {"label":"Z", "x":3, "y":3.25},
-                {"label":"X", "x":4, "y":3.25},
-                {"label":"C", "x":5, "y":3.25},
-                {"label":"V", "x":6, "y":3.25},
-                {"label":"B", "x":7, "y":3.25},
-                {"label":"N", "x":8.5, "y":3.25},
-                {"label":"M", "x":9.5, "y":3.25},
-                {"label":"<", "x":10.5, "y":3.25},
-                {"label":">", "x":11.5, "y":3.25},
-                {"label":"Shift", "x":12.5, "y":3.25, "w":1.25},
-                {"label":"\u2191", "x":14, "y":3.5},
-
-                {"x":0, "y":4.25},
-                {"label":"Ctrl", "x":1.25, "y":4.25, "w":1.25},
-                {"label":"LAlt", "x":2.5, "y":4.25},
-                {"label":"LGUI", "x":3.5, "y":4.25},
-                {"label":"Fn1", "x":4.5, "y":4.25, "w":1.25},
-                {"label":"SPFn1", "x":5.75, "y":4.25, "w":2},
-                {"label":"BSFn2", "x":8.25, "y":4.25, "w":2.25},
-                {"label":"Alt", "x":10.5, "y":4.25, "w":1.25},
-                {"label":"Fn2", "x":11.75, "y":4.25},
-                {"label":"\u2190", "x":13, "y":4.5},
-                {"label":"\u2193", "x":14, "y":4.5},
-                {"label":"\u2192", "x":15, "y":4.5}]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+
+                {"matrix": [5, 0], "x": 7.75, "y": 0},
+                {"matrix": [5, 1], "x": 8.75, "y": 0},
+                {"matrix": [5, 2], "x": 9.75, "y": 0},
+                {"matrix": [5, 3], "x": 10.75, "y": 0},
+                {"matrix": [5, 4], "x": 11.75, "y": 0},
+                {"matrix": [5, 5], "x": 12.75, "y": 0},
+                {"matrix": [5, 6], "x": 13.75, "y": 0},
+
+                {"matrix": [5, 7], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 7.75, "y": 1.25},
+                {"matrix": [6, 1], "x": 8.75, "y": 1.25},
+                {"matrix": [6, 2], "x": 9.75, "y": 1.25},
+                {"matrix": [6, 3], "x": 10.75, "y": 1.25},
+                {"matrix": [6, 4], "x": 11.75, "y": 1.25},
+                {"matrix": [6, 5], "x": 12.75, "y": 1.25},
+                {"matrix": [6, 6], "x": 13.75, "y": 1.25},
+
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 8, "y": 2.25},
+                {"matrix": [7, 1], "x": 9, "y": 2.25},
+                {"matrix": [7, 2], "x": 10, "y": 2.25},
+                {"matrix": [7, 3], "x": 11, "y": 2.25},
+                {"matrix": [7, 4], "x": 12, "y": 2.25},
+                {"matrix": [7, 6], "x": 13, "y": 2.25, "w": 1.75},
+
+                {"matrix": [7, 7], "x": 15, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3, "y": 3.25},
+                {"matrix": [3, 3], "x": 4, "y": 3.25},
+                {"matrix": [3, 4], "x": 5, "y": 3.25},
+                {"matrix": [3, 5], "x": 6, "y": 3.25},
+                {"matrix": [3, 6], "x": 7, "y": 3.25},
+
+                {"matrix": [8, 1], "x": 8.5, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.5, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.5, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.5, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.5, "y": 3.25, "w": 1.25},
+
+                {"matrix": [8, 6], "x": 14, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.25, "w": 2},
+
+                {"matrix": [9, 2], "x": 8.25, "y": 4.25, "w": 2.25},
+                {"matrix": [9, 3], "x": 10.5, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 4], "x": 11.75, "y": 4.25},
+
+                {"matrix": [9, 5], "x": 13, "y": 4.5},
+                {"matrix": [9, 6], "x": 14, "y": 4.5},
+                {"matrix": [9, 7], "x": 15, "y": 4.5}
+            ]
         }
     }
 }
diff --git a/keyboards/viktus/sp_mini/sp_mini.c b/keyboards/viktus/sp_mini/sp_mini.c
index c2ccc6db2f..ffae6c5c54 100644
--- a/keyboards/viktus/sp_mini/sp_mini.c
+++ b/keyboards/viktus/sp_mini/sp_mini.c
@@ -14,7 +14,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
-#include "sp_mini.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     // enable built in pullups to avoid timeouts when right hand not connected
diff --git a/keyboards/viktus/sp_mini/sp_mini.h b/keyboards/viktus/sp_mini/sp_mini.h
deleted file mode 100644
index 6474a4f71e..0000000000
--- a/keyboards/viktus/sp_mini/sp_mini.h
+++ /dev/null
@@ -1,41 +0,0 @@
- /* Copyright 2021 jrfhoutx
-  *
-  * 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 ___ KC_NO
-
-#define LAYOUT_all( \
-    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \
-    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \
-    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24,      R26, R27, \
-    L30, L31, L32, L33, L34, L35, L36,      R31, R32, R33, R34, R35, R36,      \
-    L40, L41, L42, L43, L44, L45,                R42, R43, R44, R45, R46, R47  \
-    ) \
-    { \
-    { L00, L01, L02, L03, L04, L05, L06     }, \
-    { L10, L11, L12, L13, L14, L15, L16     }, \
-    { L20, L21, L22, L23, L24, L25, L26     }, \
-    { L30, L31, L32, L33, L34, L35, L36     }, \
-    { L40, L41, L42, L43, L44, L45, ___     }, \
-    { R00, R01, R02, R03, R04, R05, R06, R07}, \
-    { R10, R11, R12, R13, R14, R15, R16, R17}, \
-    { R20, R21, R22, R23, R24, ___, R26, R27}, \
-    { ___, R31, R32, R33, R34, R35, R36, ___}, \
-    { ___, ___, R42, R43, R44, R45, R46, R47}  \
-}