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

2 files changed, 18 insertions, 66 deletions

diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json
index 0aca3a3f8e..648be80cd5 100644
--- a/keyboards/rate/pistachio_mp/info.json
+++ b/keyboards/rate/pistachio_mp/info.json
@@ -26,29 +26,29 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Encoder", "x":3, "y":0},
+                {"matrix": [1, 3], "x": 3, "y": 0},
 
-                {"label":"Num Lock", "x":0, "y":1.5},
-                {"label":"/", "x":1, "y":1.5},
-                {"label":"*", "x":2, "y":1.5},
-                {"label":"-", "x":3, "y":1.5},
+                {"matrix": [0, 0], "x": 0, "y": 1.5},
+                {"matrix": [0, 1], "x": 1, "y": 1.5},
+                {"matrix": [0, 2], "x": 2, "y": 1.5},
+                {"matrix": [0, 3], "x": 3, "y": 1.5},
 
-                {"label":"7", "x":0, "y":2.5},
-                {"label":"8", "x":1, "y":2.5},
-                {"label":"9", "x":2, "y":2.5},
+                {"matrix": [1, 0], "x": 0, "y": 2.5},
+                {"matrix": [1, 1], "x": 1, "y": 2.5},
+                {"matrix": [1, 2], "x": 2, "y": 2.5},
 
-                {"label":"4", "x":0, "y":3.5},
-                {"label":"5", "x":1, "y":3.5},
-                {"label":"6", "x":2, "y":3.5},
-                {"label":"+", "x":3, "y":2.5, "h":2},
+                {"matrix": [2, 0], "x": 0, "y": 3.5},
+                {"matrix": [2, 1], "x": 1, "y": 3.5},
+                {"matrix": [2, 2], "x": 2, "y": 3.5},
+                {"matrix": [2, 3], "x": 3, "y": 2.5, "h": 2},
 
-                {"label":"1", "x":0, "y":4.5},
-                {"label":"2", "x":1, "y":4.5},
-                {"label":"3", "x":2, "y":4.5},
+                {"matrix": [3, 0], "x": 0, "y": 4.5},
+                {"matrix": [3, 1], "x": 1, "y": 4.5},
+                {"matrix": [3, 2], "x": 2, "y": 4.5},
 
-                {"label":"0", "x":0, "y":5.5, "w":2},
-                {"label":".", "x":2, "y":5.5},
-                {"label":"Enter", "x":3, "y":4.5, "h":2}
+                {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 2},
+                {"matrix": [4, 2], "x": 2, "y": 5.5},
+                {"matrix": [4, 3], "x": 3, "y": 4.5, "h": 2}
             ]
         }
     }
diff --git a/keyboards/rate/pistachio_mp/pistachio_mp.h b/keyboards/rate/pistachio_mp/pistachio_mp.h
deleted file mode 100644
index d7c5c9bad9..0000000000
--- a/keyboards/rate/pistachio_mp/pistachio_mp.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2020 rate
- *
- * 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"
-
-/*
- * ,------------------------
- * |                   K07 |
- * |------------------------
- * | K00 | K01 | K02 | K03 |
- * |------------------------
- * | K04 | K05 | K06 |     |
- * |------------------ K11 -
- * | K08 | K09 | K10 |     |
- * |------------------------
- * | K12 | K13 | K14 |     |
- * |------------------ K17 -
- * |    K15    | K16 |     |
- * |------------------------
- */
-#define LAYOUT( \
-                   K07, \
-    K00, K01, K02, K03, \
-    K04, K05, K06,      \
-    K08, K09, K10, K11, \
-    K12, K13, K14,      \
-    K15,      K16, K17 ) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K04,   K05,   K06,   K07 }, \
-    { K08,   K09,   K10,   K11 }, \
-    { K12,   K13,   K14,   KC_NO }, \
-    { K15,   KC_NO, K16,   K17 }, \
-}