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

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

2 files changed, 108 insertions, 152 deletions

diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json
index 97c793b069..b0d2a0083d 100644
--- a/keyboards/40percentclub/nori/info.json
+++ b/keyboards/40percentclub/nori/info.json
@@ -22,108 +22,120 @@
     "layouts": {
       "LAYOUT_ortho_4x4": {
           "layout": [
-            { "x": 0, "y": 0 },
-            { "x": 1, "y": 0 },
-            { "x": 2, "y": 0 },
-            { "x": 3, "y": 0 },
-            { "x": 0, "y": 1 },
-            { "x": 1, "y": 1 },
-            { "x": 2, "y": 1 },
-            { "x": 3, "y": 1 },
-            { "x": 0, "y": 2 },
-            { "x": 1, "y": 2 },
-            { "x": 2, "y": 2 },
-            { "x": 3, "y": 2 },
-            { "x": 0, "y": 3 },
-            { "x": 1, "y": 3 },
-            { "x": 2, "y": 3 },
-            { "x": 3, "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": [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}
+          ]
       },
       "LAYOUT_ortho_4x8": {
           "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": 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": 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": 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 } ]
+            {"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": [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": [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": [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}
+          ]
       },
         "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/40percentclub/nori/nori.h b/keyboards/40percentclub/nori/nori.h
deleted file mode 100644
index 768598b7f8..0000000000
--- a/keyboards/40percentclub/nori/nori.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2018
- *
- * 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_ortho_4x4( \
-    K00, K01, K02, K03, \
-    K10, K11, K12, K13, \
-    K20, K21, K22, K23, \
-    K30, K31, K32, K33 \
-) \
-{ \
-    { K00, K01, K02, K03, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-    { K10, K11, K12, K13, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-    { K20, K21, K22, K23, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-    { K30, K31, K32, K33, ___, ___, ___, ___, ___, ___, ___, ___ } \
-}
-#define LAYOUT_ortho_4x8( \
-    K00, K01, K02, K03, K04, K05, K06, K07, \
-    K10, K11, K12, K13, K14, K15, K16, K17, \
-    K20, K21, K22, K23, K24, K25, K26, K27, \
-    K30, K31, K32, K33, K34, K35, K36, K37\
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, ___, ___, ___, ___ }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, ___, ___, ___, ___ }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, ___, ___, ___, ___ }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, ___, ___, ___, ___ } \
-}
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b } \
-}