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

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

6 files changed, 131 insertions, 179 deletions

diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/info.json
index d957e4c604..7d045d078e 100644
--- a/keyboards/custommk/genesis/rev1/info.json
+++ b/keyboards/custommk/genesis/rev1/info.json
@@ -23,10 +23,57 @@
     "bootloader": "qmk-dfu",
     "layouts": {
         "LAYOUT_ortho_5x4": {
-            "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"Mute", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Pg Up", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Pg Dn", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"Spc", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":4}]
+            "layout": [
+                {"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": [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": [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": [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": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
+            ]
         },
         "LAYOUT_numpad_5x4": {
-            "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3, "h":2}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}]
+            "layout": [
+                {"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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [2, 0], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [2, 1], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 1, "y": 2},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [4, 0], "x": 3, "y": 3, "h": 2},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 3], "x": 2, "y": 4}
+            ]
         }
         
     }
diff --git a/keyboards/custommk/genesis/rev1/rev1.c b/keyboards/custommk/genesis/rev1/rev1.c
index ac40eedbf2..f81c6943b3 100644
--- a/keyboards/custommk/genesis/rev1/rev1.c
+++ b/keyboards/custommk/genesis/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev1.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) return false;
diff --git a/keyboards/custommk/genesis/rev1/rev1.h b/keyboards/custommk/genesis/rev1/rev1.h
deleted file mode 100644
index 0516b41ad8..0000000000
--- a/keyboards/custommk/genesis/rev1/rev1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2020 customMK
- *
- * 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_numpad_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12,      \
-    K20, K21, K22, K23, \
-    K30, K31, K32,      \
-    K40,      K42, K43  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   KC_NO }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   KC_NO }, \
-    { K40,   KC_NO, K42,   K43 }  \
-}
-
-#define LAYOUT_ortho_5x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33, \
-    K40, K41, K42, K43  \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   K13 }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   K33 }, \
-    { K40,   K41,   K42,   K43 }  \
-}
-
diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/info.json
index 901376fb3b..44d65fcd8b 100644
--- a/keyboards/custommk/genesis/rev2/info.json
+++ b/keyboards/custommk/genesis/rev2/info.json
@@ -23,71 +23,90 @@
     "bootloader": "qmk-dfu",
     "layouts": {
         "LAYOUT_ortho_5x4": {
-            "layout": [{"label":"MO(1)", "x":0, "y":0},
-                       {"label":"/", "x":1, "y":0},
-                       {"label":"*", "x":2, "y":0},
-                       {"label":"Mute", "x":3, "y":0},
-                       {"label":"7", "x":0, "y":1},
-                       {"label":"8", "x":1, "y":1},
-                       {"label":"9", "x":2, "y":1},
-                       {"label":"+", "x":3, "y":1},
-                       {"label":"4", "x":0, "y":2},
-                       {"label":"5", "x":1, "y":2},
-                       {"label":"6", "x":2, "y":2},
-                       {"label":"Pg Up", "x":3, "y":2},
-                       {"label":"1", "x":0, "y":3},
-                       {"label":"2", "x":1, "y":3},
-                       {"label":"3", "x":2, "y":3},
-                       {"label":"Pg Dn", "x":3, "y":3},
-                       {"label":"0", "x":0, "y":4},
-                       {"label":"Spc", "x":1, "y":4},
-                       {"label":".", "x":2, "y":4},
-                       {"label":"Enter", "x":3, "y":4}]
+            "layout": [
+                {"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": [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": [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": [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": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4}
+            ]
         },
         "LAYOUT_numpad_5x4": {
-            "layout": [{"label":"MO(1)", "x":0, "y":0},
-                {"label":"/", "x":1, "y":0},
-                {"label":"*", "x":2, "y":0},
-                {"label":"-", "x":3, "y":0},
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1}, 
-                {"label":"+", "x":3, "y":1, "h":2},
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3},
-                {"label":"Enter", "x":3, "y":3, "h":2},
-                {"label":"0", "x":0, "y":4, "w":2},
-                {"label":".", "x":2, "y":4}]
+            "layout": [
+                {"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": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [2, 0], "x": 3, "y": 1, "h": 2},
+
+                {"matrix": [2, 1], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 1, "y": 2},
+                {"matrix": [2, 3], "x": 2, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [4, 0], "x": 3, "y": 3, "h": 2},
+
+                {"matrix": [4, 2], "x": 0, "y": 4, "w": 2},
+                {"matrix": [4, 3], "x": 2, "y": 4}
+            ]
         },
         "LAYOUT_via_6x4": {
-            "layout": [{"label":"Vol-", "x":0, "y":0},
-                       {"label":"Vol+", "x":1, "y":0},
-                       {"label":"Vol-", "x":3, "y":0},
-                       {"label":"Vol+", "x":4, "y":0},
-                       {"label":"MO(1)", "x":0.5, "y":1.1},
-                       {"label":"/", "x":1.5, "y":1.1},
-                       {"label":"*", "x":2.5, "y":1.1}, 
-                       {"label":"Mute", "x":3.5, "y":1.1}, 
-                       {"label":"7", "x":0.5, "y":2.1}, 
-                       {"label":"8", "x":1.5, "y":2.1}, 
-                       {"label":"9", "x":2.5, "y":2.1}, 
-                       {"label":"+", "x":3.5, "y":2.1}, 
-                       {"label":"4", "x":0.5, "y":3.1}, 
-                       {"label":"5", "x":1.5, "y":3.1}, 
-                       {"label":"6", "x":2.5, "y":3.1}, 
-                       {"label":"Pg Up", "x":3.5, "y":3.1}, 
-                       {"label":"1", "x":0.5, "y":4.1}, 
-                       {"label":"2", "x":1.5, "y":4.1}, 
-                       {"label":"3", "x":2.5, "y":4.1}, 
-                       {"label":"Pg Dn", "x":3.5, "y":4.1}, 
-                       {"label":"0", "x":0.5, "y":5.1}, 
-                       {"label":"Spc", "x":1.5, "y":5.1}, 
-                       {"label":".", "x":2.5, "y":5.1}, 
-                       {"label":"Enter", "x":3.5, "y":5.1}]
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 1], "x": 1, "y": 0},
+                {"matrix": [5, 2], "x": 3, "y": 0},
+                {"matrix": [5, 3], "x": 4, "y": 0},
+
+                {"matrix": [0, 0], "x": 0.5, "y": 1.1},
+                {"matrix": [0, 1], "x": 1.5, "y": 1.1},
+                {"matrix": [0, 2], "x": 2.5, "y": 1.1},
+                {"matrix": [0, 3], "x": 3.5, "y": 1.1},
+
+                {"matrix": [1, 0], "x": 0.5, "y": 2.1},
+                {"matrix": [1, 1], "x": 1.5, "y": 2.1},
+                {"matrix": [1, 2], "x": 2.5, "y": 2.1},
+                {"matrix": [1, 3], "x": 3.5, "y": 2.1},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 3.1},
+                {"matrix": [2, 1], "x": 1.5, "y": 3.1},
+                {"matrix": [2, 2], "x": 2.5, "y": 3.1},
+                {"matrix": [2, 3], "x": 3.5, "y": 3.1},
+
+                {"matrix": [3, 0], "x": 0.5, "y": 4.1},
+                {"matrix": [3, 1], "x": 1.5, "y": 4.1},
+                {"matrix": [3, 2], "x": 2.5, "y": 4.1},
+                {"matrix": [3, 3], "x": 3.5, "y": 4.1},
+
+                {"matrix": [4, 0], "x": 0.5, "y": 5.1},
+                {"matrix": [4, 1], "x": 1.5, "y": 5.1},
+                {"matrix": [4, 2], "x": 2.5, "y": 5.1},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.1}
+            ]
         }
     }
 }
