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

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

2 files changed, 50 insertions, 80 deletions

diff --git a/keyboards/signum/3_0/3_0.h b/keyboards/signum/3_0/3_0.h
deleted file mode 100644
index c857afd7c5..0000000000
--- a/keyboards/signum/3_0/3_0.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 Stan Gurenkov <rococo04_fox@icloud.com>
- *
- * 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"
-
-// clang-format off
-# 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 }  \
-}
-// clang-format on
diff --git a/keyboards/signum/3_0/info.json b/keyboards/signum/3_0/info.json
index 9b134ed610..c8bab9d5c3 100644
--- a/keyboards/signum/3_0/info.json
+++ b/keyboards/signum/3_0/info.json
@@ -17,59 +17,61 @@
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.5, "r": 15},
+                {"matrix": [0, 1], "x": 1, "y": 0.5, "r": 15},
+                {"matrix": [0, 2], "x": 2, "y": 0.25, "r": 15},
+                {"matrix": [0, 3], "x": 3, "y": 0, "r": 15},
+                {"matrix": [0, 4], "x": 4, "y": 0.25, "r": 15},
+                {"matrix": [0, 5], "x": 5, "y": 0.5, "r": 15},
 
-                { "x": 0, "y": 0.5, "r": 15 },
-                { "x": 1, "y": 0.5, "r": 15 },
-                { "x": 2, "y": 0.25, "r": 15 },
-                { "x": 3, "y": 0, "r": 15 },
-                { "x": 4, "y": 0.25, "r": 15 },
-                { "x": 5, "y": 0.5, "r": 15 },
-                { "x": 9, "y": 0.5, "r": -15 },
-                { "x": 10, "y": 0.25, "r": -15 },
-                { "x": 11, "y": 0, "r": -15 },
-                { "x": 12, "y": 0.25, "r": -15 },
-                { "x": 13, "y": 0.5, "r": -15 },
-                { "x": 14, "y": 0.5, "r": -15 },
+                {"matrix": [0, 6], "x": 9, "y": 0.5, "r": -15},
+                {"matrix": [0, 7], "x": 10, "y": 0.25, "r": -15},
+                {"matrix": [0, 8], "x": 11, "y": 0, "r": -15},
+                {"matrix": [0, 9], "x": 12, "y": 0.25, "r": -15},
+                {"matrix": [0, 10], "x": 13, "y": 0.5, "r": -15},
+                {"matrix": [0, 11], "x": 14, "y": 0.5, "r": -15},
 
-                { "x": 0, "y": 1.5, "r": 15 },
-                { "x": 1, "y": 1.5, "r": 15 },
-                { "x": 2, "y": 1.25, "r": 15 },
-                { "x": 3, "y": 1, "r": 15 },
-                { "x": 4, "y": 1.25, "r": 15 },
-                { "x": 5, "y": 1.5, "r": 15 },
-                { "x": 9, "y": 1.5, "r": -15 },
-                { "x": 10, "y": 1.25, "r": -15 },
-                { "x": 11, "y": 1, "r": -15 },
-                { "x": 12, "y": 1.25, "r": -15 },
-                { "x": 13, "y": 1.5, "r": -15 },
-                { "x": 14, "y": 1.5, "r": -15 },
+                {"matrix": [1, 0], "x": 0, "y": 1.5, "r": 15},
+                {"matrix": [1, 1], "x": 1, "y": 1.5, "r": 15},
+                {"matrix": [1, 2], "x": 2, "y": 1.25, "r": 15},
+                {"matrix": [1, 3], "x": 3, "y": 1, "r": 15},
+                {"matrix": [1, 4], "x": 4, "y": 1.25, "r": 15},
+                {"matrix": [1, 5], "x": 5, "y": 1.5, "r": 15},
 
