diff options
Diffstat (limited to 'keyboards/dailycraft')
43 files changed, 470 insertions, 1062 deletions
diff --git a/keyboards/dailycraft/bat43/bat43.c b/keyboards/dailycraft/bat43/bat43.c deleted file mode 100644 index 5d52c672b6..0000000000 --- a/keyboards/dailycraft/bat43/bat43.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 yfuku - * - * 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 "bat43.h" diff --git a/keyboards/dailycraft/bat43/bat43.h b/keyboards/dailycraft/bat43/bat43.h deleted file mode 100644 index 046788a0a1..0000000000 --- a/keyboards/dailycraft/bat43/bat43.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_dailycraft_bat43_rev1 - #include "rev1.h" -#endif -#ifdef KEYBOARD_dailycraft_bat43_rev2 - #include "rev2.h" -#endif - -#include "quantum.h" diff --git a/keyboards/dailycraft/bat43/config.h b/keyboards/dailycraft/bat43/config.h deleted file mode 100644 index 55fc373ea8..0000000000 --- a/keyboards/dailycraft/bat43/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2020 yfuku - -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 - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { E6, D7, C6, D4, F7, F6, F5, F4 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, B5, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/dailycraft/bat43/info.json b/keyboards/dailycraft/bat43/info.json index e60001252d..2850b273d2 100644 --- a/keyboards/dailycraft/bat43/info.json +++ b/keyboards/dailycraft/bat43/info.json @@ -8,70 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "B5", "B4"], + "rows": ["E6", "D7", "C6", "D4", "F7", "F6", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"k00", "x":0, "y":1.43}, - {"label":"k01", "x":1, "y":1.11}, - {"label":"k02", "x":2, "y":0.38}, - {"label":"k03", "x":3, "y":0}, - {"label":"k04", "x":4, "y":0.05}, - {"label":"k05", "x":5, "y":0.16}, - - {"label":"k40", "x":9, "y":0.16}, - {"label":"k41", "x":10, "y":0.05}, - {"label":"k42", "x":11, "y":0}, - {"label":"k43", "x":12, "y":0.38}, - {"label":"k44", "x":13, "y":1.11}, - {"label":"k45", "x":14, "y":1.43}, - - {"label":"k10", "x":0, "y":2.43}, - {"label":"k11", "x":1, "y":2.11}, - {"label":"k12", "x":2, "y":1.38}, - {"label":"k13", "x":3, "y":1}, - {"label":"k14", "x":4, "y":1.05}, - {"label":"k15", "x":5, "y":1.16}, - - {"label":"k30", "x":7, "y":1.16}, - - {"label":"k50", "x":9, "y":1.16}, - {"label":"k51", "x":10, "y":1.05}, - {"label":"k52", "x":11, "y":1}, - {"label":"k53", "x":12, "y":1.38}, - {"label":"k54", "x":13, "y":2.11}, - {"label":"k55", "x":14, "y":2.43}, - - {"label":"k20", "x":0, "y":3.43}, - {"label":"k21", "x":1, "y":3.11}, - {"label":"k22", "x":2, "y":2.38}, - {"label":"k23", "x":3, "y":2}, - {"label":"k24", "x":4, "y":2.05}, - {"label":"k25", "x":5, "y":2.16}, - - {"label":"k60", "x":9, "y":2.16}, - {"label":"k61", "x":10, "y":2.05}, - {"label":"k62", "x":11, "y":2}, - {"label":"k63", "x":12, "y":2.38}, - {"label":"k64", "x":13, "y":3.11}, - {"label":"k65", "x":14, "y":3.43}, - - {"label":"k33", "x":4, "y":3.3}, - {"label":"k34", "x":5, "y":3.3}, - {"label":"k35", "x":6, "y":3.3}, - - {"label":"k70", "x":8, "y":3.3}, - {"label":"k71", "x":9, "y":3.3}, - {"label":"k72", "x":10, "y":3.3}, - - {"label":"k75", "x":5.1, "y":4.3, "w":0.8, "h":0.8}, - {"label":"k74", "x":6.1, "y":4.3, "w":0.8, "h":0.8}, - - {"label":"k73", "x":8.1, "y":4.3, "w":0.8, "h":0.8}, - {"label":"k31", "x":9.1, "y":4.3, "w":0.8, "h":0.8}, - {"label":"k32", "x":10.1, "y":4.3, "w":0.8, "h":0.8} - ] - } - } + "bootloader": "caterina" } diff --git a/keyboards/dailycraft/bat43/rev1/info.json b/keyboards/dailycraft/bat43/rev1/info.json new file mode 100644 index 0000000000..c3540002fb --- /dev/null +++ b/keyboards/dailycraft/bat43/rev1/info.json @@ -0,0 +1,56 @@ +{ + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k00", "matrix": [0, 0], "x": 0, "y": 1.43}, + {"label": "k01", "matrix": [0, 1], "x": 1, "y": 1.11}, + {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0.38}, + {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0.05}, + {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0.16}, + {"label": "k40", "matrix": [4, 0], "x": 9, "y": 0.16}, + {"label": "k41", "matrix": [4, 1], "x": 10, "y": 0.05}, + {"label": "k42", "matrix": [4, 2], "x": 11, "y": 0}, + {"label": "k43", "matrix": [4, 3], "x": 12, "y": 0.38}, + {"label": "k44", "matrix": [4, 4], "x": 13, "y": 1.11}, + {"label": "k45", "matrix": [4, 5], "x": 14, "y": 1.43}, + {"label": "k10", "matrix": [1, 0], "x": 0, "y": 2.43}, + {"label": "k11", "matrix": [1, 1], "x": 1, "y": 2.11}, + {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1.38}, + {"label": "k13", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "k14", "matrix": [1, 4], "x": 4, "y": 1.05}, + {"label": "k15", "matrix": [1, 5], "x": 5, "y": 1.16}, + {"label": "k30", "matrix": [3, 0], "x": 7, "y": 1.16}, + {"label": "k50", "matrix": [5, 0], "x": 9, "y": 1.16}, + {"label": "k51", "matrix": [5, 1], "x": 10, "y": 1.05}, + {"label": "k52", "matrix": [5, 2], "x": 11, "y": 1}, + {"label": "k53", "matrix": [5, 3], "x": 12, "y": 1.38}, + {"label": "k54", "matrix": [5, 4], "x": 13, "y": 2.11}, + {"label": "k55", "matrix": [5, 5], "x": 14, "y": 2.43}, + {"label": "k20", "matrix": [2, 0], "x": 0, "y": 3.43}, + {"label": "k21", "matrix": [2, 1], "x": 1, "y": 3.11}, + {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2.38}, + {"label": "k23", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "k24", "matrix": [2, 4], "x": 4, "y": 2.05}, + {"label": "k25", "matrix": [2, 5], "x": 5, "y": 2.16}, + {"label": "k60", "matrix": [6, 0], "x": 9, "y": 2.16}, + {"label": "k61", "matrix": [6, 1], "x": 10, "y": 2.05}, + {"label": "k62", "matrix": [6, 2], "x": 11, "y": 2}, + {"label": "k63", "matrix": [6, 3], "x": 12, "y": 2.38}, + {"label": "k64", "matrix": [6, 4], "x": 13, "y": 3.11}, + {"label": "k65", "matrix": [6, 5], "x": 14, "y": 3.43}, + {"label": "k33", "matrix": [3, 3], "x": 4, "y": 3.3}, + {"label": "k34", "matrix": [3, 4], "x": 5, "y": 3.3}, + {"label": "k35", "matrix": [3, 5], "x": 6, "y": 3.3}, + {"label": "k70", "matrix": [7, 0], "x": 8, "y": 3.3}, + {"label": "k71", "matrix": [7, 1], "x": 9, "y": 3.3}, + {"label": "k72", "matrix": [7, 2], "x": 10, "y": 3.3}, + {"label": "k75", "matrix": [7, 4], "x": 5.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"label": "k74", "matrix": [7, 5], "x": 6.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"label": "k73", "matrix": [7, 3], "x": 8.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"label": "k31", "matrix": [3, 1], "x": 9.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"label": "k32", "matrix": [3, 2], "x": 10.1, "y": 4.3, "w": 0.8, "h": 0.8} + ] + } + } +} diff --git a/keyboards/dailycraft/bat43/rev1/rev1.c b/keyboards/dailycraft/bat43/rev1/rev1.c deleted file mode 100644 index cff7598740..0000000000 --- a/keyboards/dailycraft/bat43/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 yfuku - * - * 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 "rev1.h" diff --git a/keyboards/dailycraft/bat43/rev1/rev1.h b/keyboards/dailycraft/bat43/rev1/rev1.h deleted file mode 100644 index cf21486a9e..0000000000 --- a/keyboards/dailycraft/bat43/rev1/rev1.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2020 yfuku - * - * 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 is 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, k04, k05, k40, k41, k42, k43, k44, k45, \ - k10, k11, k12, k13, k14, k15, k30, k50, k51, k52, k53, k54, k55, \ - k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ - k33, k34, k35, k70, k71, k72, \ - k74, k75, k73, k31, k32 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k40, k41, k42, k43, k44, k45 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k60, k61, k62, k63, k64, k65 }, \ - { k70, k71, k72, k73, k74, k75 }, \ -} diff --git a/keyboards/dailycraft/bat43/rev2/info.json b/keyboards/dailycraft/bat43/rev2/info.json new file mode 100644 index 0000000000..d60e5b8ae6 --- /dev/null +++ b/keyboards/dailycraft/bat43/rev2/info.json @@ -0,0 +1,66 @@ +{ + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 1.43}, + {"matrix": [0, 1], "x": 1, "y": 1.11}, + {"matrix": [0, 2], "x": 2, "y": 0.38}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.05}, + {"matrix": [0, 5], "x": 5, "y": 0.16}, + + {"matrix": [4, 0], "x": 9, "y": 0.16}, + {"matrix": [4, 1], "x": 10, "y": 0.05}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0.38}, + {"matrix": [4, 4], "x": 13, "y": 1.11}, + {"matrix": [4, 5], "x": 14, "y": 1.43}, + + {"matrix": [1, 0], "x": 0, "y": 2.43}, + {"matrix": [1, 1], "x": 1, "y": 2.11}, + {"matrix": [1, 2], "x": 2, "y": 1.38}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.05}, + {"matrix": [1, 5], "x": 5, "y": 1.16}, + + {"matrix": [3, 0], "x": 7, "y": 1.16}, + + {"matrix": [5, 0], "x": 9, "y": 1.16}, + {"matrix": [5, 1], "x": 10, "y": 1.05}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1.38}, + {"matrix": [5, 4], "x": 13, "y": 2.11}, + {"matrix": [5, 5], "x": 14, "y": 2.43}, + + {"matrix": [2, 0], "x": 0, "y": 3.43}, + {"matrix": [2, 1], "x": 1, "y": 3.11}, + {"matrix": [2, 2], "x": 2, "y": 2.38}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.05}, + {"matrix": [2, 5], "x": 5, "y": 2.16}, + + {"matrix": [6, 0], "x": 9, "y": 2.16}, + {"matrix": [6, 1], "x": 10, "y": 2.05}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 3], "x": 12, "y": 2.38}, + {"matrix": [6, 4], "x": 13, "y": 3.11}, + {"matrix": [6, 5], "x": 14, "y": 3.43}, + + {"matrix": [3, 3], "x": 4, "y": 3.3}, + {"matrix": [3, 4], "x": 5, "y": 3.3}, + {"matrix": [3, 5], "x": 6, "y": 3.3}, + + {"matrix": [7, 0], "x": 8, "y": 3.3}, + {"matrix": [7, 1], "x": 9, "y": 3.3}, + {"matrix": [7, 2], "x": 10, "y": 3.3}, + + {"matrix": [7, 5], "x": 5.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"matrix": [7, 4], "x": 6.1, "y": 4.3, "w": 0.8, "h": 0.8}, + + {"matrix": [7, 3], "x": 8.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"matrix": [3, 1], "x": 9.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"matrix": [3, 2], "x": 10.1, "y": 4.3, "w": 0.8, "h": 0.8} + ] + } + } +} diff --git a/keyboards/dailycraft/bat43/rev2/rev2.c b/keyboards/dailycraft/bat43/rev2/rev2.c deleted file mode 100644 index cffc0acd32..0000000000 --- a/keyboards/dailycraft/bat43/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 yfuku - * - * 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 "rev2.h" diff --git a/keyboards/dailycraft/bat43/rev2/rev2.h b/keyboards/dailycraft/bat43/rev2/rev2.h deleted file mode 100644 index f84cdbaa4d..0000000000 --- a/keyboards/dailycraft/bat43/rev2/rev2.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2020 yfuku - * - * 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 is 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, k04, k05, k40, k41, k42, k43, k44, k45, \ - k10, k11, k12, k13, k14, k15, k30, k50, k51, k52, k53, k54, k55, \ - k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ - k33, k34, k35, k70, k71, k72, \ - k75, k74, k73, k31, k32 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k40, k41, k42, k43, k44, k45 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k60, k61, k62, k63, k64, k65 }, \ - { k70, k71, k72, k73, k74, k75 }, \ -} diff --git a/keyboards/dailycraft/claw44/claw44.c b/keyboards/dailycraft/claw44/claw44.c deleted file mode 100644 index d87103065c..0000000000 --- a/keyboards/dailycraft/claw44/claw44.c +++ /dev/null @@ -1 +0,0 @@ -#include "claw44.h" diff --git a/keyboards/dailycraft/claw44/claw44.h b/keyboards/dailycraft/claw44/claw44.h deleted file mode 100644 index 76ecda6e90..0000000000 --- a/keyboards/dailycraft/claw44/claw44.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#ifdef KEYBOARD_dailycraft_claw44_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/dailycraft/claw44/rev1/config.h b/keyboards/dailycraft/claw44/rev1/config.h deleted file mode 100644 index 13e3177b0e..0000000000 --- a/keyboards/dailycraft/claw44/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> -Copyright 2015 Jack Humbert - -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 - -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 } -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json index 1168d21fa6..622e534864 100644 --- a/keyboards/dailycraft/claw44/rev1/info.json +++ b/keyboards/dailycraft/claw44/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, @@ -16,50 +21,58 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":1.18}, - {"label":"L01", "x":1, "y":1.03}, - {"label":"L02", "x":2, "y":0.35}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0.05}, - {"label":"L05", "x":5, "y":0.10}, - {"label":"R00", "x":11.5, "y":0.10}, - {"label":"R01", "x":12.5, "y":0.05}, - {"label":"R02", "x":13.5, "y":0}, - {"label":"R03", "x":14.5, "y":0.35}, - {"label":"R04", "x":15.5, "y":1.08}, - {"label":"R05", "x":16.5, "y":1.18}, - {"label":"L10", "x":0, "y":2.18}, - {"label":"L11", "x":1, "y":2.03}, - {"label":"L12", "x":2, "y":1.35}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1.05}, - {"label":"L15", "x":5, "y":1.10}, - {"label":"R10", "x":11.5, "y":1.10}, - {"label":"R11", "x":12.5, "y":1.05}, - {"label":"R12", "x":13.5, "y":1}, - {"label":"R13", "x":14.5, "y":1.35}, - {"label":"R14", "x":15.5, "y":2.03}, - {"label":"R15", "x":16.5, "y":2.18}, - {"label":"L20", "x":0, "y":3.18}, - {"label":"L21", "x":1, "y":3.03}, - {"label":"L22", "x":2, "y":2.35}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2.05}, - {"label":"L25", "x":5, "y":2.10}, - {"label":"R20", "x":11.5, "y":2.10}, - {"label":"R21", "x":12.5, "y":2.05}, - {"label":"R22", "x":13.5, "y":2}, - {"label":"R23", "x":14.5, "y":2.35}, - {"label":"R24", "x":15.5, "y":3.03}, - {"label":"R25", "x":16.5, "y":3.18}, - {"label":"L30", "x":4, "y":3.05}, - {"label":"L31", "x":5, "y":3.10}, - {"label":"L32", "x":6, "y":3.20, "w":1.25}, - {"label":"L33", "x":7.25, "y":3.50}, - {"label":"R30", "x":9.25, "y":3.50}, - {"label":"R31", "x":10.25, "y":3.20, "w":1.25}, - {"label":"R32", "x":11.5, "y":3.10}, - {"label":"R33", "x":12.5, "y":3.05} + {"matrix": [0, 0], "x": 0, "y": 1.18}, + {"matrix": [0, 1], "x": 1, "y": 1.03}, + {"matrix": [0, 2], "x": 2, "y": 0.35}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.05}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + + {"matrix": [4, 5], "x": 11.5, "y": 0.1}, + {"matrix": [4, 4], "x": 12.5, "y": 0.05}, + {"matrix": [4, 3], "x": 13.5, "y": 0}, + {"matrix": [4, 2], "x": 14.5, "y": 0.35}, + {"matrix": [4, 1], "x": 15.5, "y": 1.08}, + {"matrix": [4, 0], "x": 16.5, "y": 1.18}, + + {"matrix": [1, 0], "x": 0, "y": 2.18}, + {"matrix": [1, 1], "x": 1, "y": 2.03}, + {"matrix": [1, 2], "x": 2, "y": 1.35}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.05}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + + {"matrix": [5, 5], "x": 11.5, "y": 1.1}, + {"matrix": [5, 4], "x": 12.5, "y": 1.05}, + {"matrix": [5, 3], "x": 13.5, "y": 1}, + {"matrix": [5, 2], "x": 14.5, "y": 1.35}, + {"matrix": [5, 1], "x": 15.5, "y": 2.03}, + {"matrix": [5, 0], "x": 16.5, "y": 2.18}, + + {"matrix": [2, 0], "x": 0, "y": 3.18}, + {"matrix": [2, 1], "x": 1, "y": 3.03}, + {"matrix": [2, 2], "x": 2, "y": 2.35}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.05}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, + + {"matrix": [6, 5], "x": 11.5, "y": 2.1}, + {"matrix": [6, 4], "x": 12.5, "y": 2.05}, + {"matrix": [6, 3], "x": 13.5, "y": 2}, + {"matrix": [6, 2], "x": 14.5, "y": 2.35}, + {"matrix": [6, 1], "x": 15.5, "y": 3.03}, + {"matrix": [6, 0], "x": 16.5, "y": 3.18}, + + {"matrix": [3, 2], "x": 4, "y": 3.05}, + {"matrix": [3, 3], "x": 5, "y": 3.1}, + {"matrix": [3, 4], "x": 6, "y": 3.2, "w": 1.25}, + + {"matrix": [3, 5], "x": 7.25, "y": 3.5}, + + {"matrix": [7, 5], "x": 9.25, "y": 3.5}, + {"matrix": [7, 4], "x": 10.25, "y": 3.2, "w": 1.25}, + {"matrix": [7, 3], "x": 11.5, "y": 3.1}, + {"matrix": [7, 2], "x": 12.5, "y": 3.05} ] } } diff --git a/keyboards/dailycraft/claw44/rev1/rev1.c b/keyboards/dailycraft/claw44/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/dailycraft/claw44/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/dailycraft/claw44/rev1/rev1.h b/keyboards/dailycraft/claw44/rev1/rev1.h deleted file mode 100644 index 9a05977153..0000000000 --- a/keyboards/dailycraft/claw44/rev1/rev1.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, R30, R31, R32, R33 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, KC_NO, L30, L31, L32, L33 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, R33, R32, R31, R30 } \ - } diff --git a/keyboards/dailycraft/owl8/keymaps/via/keymap.c b/keyboards/dailycraft/owl8/keymaps/via/keymap.c index 6e3f6ea90b..1a3bb0f0ae 100644 --- a/keyboards/dailycraft/owl8/keymaps/via/keymap.c +++ b/keyboards/dailycraft/owl8/keymaps/via/keymap.c @@ -52,46 +52,50 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { keyevent_t encoder1_ccw = { .key = (keypos_t){.row = 0, .col = 12}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder1_cw = { .key = (keypos_t){.row = 0, .col = 13}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder2_ccw = { .key = (keypos_t){.row = 0, .col = 14}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder2_cw = { .key = (keypos_t){.row = 0, .col = 15}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; void matrix_scan_user(void) { - if (IS_PRESSED(encoder1_ccw)) { + if (encoder1_ccw.pressed) { encoder1_ccw.pressed = false; - encoder1_ccw.time = (timer_read() | 1); + encoder1_ccw.time = timer_read(); action_exec(encoder1_ccw); } - if (IS_PRESSED(encoder1_cw)) { + if (encoder1_cw.pressed) { encoder1_cw.pressed = false; - encoder1_cw.time = (timer_read() | 1); + encoder1_cw.time = timer_read(); action_exec(encoder1_cw); } - if (IS_PRESSED(encoder2_ccw)) { + if (encoder2_ccw.pressed) { encoder2_ccw.pressed = false; - encoder2_ccw.time = (timer_read() | 1); + encoder2_ccw.time = timer_read(); action_exec(encoder2_ccw); } - if (IS_PRESSED(encoder2_cw)) { + if (encoder2_cw.pressed) { encoder2_cw.pressed = false; - encoder2_cw.time = (timer_read() | 1); + encoder2_cw.time = timer_read(); action_exec(encoder2_cw); } } @@ -100,21 +104,21 @@ bool encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { /* First encoder */ if (clockwise) { encoder1_cw.pressed = true; - encoder1_cw.time = (timer_read() | 1); + encoder1_cw.time = timer_read(); action_exec(encoder1_cw); } else { encoder1_ccw.pressed = true; - encoder1_ccw.time = (timer_read() | 1); + encoder1_ccw.time = timer_read(); action_exec(encoder1_ccw); } } else if (index == 1) { if (clockwise) { encoder2_cw.pressed = true; - encoder2_cw.time = (timer_read() | 1); + encoder2_cw.time = timer_read(); action_exec(encoder2_cw); } else { encoder2_ccw.pressed = true; - encoder2_ccw.time = (timer_read() | 1); + encoder2_ccw.time = timer_read(); action_exec(encoder2_ccw); } } diff --git a/keyboards/dailycraft/sandbox/rev1/config.h b/keyboards/dailycraft/sandbox/rev1/config.h index 11c2825ca9..7da6e3f1bf 100644 --- a/keyboards/dailycraft/sandbox/rev1/config.h +++ b/keyboards/dailycraft/sandbox/rev1/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B5, B4 } -#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL */ -#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/dailycraft/sandbox/rev1/info.json b/keyboards/dailycraft/sandbox/rev1/info.json index 9dcf988997..8ff7c65a2f 100644 --- a/keyboards/dailycraft/sandbox/rev1/info.json +++ b/keyboards/dailycraft/sandbox/rev1/info.json @@ -8,22 +8,27 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B1", "B3", "B2", "B6"], + "rows": ["B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"1", "x":0, "y":0}, - {"label":"2", "x":1, "y":0}, - {"label":"3", "x":2, "y":0}, - {"label":"4", "x":3, "y":0}, - {"label":"5", "x":4, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, - {"label":"6", "x":0, "y":1}, - {"label":"7", "x":1, "y":1}, - {"label":"8", "x":2, "y":1}, - {"label":"9", "x":3, "y":1}, - {"label":"0", "x":4, "y":1} + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1} ] } } diff --git a/keyboards/dailycraft/sandbox/rev1/rev1.c b/keyboards/dailycraft/sandbox/rev1/rev1.c deleted file mode 100644 index dccf24c746..0000000000 --- a/keyboards/dailycraft/sandbox/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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 "rev1.h" diff --git a/keyboards/dailycraft/sandbox/rev1/rev1.h b/keyboards/dailycraft/sandbox/rev1/rev1.h deleted file mode 100644 index d15cffe1ae..0000000000 --- a/keyboards/dailycraft/sandbox/rev1/rev1.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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 is 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, k04, \ - k10, k11, k12, k13, k14 \ -) { \ - { k00, k01, k02, k03, k04 }, \ - { k10, k11, k12, k13, k14 } \ -} diff --git a/keyboards/dailycraft/sandbox/rev2/config.h b/keyboards/dailycraft/sandbox/rev2/config.h index 11c2825ca9..7da6e3f1bf 100644 --- a/keyboards/dailycraft/sandbox/rev2/config.h +++ b/keyboards/dailycraft/sandbox/rev2/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B5, B4 } -#define MATRIX_COL_PINS { F7, B1, B3, B2, B6 } - -/* COL2ROW, ROW2COL */ -#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/dailycraft/sandbox/rev2/info.json b/keyboards/dailycraft/sandbox/rev2/info.json index c0fd7745d0..99535b9473 100644 --- a/keyboards/dailycraft/sandbox/rev2/info.json +++ b/keyboards/dailycraft/sandbox/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0011", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "B1", "B3", "B2", "B6"], + "rows": ["B5", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, @@ -16,27 +21,29 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"1", "x":0, "y":0}, - {"label":"2", "x":1, "y":0}, - {"label":"3", "x":2, "y":0}, - {"label":"4", "x":3, "y":0}, - {"label":"5", "x":4, "y":0}, - {"label":"A", "x":6, "y":0}, - {"label":"B", "x":7, "y":0}, - {"label":"C", "x":8, "y":0}, - {"label":"D", "x":9, "y":0}, - {"label":"E", "x":10, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + + {"matrix": [2, 0], "x": 6, "y": 0}, + {"matrix": [2, 1], "x": 7, "y": 0}, + {"matrix": [2, 2], "x": 8, "y": 0}, + {"matrix": [2, 3], "x": 9, "y": 0}, + {"matrix": [2, 4], "x": 10, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, - {"label":"6", "x":0, "y":1}, - {"label":"7", "x":1, "y":1}, - {"label":"8", "x":2, "y":1}, - {"label":"9", "x":3, "y":1}, - {"label":"0", "x":4, "y":1}, - {"label":"F", "x":6, "y":1}, - {"label":"G", "x":7, "y":1}, - {"label":"H", "x":8, "y":1}, - {"label":"I", "x":9, "y":1}, - {"label":"J", "x":10, "y":1} + {"matrix": [3, 0], "x": 6, "y": 1}, + {"matrix": [3, 1], "x": 7, "y": 1}, + {"matrix": [3, 2], "x": 8, "y": 1}, + {"matrix": [3, 3], "x": 9, "y": 1}, + {"matrix": [3, 4], "x": 10, "y": 1} ] } } diff --git a/keyboards/dailycraft/sandbox/rev2/rev2.c b/keyboards/dailycraft/sandbox/rev2/rev2.c deleted file mode 100644 index 96aa6cd314..0000000000 --- a/keyboards/dailycraft/sandbox/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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 "rev2.h" diff --git a/keyboards/dailycraft/sandbox/rev2/rev2.h b/keyboards/dailycraft/sandbox/rev2/rev2.h deleted file mode 100644 index f5cc3de8a0..0000000000 --- a/keyboards/dailycraft/sandbox/rev2/rev2.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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 is 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( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14 \ -) { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { R00, R01, R02, R03, R04 }, \ - { R10, R11, R12, R13, R14 } \ -} diff --git a/keyboards/dailycraft/sandbox/sandbox.c b/keyboards/dailycraft/sandbox/sandbox.c index 0b576a8291..51a9f88a6d 100644 --- a/keyboards/dailycraft/sandbox/sandbox.c +++ b/keyboards/dailycraft/sandbox/sandbox.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "sandbox.h" +#include "quantum.h" #ifdef OLED_ENABLE bool oled_task_kb(void) { diff --git a/keyboards/dailycraft/sandbox/sandbox.h b/keyboards/dailycraft/sandbox/sandbox.h deleted file mode 100644 index e9c9ff99c3..0000000000 --- a/keyboards/dailycraft/sandbox/sandbox.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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" - -#ifdef KEYBOARD_dailycraft_sandbox_rev1 -# include "rev1.h" -#endif -#ifdef KEYBOARD_dailycraft_sandbox_rev2 -# include "rev2.h" -#endif diff --git a/keyboards/dailycraft/stickey4/keymaps/via/keymap.c b/keyboards/dailycraft/stickey4/keymaps/via/keymap.c index 602d3fb10d..30de32fa60 100644 --- a/keyboards/dailycraft/stickey4/keymaps/via/keymap.c +++ b/keyboards/dailycraft/stickey4/keymaps/via/keymap.c @@ -44,46 +44,50 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { keyevent_t encoder1_ccw = { .key = (keypos_t){.row = 0, .col = 4}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder1_cw = { .key = (keypos_t){.row = 0, .col = 5}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder2_ccw = { .key = (keypos_t){.row = 0, .col = 6}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder2_cw = { .key = (keypos_t){.row = 0, .col = 7}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; void matrix_scan_user(void) { - if (IS_PRESSED(encoder1_ccw)) { + if (encoder1_ccw.pressed) { encoder1_ccw.pressed = false; - encoder1_ccw.time = (timer_read() | 1); + encoder1_ccw.time = timer_read(); action_exec(encoder1_ccw); } - if (IS_PRESSED(encoder1_cw)) { + if (encoder1_cw.pressed) { encoder1_cw.pressed = false; - encoder1_cw.time = (timer_read() | 1); + encoder1_cw.time = timer_read(); action_exec(encoder1_cw); } - if (IS_PRESSED(encoder2_ccw)) { + if (encoder2_ccw.pressed) { encoder2_ccw.pressed = false; - encoder2_ccw.time = (timer_read() | 1); + encoder2_ccw.time = timer_read(); action_exec(encoder2_ccw); } - if (IS_PRESSED(encoder2_cw)) { + if (encoder2_cw.pressed) { encoder2_cw.pressed = false; - encoder2_cw.time = (timer_read() | 1); + encoder2_cw.time = timer_read(); action_exec(encoder2_cw); } } @@ -92,21 +96,21 @@ bool encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { /* First encoder */ if (clockwise) { encoder1_cw.pressed = true; - encoder1_cw.time = (timer_read() | 1); + encoder1_cw.time = timer_read(); action_exec(encoder1_cw); } else { encoder1_ccw.pressed = true; - encoder1_ccw.time = (timer_read() | 1); + encoder1_ccw.time = timer_read(); action_exec(encoder1_ccw); } } else if (index == 1) { if (clockwise) { encoder2_cw.pressed = true; - encoder2_cw.time = (timer_read() | 1); + encoder2_cw.time = timer_read(); action_exec(encoder2_cw); } else { encoder2_ccw.pressed = true; - encoder2_ccw.time = (timer_read() | 1); + encoder2_ccw.time = timer_read(); action_exec(encoder2_ccw); } } diff --git a/keyboards/dailycraft/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h index b4ec32ba1d..7da6e3f1bf 100644 --- a/keyboards/dailycraft/wings42/rev1/config.h +++ b/keyboards/dailycraft/wings42/rev1/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL */ -#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/dailycraft/wings42/rev1/info.json b/keyboards/dailycraft/wings42/rev1/info.json index 6a5e5040d5..657c8a9e51 100644 --- a/keyboards/dailycraft/wings42/rev1/info.json +++ b/keyboards/dailycraft/wings42/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, @@ -19,51 +24,55 @@ "layouts": { "LAYOUT_split_3x6_3": { "layout": [ - {"label":"L00", "x":0, "y":0.875}, - {"label":"L01", "x":1, "y":0.625}, - {"label":"L02", "x":2, "y":0.375}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0.125}, - {"label":"R00", "x":9, "y":0.125}, - {"label":"R01", "x":10, "y":0}, - {"label":"R02", "x":11, "y":0}, - {"label":"R03", "x":12, "y":0.375}, - {"label":"R04", "x":13, "y":0.625}, - {"label":"R05", "x":14, "y":0.875}, + {"matrix": [0, 0], "x": 0, "y": 0.875}, + {"matrix": [0, 1], "x": 1, "y": 0.625}, + {"matrix": [0, 2], "x": 2, "y": 0.375}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.125}, + + {"matrix": [4, 5], "x": 9, "y": 0.125}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 3], "x": 11, "y": 0}, + {"matrix": [4, 2], "x": 12, "y": 0.375}, + {"matrix": [4, 1], "x": 13, "y": 0.625}, + {"matrix": [4, 0], "x": 14, "y": 0.875}, + + {"matrix": [1, 0], "x": 0, "y": 1.875}, + {"matrix": [1, 1], "x": 1, "y": 1.625}, + {"matrix": [1, 2], "x": 2, "y": 1.375}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.125}, + + {"matrix": [5, 5], "x": 9, "y": 1.125}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 3], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1.375}, + {"matrix": [5, 1], "x": 13, "y": 1.625}, + {"matrix": [5, 0], "x": 14, "y": 1.875}, + + {"matrix": [2, 0], "x": 0, "y": 2.875}, + {"matrix": [2, 1], "x": 1, "y": 2.625}, + {"matrix": [2, 2], "x": 2, "y": 2.375}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.125}, - {"label":"L10", "x":0, "y":1.875}, - {"label":"L11", "x":1, "y":1.625}, - {"label":"L12", "x":2, "y":1.375}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1.125}, - {"label":"R10", "x":9, "y":1.125}, - {"label":"R11", "x":10, "y":1}, - {"label":"R12", "x":11, "y":1}, - {"label":"R13", "x":12, "y":1.375}, - {"label":"R14", "x":13, "y":1.625}, - {"label":"R15", "x":14, "y":1.875}, + {"matrix": [6, 5], "x": 9, "y": 2.125}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 3], "x": 11, "y": 2}, + {"matrix": [6, 2], "x": 12, "y": 2.375}, + {"matrix": [6, 1], "x": 13, "y": 2.625}, + {"matrix": [6, 0], "x": 14, "y": 2.875}, - {"label":"L20", "x":0, "y":2.875}, - {"label":"L21", "x":1, "y":2.625}, - {"label":"L22", "x":2, "y":2.375}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2.125}, - {"label":"R20", "x":9, "y":2.125}, - {"label":"R21", "x":10, "y":2}, - {"label":"R22", "x":11, "y":2}, - {"label":"R23", "x":12, "y":2.375}, - {"label":"R24", "x":13, "y":2.625}, - {"label":"R25", "x":14, "y":2.875}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3.125}, + {"matrix": [3, 5], "x": 6, "y": 3.375}, - {"label":"L30", "x":4, "y":3}, - {"label":"L31", "x":5, "y":3.125}, - {"label":"L32", "x":6, "y":3.375}, - {"label":"R30", "x":8, "y":3.375}, - {"label":"R31", "x":9, "y":3.125}, - {"label":"R32", "x":10, "y":3} + {"matrix": [7, 5], "x": 8, "y": 3.375}, + {"matrix": [7, 4], "x": 9, "y": 3.125}, + {"matrix": [7, 3], "x": 10, "y": 3} ] } } diff --git a/keyboards/dailycraft/wings42/rev1/rev1.c b/keyboards/dailycraft/wings42/rev1/rev1.c deleted file mode 100644 index dccf24c746..0000000000 --- a/keyboards/dailycraft/wings42/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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 "rev1.h" diff --git a/keyboards/dailycraft/wings42/rev1/rev1.h b/keyboards/dailycraft/wings42/rev1/rev1.h deleted file mode 100644 index cd6e35a711..0000000000 --- a/keyboards/dailycraft/wings42/rev1/rev1.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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 is 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_split_3x6_3( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ - } diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h index d2067fbb52..7da6e3f1bf 100644 --- a/keyboards/dailycraft/wings42/rev1_extkeys/config.h +++ b/keyboards/dailycraft/wings42/rev1_extkeys/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B2, B4 } -#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4, B6, B5 } - -/* COL2ROW, ROW2COL */ -#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/dailycraft/wings42/rev1_extkeys/info.json b/keyboards/dailycraft/wings42/rev1_extkeys/info.json index 51184b3ebd..53db2db4ca 100644 --- a/keyboards/dailycraft/wings42/rev1_extkeys/info.json +++ b/keyboards/dailycraft/wings42/rev1_extkeys/info.json @@ -8,63 +8,72 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B1", "F7", "F6", "F5", "F4", "B6", "B5"], + "rows": ["D4", "C6", "D7", "E6", "B2", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, "processor": "atmega32u4", "bootloader": "caterina", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0.875}, - {"label":"L01", "x":1, "y":0.625}, - {"label":"L02", "x":2, "y":0.375}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0.125}, - {"label":"R00", "x":9, "y":0.125}, - {"label":"R01", "x":10, "y":0}, - {"label":"R02", "x":11, "y":0}, - {"label":"R03", "x":12, "y":0.375}, - {"label":"R04", "x":13, "y":0.625}, - {"label":"R05", "x":14, "y":0.875}, + {"matrix": [0, 0], "x": 0, "y": 0.875}, + {"matrix": [0, 1], "x": 1, "y": 0.625}, + {"matrix": [0, 2], "x": 2, "y": 0.375}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.125}, + + {"matrix": [6, 5], "x": 9, "y": 0.125}, + {"matrix": [6, 4], "x": 10, "y": 0}, + {"matrix": [6, 3], "x": 11, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0.375}, + {"matrix": [6, 1], "x": 13, "y": 0.625}, + {"matrix": [6, 0], "x": 14, "y": 0.875}, + + {"matrix": [1, 0], "x": 0, "y": 1.875}, + {"matrix": [1, 1], "x": 1, "y": 1.625}, + {"matrix": [1, 2], "x": 2, "y": 1.375}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.125}, + {"matrix": [5, 7], "x": 6, "y": 1.625}, + + {"matrix": [11, 7], "x": 8, "y": 1.625}, + {"matrix": [7, 5], "x": 9, "y": 1.125}, + {"matrix": [7, 4], "x": 10, "y": 1}, + {"matrix": [7, 3], "x": 11, "y": 1}, + {"matrix": [7, 2], "x": 12, "y": 1.375}, + {"matrix": [7, 1], "x": 13, "y": 1.625}, + {"matrix": [7, 0], "x": 14, "y": 1.875}, + + {"matrix": [2, 0], "x": 0, "y": 2.875}, + {"matrix": [2, 1], "x": 1, "y": 2.625}, + {"matrix": [2, 2], "x": 2, "y": 2.375}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.125}, + {"matrix": [4, 6], "x": 6, "y": 2.625}, - {"label":"L10", "x":0, "y":1.875}, - {"label":"L11", "x":1, "y":1.625}, - {"label":"L12", "x":2, "y":1.375}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1.125}, - {"label":"E01", "x":6, "y":1.625}, - {"label":"E03", "x":8, "y":1.625}, - {"label":"R10", "x":9, "y":1.125}, - {"label":"R11", "x":10, "y":1}, - {"label":"R12", "x":11, "y":1}, - {"label":"R13", "x":12, "y":1.375}, - {"label":"R14", "x":13, "y":1.625}, - {"label":"R15", "x":14, "y":1.875}, + {"matrix": [10, 6], "x": 8, "y": 2.625}, + {"matrix": [8, 5], "x": 9, "y": 2.125}, + {"matrix": [8, 4], "x": 10, "y": 2}, + {"matrix": [8, 3], "x": 11, "y": 2}, + {"matrix": [8, 2], "x": 12, "y": 2.375}, + {"matrix": [8, 1], "x": 13, "y": 2.625}, + {"matrix": [8, 0], "x": 14, "y": 2.875}, - {"label":"L20", "x":0, "y":2.875}, - {"label":"L21", "x":1, "y":2.625}, - {"label":"L22", "x":2, "y":2.375}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2.125}, - {"label":"E02", "x":6, "y":2.625}, - {"label":"E04", "x":8, "y":2.625}, - {"label":"R20", "x":9, "y":2.125}, - {"label":"R21", "x":10, "y":2}, - {"label":"R22", "x":11, "y":2}, - {"label":"R23", "x":12, "y":2.375}, - {"label":"R24", "x":13, "y":2.625}, - {"label":"R25", "x":14, "y":2.875}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3.125}, + {"matrix": [3, 5], "x": 6, "y": 3.375}, - {"label":"L30", "x":4, "y":3}, - {"label":"L31", "x":5, "y":3.125}, - {"label":"L32", "x":6, "y":3.375}, - {"label":"R30", "x":8, "y":3.375}, - {"label":"R31", "x":9, "y":3.125}, - {"label":"R32", "x":10, "y":3} + {"matrix": [9, 5], "x": 8, "y": 3.375}, + {"matrix": [9, 4], "x": 9, "y": 3.125}, + {"matrix": [9, 3], "x": 10, "y": 3} ] } } diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c deleted file mode 100644 index 3d0d203704..0000000000 --- a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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 "rev1_extkeys.h" diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h deleted file mode 100644 index 2ad58047f1..0000000000 --- a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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 is 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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, E01, E03, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, E02, E04, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, L30, L31, L32, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, E02, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, E01 }, \ - { R05, R04, R03, R02, R01, R00, KC_NO, KC_NO }, \ - { R15, R14, R13, R12, R11, R10, KC_NO, KC_NO }, \ - { R25, R24, R23, R22, R21, R20, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, R32, R31, R30, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, E04, KC_NO}, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, E03} \ - } diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h index bd115ee140..7da6e3f1bf 100644 --- a/keyboards/dailycraft/wings42/rev2/config.h +++ b/keyboards/dailycraft/wings42/rev2/config.h @@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6, NO_PIN } -#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL */ -#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/dailycraft/wings42/rev2/info.json b/keyboards/dailycraft/wings42/rev2/info.json index bd8e97916a..09cf423e93 100644 --- a/keyboards/dailycraft/wings42/rev2/info.json +++ b/keyboards/dailycraft/wings42/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6", null] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, @@ -16,55 +21,59 @@ "layouts": { "LAYOUT_split_3x6_3_2": { "layout": [ - {"label":"L00", "x":0, "y":0.875}, - {"label":"L01", "x":1, "y":0.625}, - {"label":"L02", "x":2, "y":0.375}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0.125}, - {"label":"R00", "x":9, "y":0.125}, - {"label":"R01", "x":10, "y":0}, - {"label":"R02", "x":11, "y":0}, - {"label":"R03", "x":12, "y":0.375}, - {"label":"R04", "x":13, "y":0.625}, - {"label":"R05", "x":14, "y":0.875}, + {"matrix": [0, 0], "x": 0, "y": 0.875}, + {"matrix": [0, 1], "x": 1, "y": 0.625}, + {"matrix": [0, 2], "x": 2, "y": 0.375}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.125}, + + {"matrix": [5, 5], "x": 9, "y": 0.125}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.375}, + {"matrix": [5, 1], "x": 13, "y": 0.625}, + {"matrix": [5, 0], "x": 14, "y": 0.875}, + + {"matrix": [1, 0], "x": 0, "y": 1.875}, + {"matrix": [1, 1], "x": 1, "y": 1.625}, + {"matrix": [1, 2], "x": 2, "y": 1.375}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.125}, + {"matrix": [3, 1], "x": 6, "y": 1.625}, + + {"matrix": [8, 2], "x": 8, "y": 1.625}, + {"matrix": [6, 5], "x": 9, "y": 1.125}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.375}, + {"matrix": [6, 1], "x": 13, "y": 1.625}, + {"matrix": [6, 0], "x": 14, "y": 1.875}, + + {"matrix": [2, 0], "x": 0, "y": 2.875}, + {"matrix": [2, 1], "x": 1, "y": 2.625}, + {"matrix": [2, 2], "x": 2, "y": 2.375}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.125}, + {"matrix": [3, 2], "x": 6, "y": 2.625}, - {"label":"L10", "x":0, "y":1.875}, - {"label":"L11", "x":1, "y":1.625}, - {"label":"L12", "x":2, "y":1.375}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1.125}, - {"label":"L31", "x":6, "y":1.625}, - {"label":"R33", "x":8, "y":1.625}, - {"label":"R10", "x":9, "y":1.125}, - {"label":"R11", "x":10, "y":1}, - {"label":"R12", "x":11, "y":1}, - {"label":"R13", "x":12, "y":1.375}, - {"label":"R14", "x":13, "y":1.625}, - {"label":"R15", "x":14, "y":1.875}, + {"matrix": [8, 1], "x": 8, "y": 2.625}, + {"matrix": [7, 5], "x": 9, "y": 2.125}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.375}, + {"matrix": [7, 1], "x": 13, "y": 2.625}, + {"matrix": [7, 0], "x": 14, "y": 2.875}, - {"label":"L20", "x":0, "y":2.875}, - {"label":"L21", "x":1, "y":2.625}, - {"label":"L22", "x":2, "y":2.375}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2.125}, - {"label":"L32", "x":6, "y":2.625}, - {"label":"R34", "x":8, "y":2.625}, - {"label":"R20", "x":9, "y":2.125}, - {"label":"R21", "x":10, "y":2}, - {"label":"R22", "x":11, "y":2}, - {"label":"R23", "x":12, "y":2.375}, - {"label":"R24", "x":13, "y":2.625}, - {"label":"R25", "x":14, "y":2.875}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3.125}, + {"matrix": [3, 5], "x": 6, "y": 3.375}, - {"label":"L33", "x":4, "y":3}, - {"label":"L34", "x":5, "y":3.125}, - {"label":"L35", "x":6, "y":3.375}, - {"label":"R30", "x":8, "y":3.375}, - {"label":"R31", "x":9, "y":3.125}, - {"label":"R32", "x":10, "y":3} + {"matrix": [8, 5], "x": 8, "y": 3.375}, + {"matrix": [8, 4], "x": 9, "y": 3.125}, + {"matrix": [8, 3], "x": 10, "y": 3} ] } } diff --git a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c index 97f94366a8..7349bf2411 100644 --- a/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c +++ b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c @@ -82,91 +82,99 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { keyevent_t encoder1_ccw = { .key = (keypos_t){.row = 4, .col = 0}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder1_cw = { .key = (keypos_t){.row = 4, .col = 1}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder2_ccw = { .key = (keypos_t){.row = 4, .col = 2}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder2_cw = { .key = (keypos_t){.row = 4, .col = 3}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder3_ccw = { .key = (keypos_t){.row = 9, .col = 1}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder3_cw = { .key = (keypos_t){.row = 9, .col = 0}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder4_ccw = { .key = (keypos_t){.row = 9, .col = 3}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; keyevent_t encoder4_cw = { .key = (keypos_t){.row = 9, .col = 2}, - .pressed = false + .pressed = false, + .type = KEY_EVENT }; void matrix_scan_user(void) { - if (IS_PRESSED(encoder1_ccw)) { + if (encoder1_ccw.pressed) { encoder1_ccw.pressed = false; - encoder1_ccw.time = (timer_read() | 1); + encoder1_ccw.time = timer_read(); action_exec(encoder1_ccw); } - if (IS_PRESSED(encoder1_cw)) { + if (encoder1_cw.pressed) { encoder1_cw.pressed = false; - encoder1_cw.time = (timer_read() | 1); + encoder1_cw.time = timer_read(); action_exec(encoder1_cw); } - if (IS_PRESSED(encoder2_ccw)) { + if (encoder2_ccw.pressed) { encoder2_ccw.pressed = false; - encoder2_ccw.time = (timer_read() | 1); + encoder2_ccw.time = timer_read(); action_exec(encoder2_ccw); } - if (IS_PRESSED(encoder2_cw)) { + if (encoder2_cw.pressed) { encoder2_cw.pressed = false; - encoder2_cw.time = (timer_read() | 1); + encoder2_cw.time = timer_read(); action_exec(encoder2_cw); } - if (IS_PRESSED(encoder3_ccw)) { + if (encoder3_ccw.pressed) { encoder3_ccw.pressed = false; - encoder3_ccw.time = (timer_read() | 1); + encoder3_ccw.time = timer_read(); action_exec(encoder3_ccw); } - if (IS_PRESSED(encoder3_cw)) { + if (encoder3_cw.pressed) { encoder3_cw.pressed = false; - encoder3_cw.time = (timer_read() | 1); + encoder3_cw.time = timer_read(); action_exec(encoder3_cw); } - if (IS_PRESSED(encoder4_ccw)) { + if (encoder4_ccw.pressed) { encoder4_ccw.pressed = false; - encoder4_ccw.time = (timer_read() | 1); + encoder4_ccw.time = timer_read(); action_exec(encoder4_ccw); } - if (IS_PRESSED(encoder4_cw)) { + if (encoder4_cw.pressed) { encoder4_cw.pressed = false; - encoder4_cw.time = (timer_read() | 1); + encoder4_cw.time = timer_read(); action_exec(encoder4_cw); } } @@ -175,41 +183,41 @@ bool encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { if (clockwise) { encoder1_cw.pressed = true; - encoder1_cw.time = (timer_read() | 1); + encoder1_cw.time = timer_read(); action_exec(encoder1_cw); } else { encoder1_ccw.pressed = true; - encoder1_ccw.time = (timer_read() | 1); + encoder1_ccw.time = timer_read(); action_exec(encoder1_ccw); } } else if (index == 1) { if (clockwise) { encoder2_cw.pressed = true; - encoder2_cw.time = (timer_read() | 1); + encoder2_cw.time = timer_read(); action_exec(encoder2_cw); } else { encoder2_ccw.pressed = true; - encoder2_ccw.time = (timer_read() | 1); + encoder2_ccw.time = timer_read(); action_exec(encoder2_ccw); } } else if (index == 2) { if (clockwise) { encoder3_cw.pressed = true; - encoder3_cw.time = (timer_read() | 1); + encoder3_cw.time = timer_read(); action_exec(encoder3_cw); } else { encoder3_ccw.pressed = true; - encoder3_ccw.time = (timer_read() | 1); + encoder3_ccw.time = timer_read(); action_exec(encoder3_ccw); } } else if (index == 3) { if (clockwise) { encoder4_cw.pressed = true; - encoder4_cw.time = (timer_read() | 1); + encoder4_cw.time = timer_read(); action_exec(encoder4_cw); } else { encoder4_ccw.pressed = true; - encoder4_ccw.time = (timer_read() | 1); + encoder4_ccw.time = timer_read(); action_exec(encoder4_ccw); } } diff --git a/keyboards/dailycraft/wings42/rev2/rev2.c b/keyboards/dailycraft/wings42/rev2/rev2.c deleted file mode 100644 index 96aa6cd314..0000000000 --- a/keyboards/dailycraft/wings42/rev2/rev2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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 "rev2.h" diff --git a/keyboards/dailycraft/wings42/rev2/rev2.h b/keyboards/dailycraft/wings42/rev2/rev2.h deleted file mode 100644 index 4720592264..0000000000 --- a/keyboards/dailycraft/wings42/rev2/rev2.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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 is 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_split_3x6_3_2( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, L31, R33, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, L32, R34, R20, R21, R22, R23, R24, R25, \ - L33, L34, L35, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, L31, L32, L33, L34, L35 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { KC_NO, R34, R33, R32, R31, R30 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/dailycraft/wings42/wings42.c b/keyboards/dailycraft/wings42/wings42.c deleted file mode 100644 index 824b6cfbb6..0000000000 --- a/keyboards/dailycraft/wings42/wings42.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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 "wings42.h" diff --git a/keyboards/dailycraft/wings42/wings42.h b/keyboards/dailycraft/wings42/wings42.h deleted file mode 100644 index d839f04884..0000000000 --- a/keyboards/dailycraft/wings42/wings42.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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" - -#ifdef KEYBOARD_dailycraft_wings42_rev1 -# include "rev1.h" -#endif -#ifdef KEYBOARD_dailycraft_wings42_rev1_extkeys -# include "rev1_extkeys.h" -#endif -#ifdef KEYBOARD_dailycraft_wings42_rev2 -# include "rev2.h" -#endif - |