Move layouts for direct_pins boards to data driven (#19872)

3 files changed, 37 insertions, 87 deletions

diff --git a/keyboards/keebio/choconum/choconum.c b/keyboards/keebio/choconum/choconum.c
deleted file mode 100644
index 5360a716d7..0000000000
--- a/keyboards/keebio/choconum/choconum.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "choconum.h"
diff --git a/keyboards/keebio/choconum/choconum.h b/keyboards/keebio/choconum/choconum.h
deleted file mode 100644
index e77c5886ec..0000000000
--- a/keyboards/keebio/choconum/choconum.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2020 Keebio
- *
- * 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_ortho_5x4( \
-    KA1, KA2, KA3, KA4, \
-    KB1, KB2, KB3, KB4, \
-    KC1, KC2, KC3, KC4, \
-    KD1, KD2, KD3, KD4, \
-    KE1, KE2, KE3, KE4 \
-) \
-{ \
-    { KA1, KA2, KA3, KA4 }, \
-    { KB1, KB2, KB3, KB4 }, \
-    { KC1, KC2, KC3, KC4 }, \
-    { KD1, KD2, KD3, KD4 }, \
-    { KE1, KE2, KE3, KE4 } \
-}
-
-#define LAYOUT_numpad_5x4( \
-    KA1, KA2, KA3, KA4, \
-    KB1, KB2, KB3, KB4, \
-    KC1, KC2, KC3, \
-    KD1, KD2, KD3, KD4, \
-    KE1,      KE3 \
-) \
-{ \
-    { KA1, KA2, KA3, KA4 }, \
-    { KB1, KB2, KB3, KB4 }, \
-    { KC1, KC2, KC3, KC_NO }, \
-    { KD1, KD2, KD3, KD4 }, \
-    { KE1, KC_NO, KE3, KC_NO } \
-}
diff --git a/keyboards/keebio/choconum/info.json b/keyboards/keebio/choconum/info.json
index b373df4850..856549eb96 100644
--- a/keyboards/keebio/choconum/info.json
+++ b/keyboards/keebio/choconum/info.json
@@ -23,55 +23,55 @@
     "layouts": {
         "LAYOUT_numpad_5x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1, "h":2},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":3, "y":1, "h":2, "matrix": [1, 3]},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3, "h":2},
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]},
+                {"x":3, "y":3, "h":2, "matrix": [3, 3]},
 
-                {"x":0, "y":4,"w":2},
-                {"x":2, "y":4}
+                {"x":0, "y":4,"w":2, "matrix": [4, 0]},
+                {"x":2, "y":4, "matrix": [4, 2]}
             ]
         },
         "LAYOUT_ortho_5x4": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
 
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":3, "y":1},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":3, "y":1, "matrix": [1, 3]},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":3, "y":2, "matrix": [2, 3]},
 
-                {"x":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]},
+                {"x":3, "y":3, "matrix": [3, 3]},
 
-                {"x":0, "y":4},
-                {"x":1, "y":4},
-                {"x":2, "y":4},
-                {"x":3, "y":4}
+                {"x":0, "y":4, "matrix": [4, 0]},
+                {"x":1, "y":4, "matrix": [4, 1]},
+                {"x":2, "y":4, "matrix": [4, 2]},
+                {"x":3, "y":4, "matrix": [4, 3]}
             ]
         }
     }