Move small macropad-ish layouts to data driven (#20341)

3 files changed, 15 insertions, 52 deletions

diff --git a/keyboards/palette1202/info.json b/keyboards/palette1202/info.json
index f8587610df..99f43a73f2 100644
--- a/keyboards/palette1202/info.json
+++ b/keyboards/palette1202/info.json
@@ -24,22 +24,22 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "label":"Tab",     "x": 0, "y": 0.75 },
-        { "label":"GUI + A", "x": 1, "y": 0.25 },
-        { "label":"E",       "x": 2, "y": 0 },
-        { "label":"P",       "x": 3, "y": 0.5 },
-        { "label":"GUI + 0", "x": 4, "y": 0 },
+          {"matrix": [0, 0], "x": 0, "y": 0.75},
+          {"matrix": [0, 1], "x": 1, "y": 0.25},
+          {"matrix": [0, 2], "x": 2, "y": 0},
+          {"matrix": [0, 3], "x": 3, "y": 0.5},
+          {"matrix": [0, 4], "x": 4, "y": 0},
 
-        { "label":"Fn",      "x": 0, "y": 1.75 },
-        { "label":"M",       "x": 1, "y": 1.25 },
-        { "label":"BackSP",  "x": 2, "y": 1 },
-        { "label":"B",       "x": 3, "y": 1.5 },
-        { "label":"HYPR",    "x": 4, "y": 1 },
+          {"matrix": [1, 0], "x": 0, "y": 1.75},
+          {"matrix": [1, 1], "x": 1, "y": 1.25},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1.5},
+          {"matrix": [1, 4], "x": 4, "y": 1},
 
-        { "label":"Shift",   "x": 1, "y": 2.5 },
-        { "label":"LGUI",    "x": 2, "y": 2.5 },
-        { "label":"GUI + Z", "x": 3, "y": 2.5 },
-        { "label":"Space",   "x": 4, "y": 2.5, "r": 15 }
+          {"matrix": [2, 1], "x": 1, "y": 2.5},
+          {"matrix": [2, 2], "x": 2, "y": 2.5},
+          {"matrix": [2, 3], "x": 3, "y": 2.5},
+          {"matrix": [2, 4], "x": 4, "y": 2.5, "r": 15}
       ]
     }
   }
diff --git a/keyboards/palette1202/palette1202.c b/keyboards/palette1202/palette1202.c
index a193964e3e..b2712df906 100644
--- a/keyboards/palette1202/palette1202.c
+++ b/keyboards/palette1202/palette1202.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 "palette1202.h"
+#include "quantum.h"
 
 // initialize OLED if OLED is enabled
 #ifdef OLED_ENABLE
diff --git a/keyboards/palette1202/palette1202.h b/keyboards/palette1202/palette1202.h
deleted file mode 100644
index 737e381f73..0000000000
--- a/keyboards/palette1202/palette1202.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 niltea
- *
- * 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( \
-    k00, k01, k02, k03, k04,       \
-    k10, k11, k12, k13, k14,       \
-         k21, k22, k23, k24        \
-)                                  \
-{                                  \
-    { k00,   k01, k02, k03, k04 }, \
-    { k10,   k11, k12, k13, k14 }, \
-    { KC_NO, k21, k22, k23, k24 }, \
-}