Move single `LAYOUT`s to data driven (#20365)

2 files changed, 104 insertions, 39 deletions

diff --git a/keyboards/percent/skog/info.json b/keyboards/percent/skog/info.json
index bc9543b951..19e7f81603 100644
--- a/keyboards/percent/skog/info.json
+++ b/keyboards/percent/skog/info.json
@@ -28,7 +28,110 @@
     "bootloader": "bootloadhid",
     "layouts": {
       "LAYOUT": {
-        "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
+        "layout": [
+          {"matrix": [1, 1], "x": 0, "y": 0},
+
+          {"matrix": [1, 3], "x": 2, "y": 0},
+          {"matrix": [1, 4], "x": 3, "y": 0},
+          {"matrix": [1, 5], "x": 4, "y": 0},
+          {"matrix": [1, 6], "x": 5, "y": 0},
+
+          {"matrix": [1, 8], "x": 6.5, "y": 0},
+          {"matrix": [1, 9], "x": 7.5, "y": 0},
+          {"matrix": [1, 10], "x": 8.5, "y": 0},
+          {"matrix": [1, 11], "x": 9.5, "y": 0},
+
+          {"matrix": [1, 12], "x": 11, "y": 0},
+          {"matrix": [1, 0], "x": 12, "y": 0},
+          {"matrix": [1, 13], "x": 13, "y": 0},
+          {"matrix": [1, 2], "x": 14, "y": 0},
+
+          {"matrix": [0, 2], "x": 15.25, "y": 0},
+          {"matrix": [0, 3], "x": 16.25, "y": 0},
+          {"matrix": [0, 0], "x": 17.25, "y": 0},
+
+          {"matrix": [2, 1], "x": 0, "y": 1.5},
+          {"matrix": [2, 2], "x": 1, "y": 1.5},
+          {"matrix": [2, 3], "x": 2, "y": 1.5},
+          {"matrix": [2, 4], "x": 3, "y": 1.5},
+          {"matrix": [2, 5], "x": 4, "y": 1.5},
+          {"matrix": [2, 6], "x": 5, "y": 1.5},
+          {"matrix": [2, 7], "x": 6, "y": 1.5},
+          {"matrix": [2, 8], "x": 7, "y": 1.5},
+          {"matrix": [2, 9], "x": 8, "y": 1.5},
+          {"matrix": [2, 10], "x": 9, "y": 1.5},
+          {"matrix": [2, 11], "x": 10, "y": 1.5},
+          {"matrix": [2, 12], "x": 11, "y": 1.5},
+          {"matrix": [2, 0], "x": 12, "y": 1.5},
+          {"matrix": [2, 13], "x": 13, "y": 1.5, "w": 2},
+
+          {"matrix": [0, 7], "x": 15.25, "y": 1.5},
+          {"matrix": [0, 6], "x": 16.25, "y": 1.5},
+          {"matrix": [0, 5], "x": 17.25, "y": 1.5},
+
+          {"matrix": [3, 1], "x": 0, "y": 2.5, "w": 1.5},
+          {"matrix": [3, 2], "x": 1.5, "y": 2.5},
+          {"matrix": [3, 3], "x": 2.5, "y": 2.5},
+          {"matrix": [3, 4], "x": 3.5, "y": 2.5},
+          {"matrix": [3, 5], "x": 4.5, "y": 2.5},
+          {"matrix": [3, 6], "x": 5.5, "y": 2.5},
+          {"matrix": [3, 7], "x": 6.5, "y": 2.5},
+          {"matrix": [3, 8], "x": 7.5, "y": 2.5},
+          {"matrix": [3, 9], "x": 8.5, "y": 2.5},
+          {"matrix": [3, 10], "x": 9.5, "y": 2.5},
+          {"matrix": [3, 11], "x": 10.5, "y": 2.5},
+          {"matrix": [3, 12], "x": 11.5, "y": 2.5},
+          {"matrix": [3, 0], "x": 12.5, "y": 2.5},
+          {"matrix": [3, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+          {"matrix": [0, 13], "x": 15.25, "y": 2.5},
+          {"matrix": [0, 9], "x": 16.25, "y": 2.5},
+          {"matrix": [0, 8], "x": 17.25, "y": 2.5},
+
+          {"matrix": [4, 1], "x": 0, "y": 3.5, "w": 1.75},
+          {"matrix": [4, 2], "x": 1.75, "y": 3.5},
+          {"matrix": [4, 3], "x": 2.75, "y": 3.5},
+          {"matrix": [4, 4], "x": 3.75, "y": 3.5},
+          {"matrix": [4, 5], "x": 4.75, "y": 3.5},
+          {"matrix": [4, 6], "x": 5.75, "y": 3.5},
+          {"matrix": [4, 7], "x": 6.75, "y": 3.5},
+          {"matrix": [4, 8], "x": 7.75, "y": 3.5},
+          {"matrix": [4, 9], "x": 8.75, "y": 3.5},
+          {"matrix": [4, 10], "x": 9.75, "y": 3.5},
+          {"matrix": [4, 11], "x": 10.75, "y": 3.5},
+          {"matrix": [4, 12], "x": 11.75, "y": 3.5},
+          {"matrix": [4, 0], "x": 12.75, "y": 3.5, "w": 2.25},
+
+          {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25},
+          {"matrix": [5, 2], "x": 2.25, "y": 4.5},
+          {"matrix": [5, 3], "x": 3.25, "y": 4.5},
+          {"matrix": [5, 4], "x": 4.25, "y": 4.5},
+          {"matrix": [5, 5], "x": 5.25, "y": 4.5},
+          {"matrix": [5, 6], "x": 6.25, "y": 4.5},
+          {"matrix": [5, 7], "x": 7.25, "y": 4.5},
+          {"matrix": [5, 8], "x": 8.25, "y": 4.5},
+          {"matrix": [5, 9], "x": 9.25, "y": 4.5},
+          {"matrix": [5, 10], "x": 10.25, "y": 4.5},
+          {"matrix": [5, 11], "x": 11.25, "y": 4.5},
+          {"matrix": [5, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+
+          {"matrix": [5, 0], "x": 14, "y": 4.5},
+
+          {"matrix": [5, 13], "x": 16.25, "y": 4.5},
+
+          {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25},
+          {"matrix": [6, 2], "x": 1.25, "y": 5.5, "w": 1.25},
+          {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25},
+          {"matrix": [6, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+          {"matrix": [6, 9], "x": 10, "y": 5.5, "w": 1.25},
+          {"matrix": [6, 10], "x": 11.25, "y": 5.5, "w": 1.25},
+          {"matrix": [6, 11], "x": 12.5, "y": 5.5, "w": 1.25},
+          {"matrix": [6, 12], "x": 13.75, "y": 5.5, "w": 1.25},
+
+          {"matrix": [6, 0], "x": 15.25, "y": 5.5},
+          {"matrix": [6, 13], "x": 16.25, "y": 5.5},
+          {"matrix": [6, 8], "x": 17.25, "y": 5.5}
+        ]
       }
     }
 }
diff --git a/keyboards/percent/skog/skog.h b/keyboards/percent/skog/skog.h
deleted file mode 100644
index c04a765b2e..0000000000
--- a/keyboards/percent/skog/skog.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2018 Jumail Mundekkat / MxBlue
-
-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( \
-  K11,      K31, K41, K51, K61,      K81, K91, KA1, KB1,      KC1, K01, KD1, K21,      K20, K30, K00, \
-                                                                                                      \
-  K12, K22, K32, K42, K52, K62,  K72,  K82,  K92,  KA2,  KB2, KC2, K02,   KD2   ,      K70, K60, K50, \
-   K13  , K23, K33, K43, K53, K63,  K73,  K83,  K93,  KA3,  KB3, KC3, K03,  KD3 ,      KD0, K90, K80, \
-     K15  , K25, K35, K45, K55, K65,  K75,  K85,  K95,  KA5,  KB5, KC5,   K05   ,                     \
-      K16  , K26, K36, K46, K56, K66,  K76,  K86,  K96,  KA6,  KB6,   KC6  , K06,           KD6,      \
-  K17 , K27 , K37 ,                K57                  , K97 , KA7 , KB7 , KC7 ,      K07, KD7, K87  \
-){ \
-  { K00,   KC_NO, K20,   K30,   KC_NO, K50,   K60,   K70,   K80,   K90,   KC_NO, KC_NO, KC_NO, KD0   }, \
-  { K01,   K11,   K21,   K31,   K41,   K51,   K61,   KC_NO, K81,   K91,   KA1,   KB1,   KC1,   KD1   }, \
-  { K02,   K12,   K22,   K32,   K42,   K52,   K62,   K72,   K82,   K92,   KA2,   KB2,   KC2,   KD2   }, \
-  { K03,   K13,   K23,   K33,   K43,   K53,   K63,   K73,   K83,   K93,   KA3,   KB3,   KC3,   KD3   }, \
-  { K05,   K15,   K25,   K35,   K45,   K55,   K65,   K75,   K85,   K95,   KA5,   KB5,   KC5,   KC_NO }, \
-  { K06,   K16,   K26,   K36,   K46,   K56,   K66,   K76,   K86,   K96,   KA6,   KB6,   KC6,   KD6   }, \
-  { K07,   K17,   K27,   K37,   KC_NO, K57,   KC_NO, KC_NO, K87,   K97,   KA7,   KB7,   KC7,   KD7   }  \
-}