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

3 files changed, 64 insertions, 103 deletions

diff --git a/keyboards/viktus/smolka/info.json b/keyboards/viktus/smolka/info.json
index e9727d48ff..64daf9b44c 100644
--- a/keyboards/viktus/smolka/info.json
+++ b/keyboards/viktus/smolka/info.json
@@ -27,61 +27,69 @@
     "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.25, "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},
-                {"x":0, "y":1},
-                {"x":1.25, "y":1, "w":1.25},
-                {"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, "w":1.75},
-                {"x":14.25, "y":1},
-                {"x":0, "y":2},
-                {"x":1.25, "y":2, "w":1.75},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2, "w":1.25},
-                {"x":13.25, "y":2},
-                {"x":14.25, "y":2},
-                {"x":0, "y":3},
-                {"x":1.25, "y":3, "w":1.25},
-                {"x":2.5, "y":3},
-                {"x":3.5, "y":3, "w":1.25},
-                {"x":4.75, "y":3, "w":3},
-                {"x":7.75, "y":3},
-                {"x":8.75, "y":3, "w":3},
-                {"x":9.75, "y":3},
-                {"x":10.75, "y":3},
-                {"x":12.25, "y":3},
-                {"x":13.25, "y":3},
-                {"x":14.25, "y":3}
+                {"matrix": [1, 0], "x": 0, "y": 0},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 1], "x": 2.25, "y": 0},
+                {"matrix": [0, 2], "x": 3.25, "y": 0},
+                {"matrix": [1, 2], "x": 4.25, "y": 0},
+                {"matrix": [1, 3], "x": 5.25, "y": 0},
+                {"matrix": [0, 3], "x": 6.25, "y": 0},
+                {"matrix": [0, 4], "x": 7.25, "y": 0},
+                {"matrix": [1, 4], "x": 8.25, "y": 0},
+                {"matrix": [1, 5], "x": 9.25, "y": 0},
+                {"matrix": [0, 5], "x": 10.25, "y": 0},
+                {"matrix": [0, 6], "x": 11.25, "y": 0},
+                {"matrix": [1, 6], "x": 12.25, "y": 0},
+                {"matrix": [1, 7], "x": 13.25, "y": 0},
+                {"matrix": [0, 7], "x": 14.25, "y": 0},
+
+                {"matrix": [3, 0], "x": 0, "y": 1},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 1, "w": 1.25},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [2, 2], "x": 3.5, "y": 1},
+                {"matrix": [3, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 3], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [2, 4], "x": 7.5, "y": 1},
+                {"matrix": [3, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 5], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [2, 6], "x": 11.5, "y": 1},
+                {"matrix": [3, 7], "x": 12.5, "y": 1, "w": 1.75},
+                {"matrix": [2, 7], "x": 14.25, "y": 1},
+
+                {"matrix": [5, 0], "x": 0, "y": 2},
+
+                {"matrix": [5, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [5, 3], "x": 6, "y": 2},
+                {"matrix": [4, 3], "x": 7, "y": 2},
+                {"matrix": [4, 4], "x": 8, "y": 2},
+                {"matrix": [5, 4], "x": 9, "y": 2},
+                {"matrix": [5, 5], "x": 10, "y": 2},
+                {"matrix": [4, 5], "x": 11, "y": 2},
+                {"matrix": [5, 6], "x": 12, "y": 2, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.25, "y": 2},
+                {"matrix": [4, 7], "x": 14.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 0, "y": 3},
+
+                {"matrix": [7, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [6, 1], "x": 2.5, "y": 3},
+                {"matrix": [6, 2], "x": 3.5, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 4.75, "y": 3, "w": 3},
+                {"matrix": [6, 3], "x": 7.75, "y": 3},
+                {"matrix": [7, 4], "x": 8.75, "y": 3, "w": 3},
+                {"matrix": [7, 5], "x": 9.75, "y": 3},
+                {"matrix": [6, 5], "x": 10.75, "y": 3},
+
+                {"matrix": [7, 6], "x": 12.25, "y": 3},
+                {"matrix": [7, 7], "x": 13.25, "y": 3},
+                {"matrix": [6, 7], "x": 14.25, "y": 3}
             ]
         }
     }
diff --git a/keyboards/viktus/smolka/smolka.c b/keyboards/viktus/smolka/smolka.c
index e11b80670b..862127019f 100644
--- a/keyboards/viktus/smolka/smolka.c
+++ b/keyboards/viktus/smolka/smolka.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "smolka.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/viktus/smolka/smolka.h b/keyboards/viktus/smolka/smolka.h
deleted file mode 100644
index b6692cea22..0000000000
--- a/keyboards/viktus/smolka/smolka.h
+++ /dev/null
@@ -1,47 +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
-
-/* 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( \
-    K10, K11, K01, K02, K12, K13, K03, K04, K14, K15, K05, K06, K16, K17, K07, \
-    K30, K31, K21, K22, K32, K33, K23, K24, K34, K35, K25, K26,      K37, K27, \
-    K50, K51, K41, K42, K52, K53, K43, K44, K54, K55, K45,      K56, K57, K47, \
-    K70, K71, K61, K62,      K73, K63,      K74, K75, K65,      K76, K77, K67  \
-) \
-{ \
-    { ___, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
-    { ___, K21, K22, K23, K24, K25, K26, K27 }, \
-    { K30, K31, K32, K33, K34, K35, ___, K37 }, \
-    { ___, K41, K42, K43, K44, K45, ___, K47 }, \
-    { K50, K51, K52, K53, K54, K55, K56, K57 }, \
-    { ___, K61, K62, K63, ___, K65, ___, K67 }, \
-    { K70, K71, ___, K73, K74, K75, K76, K77 }  \
-}