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

3 files changed, 36 insertions, 75 deletions

diff --git a/keyboards/soda/pocket/info.json b/keyboards/soda/pocket/info.json
index dca3dfe4be..1c64881183 100644
--- a/keyboards/soda/pocket/info.json
+++ b/keyboards/soda/pocket/info.json
@@ -23,51 +23,51 @@
     "bootloader": "stm32-dfu",
     "layouts": {
         "LAYOUT": {
-             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
 
-                {"x": 3.25, "y": 0},
-                {"x": 4.25, "y": 0},
-                {"x": 5.25, "y": 0},
-                {"x": 6.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},
 
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
 
-                {"x": 3.25, "y": 1.25},
-                {"x": 4.25, "y": 1.25},
-                {"x": 5.25, "y": 1.25},
-                {"x": 6.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},
 
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
 
-                {"x": 3.25, "y": 2.25},
-                {"x": 4.25, "y": 2.25},
-                {"x": 5.25, "y": 2.25},
-                {"x": 6.25, "y": 2.25, "h": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 2.25},
+                {"matrix": [3, 3], "x": 6.25, "y": 2.25, "h": 2},
 
-                {"x": 3.25, "y": 3.25},
-                {"x": 4.25, "y": 3.25},
-                {"x": 5.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 5.25, "y": 3.25},
 
-                {"x": 1, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "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, "h": 2},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+                {"matrix": [5, 0], "x": 6.25, "y": 4.25, "h": 2},
 
-                {"x": 0, "y": 5.25},
-                {"x": 1, "y": 5.25},
-                {"x": 2, "y": 5.25},
+                {"matrix": [5, 1], "x": 0, "y": 5.25},
+                {"matrix": [5, 2], "x": 1, "y": 5.25},
+                {"matrix": [5, 4], "x": 2, "y": 5.25},
 
-                {"x": 3.25, "y": 5.25, "w": 2},
-                {"x": 5.25, "y": 5.25}
+                {"matrix": [5, 5], "x": 3.25, "y": 5.25, "w": 2},
+                {"matrix": [5, 6], "x": 5.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/soda/pocket/pocket.c b/keyboards/soda/pocket/pocket.c
index 18a203b8c0..8cced36866 100644
--- a/keyboards/soda/pocket/pocket.c
+++ b/keyboards/soda/pocket/pocket.c
@@ -15,7 +15,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 "pocket.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/soda/pocket/pocket.h b/keyboards/soda/pocket/pocket.h
deleted file mode 100644
index 602664107b..0000000000
--- a/keyboards/soda/pocket/pocket.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
-
-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( \
-     K00, K01, K02, K03, K04, K05, K06, \
-     K10, K11, K12, K13, K14, K15, K16, \
-     K20, K21, K22, K23, K24, K25,      \
-                    K33, K34, K35, K36, \
-          K41,      K43, K44, K45,      \
-     K50, K51, K52,      K54, K55, K56  \
-) { \
-     { K00,   K01,   K02,   K03,   K04,   K05,   K06 }, \
-     { K10,   K11,   K12,   K13,   K14,   K15,   K16 }, \
-     { K20,   K21,   K22,   K23,   K24,   K25,   KC_NO}, \
-     { KC_NO, KC_NO, KC_NO, K33,   K34,   K35,   K36 }, \
-     { KC_NO, K41,   KC_NO, K43,   K44,   K45,   KC_NO}, \
-     { K50,   K51,   K52,   KC_NO, K54,   K55,   K56 }  \
-}
-