diff options
Diffstat (limited to 'keyboards/cozykeys')
-rw-r--r-- | keyboards/cozykeys/bloomer/bloomer.c | 17 | ||||
-rw-r--r-- | keyboards/cozykeys/bloomer/bloomer.h | 23 | ||||
-rw-r--r-- | keyboards/cozykeys/bloomer/v2/config.h | 24 | ||||
-rw-r--r-- | keyboards/cozykeys/bloomer/v2/info.json | 11 | ||||
-rw-r--r-- | keyboards/cozykeys/bloomer/v2/v2.c | 17 | ||||
-rw-r--r-- | keyboards/cozykeys/bloomer/v3/config.h | 24 | ||||
-rw-r--r-- | keyboards/cozykeys/bloomer/v3/info.json | 11 | ||||
-rw-r--r-- | keyboards/cozykeys/bloomer/v3/v3.c | 17 | ||||
-rw-r--r-- | keyboards/cozykeys/speedo/speedo.c | 17 | ||||
-rw-r--r-- | keyboards/cozykeys/speedo/speedo.h | 23 | ||||
-rw-r--r-- | keyboards/cozykeys/speedo/v2/config.h | 6 | ||||
-rw-r--r-- | keyboards/cozykeys/speedo/v2/info.json | 11 | ||||
-rw-r--r-- | keyboards/cozykeys/speedo/v2/v2.c | 17 | ||||
-rw-r--r-- | keyboards/cozykeys/speedo/v2/v2.h | 23 | ||||
-rw-r--r-- | keyboards/cozykeys/speedo/v3/config.h | 6 | ||||
-rw-r--r-- | keyboards/cozykeys/speedo/v3/info.json | 5 | ||||
-rw-r--r-- | keyboards/cozykeys/speedo/v3/v3.c | 17 |
17 files changed, 40 insertions, 229 deletions
diff --git a/keyboards/cozykeys/bloomer/bloomer.c b/keyboards/cozykeys/bloomer/bloomer.c deleted file mode 100644 index b8612504b1..0000000000 --- a/keyboards/cozykeys/bloomer/bloomer.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 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 "bloomer.h" diff --git a/keyboards/cozykeys/bloomer/bloomer.h b/keyboards/cozykeys/bloomer/bloomer.h deleted file mode 100644 index f85b80889f..0000000000 --- a/keyboards/cozykeys/bloomer/bloomer.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 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 - -#if defined(KEYBOARD_cozykeys_bloomer_v2) - #include "v2.h" -#elif defined(KEYBOARD_cozykeys_bloomer_v3) - #include "v3.h" -#endif diff --git a/keyboards/cozykeys/bloomer/v2/config.h b/keyboards/cozykeys/bloomer/v2/config.h deleted file mode 100644 index 214d5d549b..0000000000 --- a/keyboards/cozykeys/bloomer/v2/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 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 - - -// Keyboard Matrix Assignments -#define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 } -#define DIODE_DIRECTION COL2ROW - diff --git a/keyboards/cozykeys/bloomer/v2/info.json b/keyboards/cozykeys/bloomer/v2/info.json index e1963db040..daa2e87807 100644 --- a/keyboards/cozykeys/bloomer/v2/info.json +++ b/keyboards/cozykeys/bloomer/v2/info.json @@ -2,12 +2,17 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B4", "C6", "E6", "B5", "B6", "B7", "D6", "C7"], + "rows": ["D0", "D1", "D3", "D2", "D4", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - { "label": "k00", "x": 0.868, "y": 0.0, "r": 10 }, + { "label": "k00", "x": 0.868, "y": 0, "r": 10 }, { "label": "k01", "x": 1.853, "y": 0.174, "r": 10 }, { "label": "k02", "x": 2.856, "y": 0.244, "r": 10 }, { "label": "k03", "x": 3.896, "y": 0.107, "r": 10 }, @@ -21,7 +26,7 @@ { "label": "k11", "x": 12.166, "y": 0.107, "r": -10 }, { "label": "k12", "x": 13.196, "y": 0.192, "r": -10 }, { "label": "k13", "x": 14.208, "y": 0.174, "r": -10 }, - { "label": "k14", "x": 15.193, "y": 0.0, "r": -10 }, + { "label": "k14", "x": 15.193, "y": 0, "r": -10 }, { "label": "k15", "x": 0.695, "y": 0.985, "r": 10 }, { "label": "k16", "x": 1.679, "y": 1.158, "r": 10 }, { "label": "k17", "x": 2.682, "y": 1.229, "r": 10 }, @@ -79,7 +84,7 @@ { "label": "k69", "x": 13.891, "y": 4.131, "r": -10 }, { "label": "k70", "x": 14.903, "y": 4.113, "r": -10 }, { "label": "k71", "x": 15.888, "y": 3.939, "r": -10 }, - { "label": "k72", "x": 0.0, "y": 4.924, "r": 10 }, + { "label": "k72", "x": 0, "y": 4.924, "r": 10 }, { "label": "k73", "x": 0.985, "y": 5.098, "r": 10 }, { "label": "k74", "x": 1.988, "y": 5.168, "r": 10 }, { "label": "k75", "x": 3.027, "y": 5.031, "r": 10 }, diff --git a/keyboards/cozykeys/bloomer/v2/v2.c b/keyboards/cozykeys/bloomer/v2/v2.c deleted file mode 100644 index 47dd093734..0000000000 --- a/keyboards/cozykeys/bloomer/v2/v2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 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/bloomer/v3/config.h b/keyboards/cozykeys/bloomer/v3/config.h deleted file mode 100644 index 214d5d549b..0000000000 --- a/keyboards/cozykeys/bloomer/v3/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 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 - - -// Keyboard Matrix Assignments -#define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 } -#define DIODE_DIRECTION COL2ROW - diff --git a/keyboards/cozykeys/bloomer/v3/info.json b/keyboards/cozykeys/bloomer/v3/info.json index 8540b0878e..a7ceb820c8 100644 --- a/keyboards/cozykeys/bloomer/v3/info.json +++ b/keyboards/cozykeys/bloomer/v3/info.json @@ -2,12 +2,17 @@ "usb": { "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B4", "C6", "E6", "B5", "B6", "B7", "D6", "C7"], + "rows": ["D0", "D1", "D3", "D2", "D4", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - { "label": "k00", "x": 0.868, "y": 0.0, "r": 10 }, + { "label": "k00", "x": 0.868, "y": 0, "r": 10 }, { "label": "k01", "x": 1.853, "y": 0.174, "r": 10 }, { "label": "k02", "x": 2.856, "y": 0.244, "r": 10 }, { "label": "k03", "x": 3.896, "y": 0.107, "r": 10 }, @@ -18,7 +23,7 @@ { "label": "k08", "x": 12.376, "y": 0.107, "r": -10 }, { "label": "k09", "x": 13.406, "y": 0.192, "r": -10 }, { "label": "k10", "x": 14.418, "y": 0.174, "r": -10 }, - { "label": "k11", "x": 15.403, "y": 0.0, "r": -10 }, + { "label": "k11", "x": 15.403, "y": 0, "r": -10 }, { "label": "k12", "x": 0.695, "y": 0.985, "r": 10 }, { "label": "k13", "x": 1.679, "y": 1.158, "r": 10 }, { "label": "k14", "x": 2.682, "y": 1.229, "r": 10 }, @@ -80,7 +85,7 @@ { "label": "k70", "x": 14.101, "y": 4.131, "r": -10 }, { "label": "k71", "x": 15.113, "y": 4.113, "r": -10 }, { "label": "k72", "x": 16.098, "y": 3.939, "r": -10 }, - { "label": "k73", "x": 0.0, "y": 4.924, "r": 10 }, + { "label": "k73", "x": 0, "y": 4.924, "r": 10 }, { "label": "k74", "x": 0.985, "y": 5.098, "r": 10 }, { "label": "k75", "x": 1.988, "y": 5.168, "r": 10 }, { "label": "k76", "x": 3.027, "y": 5.031, "r": 10 }, diff --git a/keyboards/cozykeys/bloomer/v3/v3.c b/keyboards/cozykeys/bloomer/v3/v3.c deleted file mode 100644 index 080cacd791..0000000000 --- a/keyboards/cozykeys/bloomer/v3/v3.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 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" 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" |