summaryrefslogtreecommitdiff
path: root/keyboards/cozykeys/speedo
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cozykeys/speedo')
-rw-r--r--keyboards/cozykeys/speedo/speedo.c17
-rw-r--r--keyboards/cozykeys/speedo/speedo.h23
-rw-r--r--keyboards/cozykeys/speedo/v2/config.h6
-rw-r--r--keyboards/cozykeys/speedo/v2/info.json11
-rw-r--r--keyboards/cozykeys/speedo/v2/v2.c17
-rw-r--r--keyboards/cozykeys/speedo/v2/v2.h23
-rw-r--r--keyboards/cozykeys/speedo/v3/config.h6
-rw-r--r--keyboards/cozykeys/speedo/v3/info.json5
-rw-r--r--keyboards/cozykeys/speedo/v3/v3.c17
9 files changed, 24 insertions, 101 deletions
diff --git a/keyboards/cozykeys/speedo/speedo.c b/keyboards/cozykeys/speedo/speedo.c
deleted file mode 100644
index 852459f8c6..0000000000
--- a/keyboards/cozykeys/speedo/speedo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-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 "speedo.h"
diff --git a/keyboards/cozykeys/speedo/speedo.h b/keyboards/cozykeys/speedo/speedo.h
deleted file mode 100644
index 2a2adff423..0000000000
--- a/keyboards/cozykeys/speedo/speedo.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-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
-
-#ifdef KEYBOARD_cozykeys_speedo_v2
- #include "v2.h"
-#elif KEYBOARD_cozykeys_speedo_v3
- #include "v3.h"
-#endif
diff --git a/keyboards/cozykeys/speedo/v2/config.h b/keyboards/cozykeys/speedo/v2/config.h
index 6752b3934a..2643e4de4a 100644
--- a/keyboards/cozykeys/speedo/v2/config.h
+++ b/keyboards/cozykeys/speedo/v2/config.h
@@ -16,12 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-// Keyboard Matrix Assignments
-#define MATRIX_ROW_PINS { D1, D2, D3, C6, C7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, D0, B7, B3, B2, B1, B0 }
-#define DIODE_DIRECTION COL2ROW
-
// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
#define LOCKING_SUPPORT_ENABLE
// Locking resynchronize hack
diff --git a/keyboards/cozykeys/speedo/v2/info.json b/keyboards/cozykeys/speedo/v2/info.json
index 6527ed1257..ddeec48844 100644
--- a/keyboards/cozykeys/speedo/v2/info.json
+++ b/keyboards/cozykeys/speedo/v2/info.json
@@ -8,12 +8,17 @@
"pid": "0x1192",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "D0", "B7", "B3", "B2", "B1", "B0"],
+ "rows": ["D1", "D2", "D3", "C6", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "halfkay",
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "k01", "x": 0.693, "y": 0.0, "r": 10 },
+ { "label": "k01", "x": 0.693, "y": 0, "r": 10 },
{ "label": "k02", "x": 1.675, "y": 0.173, "r": 10 },
{ "label": "k03", "x": 2.685, "y": 0.191, "r": 10 },
{ "label": "k04", "x": 3.712, "y": 0.106, "r": 10 },
@@ -24,7 +29,7 @@
{ "label": "k09", "x": 9.435, "y": 0.106, "r": -10 },
{ "label": "k10", "x": 10.463, "y": 0.191, "r": -10 },
{ "label": "k11", "x": 11.472, "y": 0.173, "r": -10 },
- { "label": "k12", "x": 12.454, "y": 0.0, "r": -10 },
+ { "label": "k12", "x": 12.454, "y": 0, "r": -10 },
{ "label": "k13", "x": 0.52, "y": 0.982, "r": 10 },
{ "label": "k14", "x": 1.502, "y": 1.155, "r": 10 },
{ "label": "k15", "x": 2.511, "y": 1.174, "r": 10 },
@@ -65,7 +70,7 @@
{ "label": "k50", "x": 10.982, "y": 3.138, "r": -10 },
{ "label": "k51", "x": 11.992, "y": 3.12, "r": -10 },
{ "label": "k52", "x": 12.974, "y": 2.947, "r": -10 },
- { "label": "k53", "x": 0.0, "y": 3.929, "r": 10 },
+ { "label": "k53", "x": 0, "y": 3.929, "r": 10 },
{ "label": "k54", "x": 0.982, "y": 4.102, "r": 10 },
{ "label": "k55", "x": 1.992, "y": 4.12, "r": 10 },
{ "label": "k56", "x": 3.02, "y": 4.035, "r": 10 },
diff --git a/keyboards/cozykeys/speedo/v2/v2.c b/keyboards/cozykeys/speedo/v2/v2.c
deleted file mode 100644
index 1cab752140..0000000000
--- a/keyboards/cozykeys/speedo/v2/v2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-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 "v2.h"
diff --git a/keyboards/cozykeys/speedo/v2/v2.h b/keyboards/cozykeys/speedo/v2/v2.h
index 295d6f8faf..ad1bdd2f26 100644
--- a/keyboards/cozykeys/speedo/v2/v2.h
+++ b/keyboards/cozykeys/speedo/v2/v2.h
@@ -21,16 +21,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ___ KC_NO
#define LAYOUT( \
- k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \
- k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, \
- k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, \
- k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, \
- k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 \
-) \
-{ \
- { k01, k01, k03, k04, k05, k06, ___, ___, k07, k08, k09, k10, k11, k12 }, \
- { k13, k15, k15, k16, k17, k18, k19, ___, k20, k21, k22, k23, k24, k25 }, \
- { k26, k28, k28, k29, k30, k31, ___, k32, k33, k34, k35, k36, k37, k38 }, \
- { k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52 }, \
- { k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 } \
+ k00, k01, k02, k03, k04, k05, k08, k09, k0A, k0B, k0C, k0D, \
+ k10, k11, k12, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k1D, \
+ k20, k21, k22, k23, k24, k25, k27, k28, k29, k2A, k2B, k2C, k2D, \
+ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
+ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D \
+) { \
+ { k00, k01, k02, k03, k04, k05, ___, ___, k08, k09, k0A, k0B, k0C, k0D }, \
+ { k10, k11, k12, k13, k14, k15, k16, ___, k18, k19, k1A, k1B, k1C, k1D }, \
+ { k20, k21, k22, k23, k24, k25, ___, k27, k28, k29, k2A, k2B, k2C, k2D }, \
+ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
+ { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D } \
}
diff --git a/keyboards/cozykeys/speedo/v3/config.h b/keyboards/cozykeys/speedo/v3/config.h
index 885b09d0ba..85beda5e41 100644
--- a/keyboards/cozykeys/speedo/v3/config.h
+++ b/keyboards/cozykeys/speedo/v3/config.h
@@ -16,12 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-// Keyboard Matrix Assignments
-#define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B6, B2, E6, D7, C6, D4, D0, D1 }
-#define DIODE_DIRECTION COL2ROW
-
#ifdef RGBLIGHT_ENABLE
#define RGB_DI_PIN B5
#define RGBLED_NUM 12
diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json
index 2aa0d94485..a1a3bc18e4 100644
--- a/keyboards/cozykeys/speedo/v3/info.json
+++ b/keyboards/cozykeys/speedo/v3/info.json
@@ -8,6 +8,11 @@
"pid": "0x1192",
"device_version": "0.0.3"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B6", "B2", "E6", "D7", "C6", "D4", "D0", "D1"],
+ "rows": ["F0", "F1", "C7", "D5", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/cozykeys/speedo/v3/v3.c b/keyboards/cozykeys/speedo/v3/v3.c
deleted file mode 100644
index f35be99e22..0000000000
--- a/keyboards/cozykeys/speedo/v3/v3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2020 Paul Ewing
-
-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 "v3.h"