Move ortho & numpad layouts to data driven (#20183)

Co-authored-by: Nick Brassel <nick@tzarc.org>

2 files changed, 103 insertions, 139 deletions

diff --git a/keyboards/spaceman/pancake/rev1/info.json b/keyboards/spaceman/pancake/rev1/info.json
index 31cd3640c1..9162370c4c 100644
--- a/keyboards/spaceman/pancake/rev1/info.json
+++ b/keyboards/spaceman/pancake/rev1/info.json
@@ -14,104 +14,112 @@
   "layouts": {
     "LAYOUT_planck_mit": {
       "layout": [ 
-        { "x": 0, "y": 0 }, 
-        { "x": 1, "y": 0 }, 
-        { "x": 2, "y": 0 }, 
-        { "x": 3, "y": 0 }, 
-        { "x": 4, "y": 0 }, 
-        { "x": 5, "y": 0 }, 
-        { "x": 6, "y": 0 }, 
-        { "x": 7, "y": 0 }, 
-        { "x": 8, "y": 0 }, 
-        { "x": 9, "y": 0 }, 
-        { "x": 10, "y": 0 }, 
-        { "x": 11, "y": 0 }, 
-        { "x": 0, "y": 1 }, 
-        { "x": 1, "y": 1 }, 
-        { "x": 2, "y": 1 }, 
-        { "x": 3, "y": 1 }, 
-        { "x": 4, "y": 1 }, 
-        { "x": 5, "y": 1 }, 
-        { "x": 6, "y": 1 }, 
-        { "x": 7, "y": 1 }, 
-        { "x": 8, "y": 1 }, 
-        { "x": 9, "y": 1 }, 
-        { "x": 10, "y": 1 }, 
-        { "x": 11, "y": 1 }, 
-        { "x": 0, "y": 2 }, 
-        { "x": 1, "y": 2 }, 
-        { "x": 2, "y": 2 }, 
-        { "x": 3, "y": 2 }, 
-        { "x": 4, "y": 2 }, 
-        { "x": 5, "y": 2 }, 
-        { "x": 6, "y": 2 }, 
-        { "x": 7, "y": 2 }, 
-        { "x": 8, "y": 2 }, 
-        { "x": 9, "y": 2 }, 
-        { "x": 10, "y": 2 }, 
-        { "x": 11, "y": 2 }, 
-        { "x": 0, "y": 3 }, 
-        { "x": 1, "y": 3 }, 
-        { "x": 2, "y": 3 }, 
-        { "x": 3, "y": 3 }, 
-        { "x": 4, "y": 3 }, 
-        { "w": 2, "x": 5, "y": 3 }, 
-        { "x": 7, "y": 3 }, 
-        { "x": 8, "y": 3 }, 
-        { "x": 9, "y": 3 }, 
-        { "x": 10, "y": 3 }, 
-        { "x": 11, "y": 3 } ]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     },
 		"LAYOUT_ortho_4x12": {
       "layout": [ 
-        { "x": 0, "y": 0 }, 
-        { "x": 1, "y": 0 }, 
-        { "x": 2, "y": 0 }, 
-        { "x": 3, "y": 0 }, 
-        { "x": 4, "y": 0 }, 
-        { "x": 5, "y": 0 }, 
-        { "x": 6, "y": 0 }, 
-        { "x": 7, "y": 0 }, 
-        { "x": 8, "y": 0 }, 
-        { "x": 9, "y": 0 }, 
-        { "x": 10, "y": 0 }, 
-        { "x": 11, "y": 0 }, 
-        { "x": 0, "y": 1 }, 
-        { "x": 1, "y": 1 }, 
-        { "x": 2, "y": 1 }, 
-        { "x": 3, "y": 1 }, 
-        { "x": 4, "y": 1 }, 
-        { "x": 5, "y": 1 }, 
-        { "x": 6, "y": 1 }, 
-        { "x": 7, "y": 1 }, 
-        { "x": 8, "y": 1 }, 
-        { "x": 9, "y": 1 }, 
-        { "x": 10, "y": 1 }, 
-        { "x": 11, "y": 1 }, 
-        { "x": 0, "y": 2 }, 
-        { "x": 1, "y": 2 }, 
-        { "x": 2, "y": 2 }, 
-        { "x": 3, "y": 2 }, 
-        { "x": 4, "y": 2 }, 
-        { "x": 5, "y": 2 }, 
-        { "x": 6, "y": 2 }, 
-        { "x": 7, "y": 2 }, 
-        { "x": 8, "y": 2 }, 
-        { "x": 9, "y": 2 }, 
-        { "x": 10, "y": 2 }, 
-        { "x": 11, "y": 2 }, 
-        { "x": 0, "y": 3 }, 
-        { "x": 1, "y": 3 }, 
-        { "x": 2, "y": 3 }, 
-        { "x": 3, "y": 3 }, 
-        { "x": 4, "y": 3 }, 
-        { "x": 5, "y": 3 }, 
-        { "x": 6, "y": 3 }, 
-        { "x": 7, "y": 3 }, 
-        { "x": 8, "y": 3 }, 
-        { "x": 9, "y": 3 }, 
-        { "x": 10, "y": 3 }, 
-        { "x": 11, "y": 3 } ]
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+        {"matrix": [1, 10], "x": 10, "y": 1},
+        {"matrix": [1, 11], "x": 11, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+        {"matrix": [2, 10], "x": 10, "y": 2},
+        {"matrix": [2, 11], "x": 11, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3}
+      ]
     }
   }
 }
diff --git a/keyboards/spaceman/pancake/rev1/rev1.h b/keyboards/spaceman/pancake/rev1/rev1.h
deleted file mode 100644
index 312d789b42..0000000000
--- a/keyboards/spaceman/pancake/rev1/rev1.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2019 Spaceman
- *
- * 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_planck_mit( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
-    k300, k301, k302, k303, k304,    k305,    k307, k308, k309, k310, k311 \
-) \
-{ \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }, \
-    { k300, k301, k302, k303, k304, k305, k305, k307, k308, k309, k310, k311 } \
-}
-
-#define LAYOUT_ortho_4x12( \
-    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
-    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
-    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
-    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 \
-) \
-{ \
-    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
-    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \
-    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }, \
-    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 } \
-}