summaryrefslogtreecommitdiff
path: root/keyboards/cozykeys/speedo/v2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cozykeys/speedo/v2')
-rw-r--r--keyboards/cozykeys/speedo/v2/config.h6
-rw-r--r--keyboards/cozykeys/speedo/v2/info.json151
-rw-r--r--keyboards/cozykeys/speedo/v2/v2.c17
-rw-r--r--keyboards/cozykeys/speedo/v2/v2.h36
4 files changed, 85 insertions, 125 deletions
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..9e70d28b41 100644
--- a/keyboards/cozykeys/speedo/v2/info.json
+++ b/keyboards/cozykeys/speedo/v2/info.json
@@ -8,77 +8,96 @@
"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": "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 },
- { "label": "k05", "x": 4.64, "y": 0.589, "r": 10 },
- { "label": "k06", "x": 5.577, "y": 1.021, "r": 10 },
- { "label": "k07", "x": 7.571, "y": 1.021, "r": -10 },
- { "label": "k08", "x": 8.507, "y": 0.589, "r": -10 },
- { "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": "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 },
- { "label": "k16", "x": 3.539, "y": 1.088, "r": 10 },
- { "label": "k17", "x": 4.467, "y": 1.572, "r": 10 },
- { "label": "k18", "x": 5.403, "y": 2.003, "r": 10 },
- { "label": "k19", "x": 6.574, "y": 2.559, "r": 0 },
- { "label": "k20", "x": 7.744, "y": 2.003, "r": -10 },
- { "label": "k21", "x": 8.681, "y": 1.572, "r": -10 },
- { "label": "k22", "x": 9.608, "y": 1.088, "r": -10 },
- { "label": "k23", "x": 10.636, "y": 1.174, "r": -10 },
- { "label": "k24", "x": 11.645, "y": 1.155, "r": -10 },
- { "label": "k25", "x": 12.628, "y": 0.982, "r": -10 },
- { "label": "k26", "x": 0.346, "y": 1.964, "r": 10 },
- { "label": "k27", "x": 1.329, "y": 2.138, "r": 10 },
- { "label": "k28", "x": 2.338, "y": 2.156, "r": 10 },
- { "label": "k29", "x": 3.366, "y": 2.07, "r": 10 },
- { "label": "k30", "x": 4.294, "y": 2.554, "r": 10 },
- { "label": "k31", "x": 5.23, "y": 2.986, "r": 10 },
- { "label": "k32", "x": 6.574, "y": 3.557, "r": 0 },
- { "label": "k33", "x": 7.917, "y": 2.986, "r": -10 },
- { "label": "k34", "x": 8.854, "y": 2.554, "r": -10 },
- { "label": "k35", "x": 9.781, "y": 2.07, "r": -10 },
- { "label": "k36", "x": 10.809, "y": 2.156, "r": -10 },
- { "label": "k37", "x": 11.819, "y": 2.138, "r": -10 },
- { "label": "k38", "x": 12.801, "y": 1.964, "r": -10 },
- { "label": "k39", "x": 0.173, "y": 2.947, "r": 10 },
- { "label": "k40", "x": 1.155, "y": 3.12, "r": 10 },
- { "label": "k41", "x": 2.165, "y": 3.138, "r": 10 },
- { "label": "k42", "x": 3.193, "y": 3.053, "r": 10 },
- { "label": "k43", "x": 4.12, "y": 3.536, "r": 10 },
- { "label": "k44", "x": 5.057, "y": 3.968, "r": 10 },
- { "label": "k45", "x": 6.075, "y": 4.554, "r": 0 },
- { "label": "k46", "x": 7.072, "y": 4.554, "r": 0 },
- { "label": "k47", "x": 8.09, "y": 3.968, "r": -10 },
- { "label": "k48", "x": 9.027, "y": 3.536, "r": -10 },
- { "label": "k49", "x": 9.954, "y": 3.053, "r": -10 },
- { "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": "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 },
- { "label": "k57", "x": 3.947, "y": 4.518, "r": 10 },
- { "label": "k58", "x": 4.994, "y": 5.235, "r": 40 },
- { "label": "k59", "x": 5.753, "y": 6.064, "r": 55 },
- { "label": "k60", "x": 7.395, "y": 6.064, "r": -55 },
- { "label": "k61", "x": 8.154, "y": 5.235, "r": 40 },
- { "label": "k62", "x": 9.2, "y": 4.518, "r": -10 },
- { "label": "k63", "x": 10.128, "y": 4.035, "r": -10 },
- { "label": "k64", "x": 11.155, "y": 4.12, "r": -10 },
- { "label": "k65", "x": 12.165, "y": 4.102, "r": -10 },
- { "label": "k66", "x": 13.147, "y": 3.929, "r": -10 }
+ {"matrix": [0, 0], "x": 0.693, "y": 0, "r": 10},
+ {"matrix": [0, 1], "x": 1.675, "y": 0.173, "r": 10},
+ {"matrix": [0, 2], "x": 2.685, "y": 0.191, "r": 10},
+ {"matrix": [0, 3], "x": 3.712, "y": 0.106, "r": 10},
+ {"matrix": [0, 4], "x": 4.64, "y": 0.589, "r": 10},
+ {"matrix": [0, 5], "x": 5.577, "y": 1.021, "r": 10},
+
+ {"matrix": [0, 8], "x": 7.571, "y": 1.021, "r": -10},
+ {"matrix": [0, 9], "x": 8.507, "y": 0.589, "r": -10},
+ {"matrix": [0, 10], "x": 9.435, "y": 0.106, "r": -10},
+ {"matrix": [0, 11], "x": 10.463, "y": 0.191, "r": -10},
+ {"matrix": [0, 12], "x": 11.472, "y": 0.173, "r": -10},
+ {"matrix": [0, 13], "x": 12.454, "y": 0, "r": -10},
+
+ {"matrix": [1, 0], "x": 0.52, "y": 0.982, "r": 10},
+ {"matrix": [1, 1], "x": 1.502, "y": 1.155, "r": 10},
+ {"matrix": [1, 2], "x": 2.511, "y": 1.174, "r": 10},
+ {"matrix": [1, 3], "x": 3.539, "y": 1.088, "r": 10},
+ {"matrix": [1, 4], "x": 4.467, "y": 1.572, "r": 10},
+ {"matrix": [1, 5], "x": 5.403, "y": 2.003, "r": 10},
+
+ {"matrix": [1, 6], "x": 6.574, "y": 2.559, "r": 0},
+
+ {"matrix": [1, 8], "x": 7.744, "y": 2.003, "r": -10},
+ {"matrix": [1, 9], "x": 8.681, "y": 1.572, "r": -10},
+ {"matrix": [1, 10], "x": 9.608, "y": 1.088, "r": -10},
+ {"matrix": [1, 11], "x": 10.636, "y": 1.174, "r": -10},
+ {"matrix": [1, 12], "x": 11.645, "y": 1.155, "r": -10},
+ {"matrix": [1, 13], "x": 12.628, "y": 0.982, "r": -10},
+
+ {"matrix": [2, 0], "x": 0.346, "y": 1.964, "r": 10},
+ {"matrix": [2, 1], "x": 1.329, "y": 2.138, "r": 10},
+ {"matrix": [2, 2], "x": 2.338, "y": 2.156, "r": 10},
+ {"matrix": [2, 3], "x": 3.366, "y": 2.07, "r": 10},
+ {"matrix": [2, 4], "x": 4.294, "y": 2.554, "r": 10},
+ {"matrix": [2, 5], "x": 5.23, "y": 2.986, "r": 10},
+
+ {"matrix": [2, 7], "x": 6.574, "y": 3.557, "r": 0},
+
+ {"matrix": [2, 8], "x": 7.917, "y": 2.986, "r": -10},
+ {"matrix": [2, 9], "x": 8.854, "y": 2.554, "r": -10},
+ {"matrix": [2, 10], "x": 9.781, "y": 2.07, "r": -10},
+ {"matrix": [2, 11], "x": 10.809, "y": 2.156, "r": -10},
+ {"matrix": [2, 12], "x": 11.819, "y": 2.138, "r": -10},
+ {"matrix": [2, 13], "x": 12.801, "y": 1.964, "r": -10},
+
+ {"matrix": [3, 0], "x": 0.173, "y": 2.947, "r": 10},
+ {"matrix": [3, 1], "x": 1.155, "y": 3.12, "r": 10},
+ {"matrix": [3, 2], "x": 2.165, "y": 3.138, "r": 10},
+ {"matrix": [3, 3], "x": 3.193, "y": 3.053, "r": 10},
+ {"matrix": [3, 4], "x": 4.12, "y": 3.536, "r": 10},
+ {"matrix": [3, 5], "x": 5.057, "y": 3.968, "r": 10},
+
+ {"matrix": [3, 6], "x": 6.075, "y": 4.554, "r": 0},
+ {"matrix": [3, 7], "x": 7.072, "y": 4.554, "r": 0},
+
+ {"matrix": [3, 8], "x": 8.09, "y": 3.968, "r": -10},
+ {"matrix": [3, 9], "x": 9.027, "y": 3.536, "r": -10},
+ {"matrix": [3, 10], "x": 9.954, "y": 3.053, "r": -10},
+ {"matrix": [3, 11], "x": 10.982, "y": 3.138, "r": -10},
+ {"matrix": [3, 12], "x": 11.992, "y": 3.12, "r": -10},
+ {"matrix": [3, 13], "x": 12.974, "y": 2.947, "r": -10},
+
+ {"matrix": [4, 0], "x": 0, "y": 3.929, "r": 10},
+ {"matrix": [4, 1], "x": 0.982, "y": 4.102, "r": 10},
+ {"matrix": [4, 2], "x": 1.992, "y": 4.12, "r": 10},
+ {"matrix": [4, 3], "x": 3.02, "y": 4.035, "r": 10},
+ {"matrix": [4, 4], "x": 3.947, "y": 4.518, "r": 10},
+
+ {"matrix": [4, 5], "x": 4.994, "y": 5.235, "r": 40},
+ {"matrix": [4, 6], "x": 5.753, "y": 6.064, "r": 55},
+
+ {"matrix": [4, 7], "x": 7.395, "y": 6.064, "r": -55},
+ {"matrix": [4, 8], "x": 8.154, "y": 5.235, "r": 40},
+
+ {"matrix": [4, 9], "x": 9.2, "y": 4.518, "r": -10},
+ {"matrix": [4, 10], "x": 10.128, "y": 4.035, "r": -10},
+ {"matrix": [4, 11], "x": 11.155, "y": 4.12, "r": -10},
+ {"matrix": [4, 12], "x": 12.165, "y": 4.102, "r": -10},
+ {"matrix": [4, 13], "x": 13.147, "y": 3.929, "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
deleted file mode 100644
index 295d6f8faf..0000000000
--- a/keyboards/cozykeys/speedo/v2/v2.h
+++ /dev/null
@@ -1,36 +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
-
-#include "quantum.h"
-
-#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 } \
-}