diff --git a/keyboards/custommk/genesis/rev2/rev2.c b/keyboards/custommk/genesis/rev2/rev2.c
index bfa4cb0558..5993ebb8c6 100644
--- a/keyboards/custommk/genesis/rev2/rev2.c
+++ b/keyboards/custommk/genesis/rev2/rev2.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rev2.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/custommk/genesis/rev2/rev2.h b/keyboards/custommk/genesis/rev2/rev2.h
deleted file mode 100644
index e978e706c3..0000000000
--- a/keyboards/custommk/genesis/rev2/rev2.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright 2020 customMK
- *
- * 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_numpad_5x4(   \
-    K00,  K01,   K02,  K03,  \
-    K10,  K11,   K12,        \
-    K20,  K21,   K22,  K23,  \
-    K30,  K31,   K32,        \
-    K40,         K42,  K43   \
-) { \
-    { K00,   K01,   K02,   K03 }, \
-    { K10,   K11,   K12,   KC_NO }, \
-    { K20,   K21,   K22,   K23 }, \
-    { K30,   K31,   K32,   KC_NO }, \
-    { K40,   KC_NO, K42,   K43 }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO} \
-}
-
-#define LAYOUT_ortho_5x4( \
-    K00,  K01,   K02,  K03,  \
-    K10,  K11,   K12,  K13,  \
-    K20,  K21,   K22,  K23,  \
-    K30,  K31,   K32,  K33,  \
-    K40,  K41,   K42,  K43   \
-) { \
-    { K00,   K01,   K02,   K03  }, \
-    { K10,   K11,   K12,   K13  }, \
-    { K20,   K21,   K22,   K23  }, \
-    { K30,   K31,   K32,   K33  }, \
-    { K40,   K41,   K42,   K43  }, \
-    { KC_NO, KC_NO, KC_NO, KC_NO}  \
-}
-
-
-#define LAYOUT_via_6x4( \
-    E00A, E00B,  E01A, E01B, \
-    K00,  K01,   K02,  K03,  \
-    K10,  K11,   K12,  K13,  \
-    K20,  K21,   K22,  K23,  \
-    K30,  K31,   K32,  K33,  \
-    K40,  K41,   K42,  K43   \
-) { \
-    { K00,   K01,   K02,   K03  }, \
-    { K10,   K11,   K12,   K13  }, \
-    { K20,   K21,   K22,   K23  }, \
-    { K30,   K31,   K32,   K33  }, \
-    { K40,   K41,   K42,   K43  }, \
-    { E00A,  E00B,  E01A,  E01B }  \
-}