-                { "x": 0, "y": 2.5, "r": 15 },
-                { "x": 1, "y": 2.5, "r": 15 },
-                { "x": 2, "y": 2.25, "r": 15 },
-                { "x": 3, "y": 2, "r": 15 },
-                { "x": 4, "y": 2.25, "r": 15 },
-                { "x": 5, "y": 2.5, "r": 15 },
-                { "x": 9, "y": 2.5, "r": -15 },
-                { "x": 10, "y": 2.25, "r": -15 },
-                { "x": 11, "y": 2, "r": -15 },
-                { "x": 12, "y": 2.25, "r": -15 },
-                { "x": 13, "y": 2.5, "r": -15 },
-                { "x": 14, "y": 2.5, "r": -15 },
+                {"matrix": [1, 6], "x": 9, "y": 1.5, "r": -15},
+                {"matrix": [1, 7], "x": 10, "y": 1.25, "r": -15},
+                {"matrix": [1, 8], "x": 11, "y": 1, "r": -15},
+                {"matrix": [1, 9], "x": 12, "y": 1.25, "r": -15},
+                {"matrix": [1, 10], "x": 13, "y": 1.5, "r": -15},
+                {"matrix": [1, 11], "x": 14, "y": 1.5, "r": -15},
 
-                { "x": 0, "y": 4, "r": 15 },
-                { "x": 1, "y": 3.5, "r": 15 },
-                { "x": 2, "y": 3.25, "r": 15 },
-                { "x": 4, "y": 4.25, "r": 15, "h": 1.5 },
-                { "x": 5, "y": 4, "r": 15, "h": 2 },
-                { "x": 6, "y": 4.25, "r": 15, "h": 1.5 },
-                { "x": 8, "y": 4.25, "r": -15, "h": 1.5 },
-                { "x": 9, "y": 4, "r": -15, "h": 2 },
-                { "x": 10, "y": 4.25, "r": -15, "h": 1.5 },
-                { "x": 12, "y": 3.25, "r": -15 },
-                { "x": 13, "y": 3.5, "r": -15 },
-                { "x": 14, "y": 4, "r": -15 }
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "r": 15},
+                {"matrix": [2, 1], "x": 1, "y": 2.5, "r": 15},
+                {"matrix": [2, 2], "x": 2, "y": 2.25, "r": 15},
+                {"matrix": [2, 3], "x": 3, "y": 2, "r": 15},
+                {"matrix": [2, 4], "x": 4, "y": 2.25, "r": 15},
+                {"matrix": [2, 5], "x": 5, "y": 2.5, "r": 15},
 
+                {"matrix": [2, 6], "x": 9, "y": 2.5, "r": -15},
+                {"matrix": [2, 7], "x": 10, "y": 2.25, "r": -15},
+                {"matrix": [2, 8], "x": 11, "y": 2, "r": -15},
+                {"matrix": [2, 9], "x": 12, "y": 2.25, "r": -15},
+                {"matrix": [2, 10], "x": 13, "y": 2.5, "r": -15},
+                {"matrix": [2, 11], "x": 14, "y": 2.5, "r": -15},
+
+                {"matrix": [3, 0], "x": 0, "y": 4, "r": 15},
+                {"matrix": [3, 1], "x": 1, "y": 3.5, "r": 15},
+                {"matrix": [3, 2], "x": 2, "y": 3.25, "r": 15},
+                {"matrix": [3, 3], "x": 4, "y": 4.25, "h": 1.5, "r": 15},
+                {"matrix": [3, 4], "x": 5, "y": 4, "h": 2, "r": 15},
+                {"matrix": [3, 5], "x": 6, "y": 4.25, "h": 1.5, "r": 15},
+
+                {"matrix": [3, 6], "x": 8, "y": 4.25, "h": 1.5, "r": -15},
+                {"matrix": [3, 7], "x": 9, "y": 4, "h": 2, "r": -15},
+                {"matrix": [3, 8], "x": 10, "y": 4.25, "h": 1.5, "r": -15},
+                {"matrix": [3, 9], "x": 12, "y": 3.25, "r": -15},
+                {"matrix": [3, 10], "x": 13, "y": 3.5, "r": -15},
+                {"matrix": [3, 11], "x": 14, "y": 4, "r": -15}
             ]
         }
     }