Move small macropad-ish layouts to data driven (#20341)

11 files changed, 13 insertions, 119 deletions

diff --git a/keyboards/woodkeys/bigseries/1key/1key.c b/keyboards/woodkeys/bigseries/1key/1key.c
index 6036bd9991..a2ebca4fe0 100755
--- a/keyboards/woodkeys/bigseries/1key/1key.c
+++ b/keyboards/woodkeys/bigseries/1key/1key.c
@@ -14,7 +14,7 @@ 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/>.
 */
-#include "1key.h"
+#include "quantum.h"
 
 void matrix_scan_kb(void) {
   // Looping keyboard code goes here
diff --git a/keyboards/woodkeys/bigseries/1key/1key.h b/keyboards/woodkeys/bigseries/1key/1key.h
deleted file mode 100755
index 6e5ddcc760..0000000000
--- a/keyboards/woodkeys/bigseries/1key/1key.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-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( \
-    k00 \
-) { \
-    { k00 } \
-}
diff --git a/keyboards/woodkeys/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json
index 1d0a787d9a..e6243a2844 100644
--- a/keyboards/woodkeys/bigseries/1key/info.json
+++ b/keyboards/woodkeys/bigseries/1key/info.json
@@ -19,7 +19,7 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "w": 4, "h": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4}
             ]
         }
     }
diff --git a/keyboards/woodkeys/bigseries/2key/2key.c b/keyboards/woodkeys/bigseries/2key/2key.c
index cffb71907e..a2ebca4fe0 100755
--- a/keyboards/woodkeys/bigseries/2key/2key.c
+++ b/keyboards/woodkeys/bigseries/2key/2key.c
@@ -14,7 +14,7 @@ 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/>.
 */
-#include "2key.h"
+#include "quantum.h"
 
 void matrix_scan_kb(void) {
   // Looping keyboard code goes here
diff --git a/keyboards/woodkeys/bigseries/2key/2key.h b/keyboards/woodkeys/bigseries/2key/2key.h
deleted file mode 100755
index eff82fef93..0000000000
--- a/keyboards/woodkeys/bigseries/2key/2key.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-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( \
-    k00, k01 \
-) { \
-    { k00, k01 } \
-}
diff --git a/keyboards/woodkeys/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json
index c3a2b62eb8..1a5d5bd34d 100644
--- a/keyboards/woodkeys/bigseries/2key/info.json
+++ b/keyboards/woodkeys/bigseries/2key/info.json
@@ -19,8 +19,8 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "w": 4, "h": 4},
-                {"x": 4, "y": 0, "w": 4, "h": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4},
+                {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4}
             ]
         }
     }
diff --git a/keyboards/woodkeys/bigseries/3key/3key.c b/keyboards/woodkeys/bigseries/3key/3key.c
index 3735c10543..a2ebca4fe0 100755
--- a/keyboards/woodkeys/bigseries/3key/3key.c
+++ b/keyboards/woodkeys/bigseries/3key/3key.c
@@ -14,7 +14,7 @@ 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/>.
 */
-#include "3key.h"
+#include "quantum.h"
 
 void matrix_scan_kb(void) {
   // Looping keyboard code goes here
diff --git a/keyboards/woodkeys/bigseries/3key/3key.h b/keyboards/woodkeys/bigseries/3key/3key.h
deleted file mode 100755
index caee1e4551..0000000000
--- a/keyboards/woodkeys/bigseries/3key/3key.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-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( \
-    k00, k01, k02 \
-) { \
-    { k00, k01, k02 } \
-}
diff --git a/keyboards/woodkeys/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json
index 43b99312db..fd7172fbcb 100644
--- a/keyboards/woodkeys/bigseries/3key/info.json
+++ b/keyboards/woodkeys/bigseries/3key/info.json
@@ -19,9 +19,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "w": 4, "h": 4},
-                {"x": 4, "y": 0, "w": 4, "h": 4},
-                {"x": 8, "y": 0, "w": 4, "h": 4}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4},
+                {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4},
+                {"matrix": [0, 2], "x": 8, "y": 0, "w": 4, "h": 4}
             ]
         }
     }
diff --git a/keyboards/woodkeys/bigseries/4key/4key.h b/keyboards/woodkeys/bigseries/4key/4key.h
deleted file mode 100755
index 7e9ff7a793..0000000000
--- a/keyboards/woodkeys/bigseries/4key/4key.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-Copyright 2018 Cole Markham
-
-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( \
-    k00, k01, \
-    k10, k11 \
-) { \
-    { k00, k01 }, \
-    { k10, k11 } \
-}
diff --git a/keyboards/woodkeys/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json
index 8fb9a9071a..d151eeea6b 100644
--- a/keyboards/woodkeys/bigseries/4key/info.json
+++ b/keyboards/woodkeys/bigseries/4key/info.json
@@ -19,11 +19,11 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0, "w": 4, "h": 4},
-                {"x": 4, "y": 0, "w": 4, "h": 4},
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 4, "h": 4},
+                {"matrix": [0, 1], "x": 4, "y": 0, "w": 4, "h": 4},
 
-                {"x": 0, "y": 4, "w": 4, "h": 4},
-                {"x": 4, "y": 4, "w": 4, "h": 4}
+                {"matrix": [1, 0], "x": 0, "y": 4, "w": 4, "h": 4},
+                {"matrix": [1, 1], "x": 4, "y": 4, "w": 4, "h": 4}
             ]
         }
     }