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

3 files changed, 45 insertions, 88 deletions

diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json
index de86324dd9..ebdd6531dc 100644
--- a/keyboards/silverbullet44/info.json
+++ b/keyboards/silverbullet44/info.json
@@ -28,57 +28,57 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Tab", "x":0, "y":1.375},
-                {"label":"Q", "x":1, "y":0.75},
-                {"label":"W", "x":2, "y":0.25},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0.25},
-                {"label":"T", "x":5, "y":0.5},
+                {"matrix": [0, 0], "x": 0, "y": 1.375},
+                {"matrix": [0, 1], "x": 1, "y": 0.75},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.5},
 
-                {"label":"Y", "x":12, "y":0.5},
-                {"label":"U", "x":13, "y":0.25},
-                {"label":"I", "x":14, "y":0},
-                {"label":"O", "x":15, "y":0.25},
-                {"label":"P", "x":16, "y":0.75},
-                {"label":"=", "x":17, "y":1.375},
+                {"matrix": [4, 5], "x": 12, "y": 0.5},
+                {"matrix": [4, 4], "x": 13, "y": 0.25},
+                {"matrix": [4, 3], "x": 14, "y": 0},
+                {"matrix": [4, 2], "x": 15, "y": 0.25},
+                {"matrix": [4, 1], "x": 16, "y": 0.75},
+                {"matrix": [4, 0], "x": 17, "y": 1.375},
 
-                {"label":"Shift", "x":0, "y":2.375},
-                {"label":"A", "x":1, "y":1.75},
-                {"label":"S", "x":2, "y":1.25},
-                {"label":"D", "x":3, "y":1},
-                {"label":"F", "x":4, "y":1.25},
-                {"label":"G", "x":5, "y":1.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.375},
+                {"matrix": [1, 1], "x": 1, "y": 1.75},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
 
-                {"label":"H", "x":12, "y":1.5},
-                {"label":"J", "x":13, "y":1.25},
-                {"label":"K", "x":14, "y":1},
-                {"label":"L", "x":15, "y":1.25},
-                {"label":":", "x":16, "y":1.75},
-                {"label":"'", "x":17, "y":2.375},
+                {"matrix": [5, 5], "x": 12, "y": 1.5},
+                {"matrix": [5, 4], "x": 13, "y": 1.25},
+                {"matrix": [5, 3], "x": 14, "y": 1},
+                {"matrix": [5, 2], "x": 15, "y": 1.25},
+                {"matrix": [5, 1], "x": 16, "y": 1.75},
+                {"matrix": [5, 0], "x": 17, "y": 2.375},
 
-                {"label":"N", "x":12, "y":2.5},
-                {"label":"M", "x":13, "y":2.25},
-                {"label":"<", "x":14, "y":2},
-                {"label":">", "x":15, "y":2.25},
-                {"label":"?", "x":16, "y":2.75},
-                {"label":"-", "x":17, "y":3.375},
+                {"matrix": [2, 0], "x": 12, "y": 2.5},
+                {"matrix": [2, 1], "x": 13, "y": 2.25},
+                {"matrix": [2, 2], "x": 14, "y": 2},
+                {"matrix": [2, 3], "x": 15, "y": 2.25},
+                {"matrix": [2, 4], "x": 16, "y": 2.75},
+                {"matrix": [2, 5], "x": 17, "y": 3.375},
 
-                {"label":"Ctrl", "x":0, "y":3.375},
-                {"label":"Z", "x":1, "y":2.75},
-                {"label":"X", "x":2, "y":2.25},
-                {"label":"C", "x":3, "y":2},
-                {"label":"V", "x":4, "y":2.25},
-                {"label":"B", "x":5, "y":2.5},
+                {"matrix": [6, 5], "x": 0, "y": 3.375},
+                {"matrix": [6, 4], "x": 1, "y": 2.75},
+                {"matrix": [6, 3], "x": 2, "y": 2.25},
+                {"matrix": [6, 2], "x": 3, "y": 2},
+                {"matrix": [6, 1], "x": 4, "y": 2.25},
+                {"matrix": [6, 0], "x": 5, "y": 2.5},
 
-                {"label":"Alt", "x":4, "y":3.25, "h":1.25},
-                {"label":"BS", "x":5, "y":3.5},
-                {"label":"Space", "x":-0.5, "y":3.5, "h":1.5},
-                {"label":"Num", "x":7, "y":3.25, "h":1.5},
+                {"matrix": [3, 2], "x": 4, "y": 3.25, "h": 1.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.5},
+                {"matrix": [3, 4], "x": -0.5, "y": 3.5, "h": 1.5},
+                {"matrix": [3, 5], "x": 7, "y": 3.25, "h": 1.5},
 
-                {"label":"Cursol", "x":-3.0, "y":3.5, "h":1.5},
-                {"label":"Enter", "x":-2, "y":3.5, "h":1.5},
-                {"label":"Del", "x":12, "y":3.5},
-                {"label":"Win", "x":13, "y":3.25, "w":1.25}
+                {"matrix": [7, 5], "x": -3, "y": 3.5, "h": 1.5},
+                {"matrix": [7, 4], "x": -2, "y": 3.5, "h": 1.5},
+                {"matrix": [7, 3], "x": 12, "y": 3.5},
+                {"matrix": [7, 2], "x": 13, "y": 3.25, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/silverbullet44/silverbullet44.c b/keyboards/silverbullet44/silverbullet44.c
index 7ae7a1269e..00bd6153c9 100644
--- a/keyboards/silverbullet44/silverbullet44.c
+++ b/keyboards/silverbullet44/silverbullet44.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "silverbullet44.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/silverbullet44/silverbullet44.h b/keyboards/silverbullet44/silverbullet44.h
deleted file mode 100644
index 7746a554c6..0000000000
--- a/keyboards/silverbullet44/silverbullet44.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2019 SwanMatch
- *
- * 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"
-
-/* This 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( \
-    L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \
-    L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \
-    L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \
-              L32, L33, L34, L35, R35, R34, R33, R32 \
-) \
-{ \
-    { L00,   L01,   L02,   L03,   L04,   L05  }, \
-    { L10,   L11,   L12,   L13,   L14,   L15  }, \
-    { L20,   L21,   L22,   L23,   L24,   L25  }, \
-    { KC_NO, KC_NO, L32,   L33,   L34,   L35  }, \
-    { R00,   R01,   R02,   R03,   R04,   R05  }, \
-    { R10,   R11,   R12,   R13,   R14,   R15  }, \
-    { R20,   R21,   R22,   R23,   R24,   R25  }, \
-    { KC_NO, KC_NO, R32,   R33,   R34,   R35  }  \
-}