summaryrefslogtreecommitdiff
path: root/keyboards/40percentclub
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/40percentclub')
-rw-r--r--keyboards/40percentclub/4pack/4pack.c2
-rw-r--r--keyboards/40percentclub/4pack/4pack.h33
-rw-r--r--keyboards/40percentclub/4pack/info.json7
-rw-r--r--keyboards/40percentclub/nano/info.json14
-rw-r--r--keyboards/40percentclub/nano/nano.c1
-rw-r--r--keyboards/40percentclub/nano/nano.h13
-rw-r--r--keyboards/40percentclub/nein/info.json18
-rw-r--r--keyboards/40percentclub/nein/nein.c16
-rw-r--r--keyboards/40percentclub/nein/nein.h37
-rw-r--r--keyboards/40percentclub/sixpack/info.json8
-rw-r--r--keyboards/40percentclub/sixpack/sixpack.c2
-rw-r--r--keyboards/40percentclub/sixpack/sixpack.h34
12 files changed, 36 insertions, 149 deletions
diff --git a/keyboards/40percentclub/4pack/4pack.c b/keyboards/40percentclub/4pack/4pack.c
index 4ab3575ca4..bd2efa5620 100644
--- a/keyboards/40percentclub/4pack/4pack.c
+++ b/keyboards/40percentclub/4pack/4pack.c
@@ -13,7 +13,7 @@
* 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 "4pack.h"
+#include "quantum.h"
// Optional override functions below.
// You can leave any or all of these undefined.
diff --git a/keyboards/40percentclub/4pack/4pack.h b/keyboards/40percentclub/4pack/4pack.h
deleted file mode 100644
index 1340300ace..0000000000
--- a/keyboards/40percentclub/4pack/4pack.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019 Arda Kilicdagi
- *
- * 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, k03 \
-) \
-{ \
- { k00, k01, k02, k03 }, \
-}
diff --git a/keyboards/40percentclub/4pack/info.json b/keyboards/40percentclub/4pack/info.json
index 1665c7b35b..9cdb584b0c 100644
--- a/keyboards/40percentclub/4pack/info.json
+++ b/keyboards/40percentclub/4pack/info.json
@@ -17,7 +17,12 @@
},
"layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}]
+ "layout": [
+ {"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]}
+ ]
}
}
}
diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/info.json
index 430129a6a1..86c73f1943 100644
--- a/keyboards/40percentclub/nano/info.json
+++ b/keyboards/40percentclub/nano/info.json
@@ -16,9 +16,21 @@
["D1", "D0", "D4", "C6"]
]
},
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_2x4"
+ },
"layouts": {
"LAYOUT_ortho_2x4": {
- "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}]
+ "layout": [
+ {"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, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":3, "y":1, "matrix": [1, 3]}
+ ]
}
}
}
diff --git a/keyboards/40percentclub/nano/nano.c b/keyboards/40percentclub/nano/nano.c
deleted file mode 100644
index 8761e8add4..0000000000
--- a/keyboards/40percentclub/nano/nano.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "nano.h"
diff --git a/keyboards/40percentclub/nano/nano.h b/keyboards/40percentclub/nano/nano.h
deleted file mode 100644
index 881309738b..0000000000
--- a/keyboards/40percentclub/nano/nano.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_2x4( \
- k01, k02, k03, k04, \
- k05, k06, k07, k08 \
- ) { \
- { k01, k02, k03, k04 }, \
- { k05, k06, k07, k08 } \
-}
-
-#define LAYOUT LAYOUT_ortho_2x4
diff --git a/keyboards/40percentclub/nein/info.json b/keyboards/40percentclub/nein/info.json
index ba39cb834d..9a335dad43 100644
--- a/keyboards/40percentclub/nein/info.json
+++ b/keyboards/40percentclub/nein/info.json
@@ -20,15 +20,15 @@
"layouts": {
"LAYOUT_ortho_3x3": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2}
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":0, "y":2, "matrix": [2, 0]},
+ {"x":1, "y":2, "matrix": [2, 1]},
+ {"x":2, "y":2, "matrix": [2, 2]}
]
}
}
diff --git a/keyboards/40percentclub/nein/nein.c b/keyboards/40percentclub/nein/nein.c
deleted file mode 100644
index 0b4d05d941..0000000000
--- a/keyboards/40percentclub/nein/nein.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019
- *
- * 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/>.
- */
-#include "nein.h"
diff --git a/keyboards/40percentclub/nein/nein.h b/keyboards/40percentclub/nein/nein.h
deleted file mode 100644
index fd0118f75b..0000000000
--- a/keyboards/40percentclub/nein/nein.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019
- *
- * 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_3x3( \
- k00, k01, k02, \
- k10, k11, k12, \
- k20, k21, k22 \
-) \
-{ \
- { k00, k01, k02 }, \
- { k10, k11, k12 }, \
- { k20, k21, k22 } \
-}
diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json
index 9c3015b5dd..4e7f39c9c6 100644
--- a/keyboards/40percentclub/sixpack/info.json
+++ b/keyboards/40percentclub/sixpack/info.json
@@ -25,8 +25,12 @@
"layouts": {
"LAYOUT_ortho_2x3": {
"layout": [
- {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0},
- {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]}
]
}
}
diff --git a/keyboards/40percentclub/sixpack/sixpack.c b/keyboards/40percentclub/sixpack/sixpack.c
index cc0e9e3add..c8c7bad444 100644
--- a/keyboards/40percentclub/sixpack/sixpack.c
+++ b/keyboards/40percentclub/sixpack/sixpack.c
@@ -13,7 +13,7 @@
* 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 "sixpack.h"
+#include "quantum.h"
void matrix_init_kb(void) {
setPinOutput(B6); // Backlight cathodes Col.3
diff --git a/keyboards/40percentclub/sixpack/sixpack.h b/keyboards/40percentclub/sixpack/sixpack.h
deleted file mode 100644
index 94db5ee9e8..0000000000
--- a/keyboards/40percentclub/sixpack/sixpack.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020
- *
- * 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_2x3( \
- k00, k01, k02, \
- k10, k11, k12 \
-) { \
- { k00, k01, k02 }, \
- { k10, k11, k12 } \
-}