From d8542e80d6cba43aeff99a15cf5662479fba711e Mon Sep 17 00:00:00 2001 From: Blake Drayson Date: Fri, 14 Jun 2024 21:41:13 +0100 Subject: [PATCH 1/6] Fix for key repeat on wake from sleep, RBG sleep tweak, readme update --- keyboards/draytronics/elise_v2/config.h | 23 ++++++++++++++++++++ keyboards/draytronics/elise_v2/keyboard.json | 3 +-- keyboards/draytronics/elise_v2/readme.md | 4 ++-- 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 keyboards/draytronics/elise_v2/config.h diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h new file mode 100644 index 00000000000..116beca483d --- /dev/null +++ b/keyboards/draytronics/elise_v2/config.h @@ -0,0 +1,23 @@ +/*Copyright 2021 Blake Drayson / Draytronics + +Contact info@draytronics.co.uk + +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 . +*/ + +//Fix to prevent key repeat on wake from sleep when using a KVM / non direct usb connection. +#pragma once + +#define USB_POLLING_INTERVAL_MS 8 +#define USB_SUSPEND_WAKEUP_DELAY 3000 diff --git a/keyboards/draytronics/elise_v2/keyboard.json b/keyboards/draytronics/elise_v2/keyboard.json index 217f837e197..dfa1c48132f 100644 --- a/keyboards/draytronics/elise_v2/keyboard.json +++ b/keyboards/draytronics/elise_v2/keyboard.json @@ -9,8 +9,6 @@ "device_version": "2.0.0" }, "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, "led_count": 16, "sleep": true, "animations": { @@ -39,6 +37,7 @@ "rgblight": true }, "qmk": { + "tap_keycode_delay": 10, "locking": { "enabled": true, "resync": true diff --git a/keyboards/draytronics/elise_v2/readme.md b/keyboards/draytronics/elise_v2/readme.md index 32730f930a6..f6821d1544b 100644 --- a/keyboards/draytronics/elise_v2/readme.md +++ b/keyboards/draytronics/elise_v2/readme.md @@ -19,14 +19,14 @@ Entering DFU mode (to allow flashing): - If you have one of the provided keymaps flashed, then pressing FN-Tab will enter DFU. Make example for this keyboard (after setting up your build environment): - + make draytronics/elise_v2:default Flashing example for this keyboard: make draytronics/elise_v2:default:flash -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with [The QMK Tutorial](https://docs.qmk.fm/#/newbs). ![elise-pcb-top](https://www.draytronics.co.uk/wp-content/uploads/2021/08/Draytronics-Elise-PCB-V2-top.png) From 0df120954f029f292726d84016d41877fc5df339 Mon Sep 17 00:00:00 2001 From: Blake Drayson Date: Sat, 15 Jun 2024 11:14:26 +0100 Subject: [PATCH 2/6] Moved key repeat sleep fix to user space. --- keyboards/draytronics/elise_v2/config.h | 23 ------------------- .../elise_v2/keymaps/blake_iso/keymap.c | 7 ++++++ .../elise_v2/keymaps/default/keymap.c | 6 +++++ .../elise_v2/keymaps/default_iso/keymap.c | 6 +++++ 4 files changed, 19 insertions(+), 23 deletions(-) delete mode 100644 keyboards/draytronics/elise_v2/config.h diff --git a/keyboards/draytronics/elise_v2/config.h b/keyboards/draytronics/elise_v2/config.h deleted file mode 100644 index 116beca483d..00000000000 --- a/keyboards/draytronics/elise_v2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/*Copyright 2021 Blake Drayson / Draytronics - -Contact info@draytronics.co.uk - -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 . -*/ - -//Fix to prevent key repeat on wake from sleep when using a KVM / non direct usb connection. -#pragma once - -#define USB_POLLING_INTERVAL_MS 8 -#define USB_SUSPEND_WAKEUP_DELAY 3000 diff --git a/keyboards/draytronics/elise_v2/keymaps/blake_iso/keymap.c b/keyboards/draytronics/elise_v2/keymaps/blake_iso/keymap.c index c8a0ecd9598..e045cd01af4 100644 --- a/keyboards/draytronics/elise_v2/keymaps/blake_iso/keymap.c +++ b/keyboards/draytronics/elise_v2/keymaps/blake_iso/keymap.c @@ -18,6 +18,13 @@ along with this program. If not, see . #include QMK_KEYBOARD_H +//Fix to prevent key repeat on wake from sleep when using a KVM / non direct usb connection. +#undef USB_POLLING_INTERVAL_MS +#define USB_POLLING_INTERVAL_MS 8 +#undef USB_SUSPEND_WAKEUP_DELAY +#define USB_SUSPEND_WAKEUP_DELAY 3000 + + enum custom_layers { _BL, _FL, diff --git a/keyboards/draytronics/elise_v2/keymaps/default/keymap.c b/keyboards/draytronics/elise_v2/keymaps/default/keymap.c index 1989f22f97c..7d1f4bb1e50 100644 --- a/keyboards/draytronics/elise_v2/keymaps/default/keymap.c +++ b/keyboards/draytronics/elise_v2/keymaps/default/keymap.c @@ -17,6 +17,12 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H +//Fix to prevent key repeat on wake from sleep when using a KVM / non direct usb connection. +#undef USB_POLLING_INTERVAL_MS +#define USB_POLLING_INTERVAL_MS 8 +#undef USB_SUSPEND_WAKEUP_DELAY +#define USB_SUSPEND_WAKEUP_DELAY 3000 + enum custom_layers { _BL, _FL, diff --git a/keyboards/draytronics/elise_v2/keymaps/default_iso/keymap.c b/keyboards/draytronics/elise_v2/keymaps/default_iso/keymap.c index 02f4b9c1cc8..1aab7e16526 100644 --- a/keyboards/draytronics/elise_v2/keymaps/default_iso/keymap.c +++ b/keyboards/draytronics/elise_v2/keymaps/default_iso/keymap.c @@ -18,6 +18,12 @@ along with this program. If not, see . #include QMK_KEYBOARD_H +//Fix to prevent key repeat on wake from sleep when using a KVM / non direct usb connection. +#undef USB_POLLING_INTERVAL_MS +#define USB_POLLING_INTERVAL_MS 8 +#undef USB_SUSPEND_WAKEUP_DELAY +#define USB_SUSPEND_WAKEUP_DELAY 3000 + enum custom_layers { _BL, _FL, From 0a7dd57ab32e5b2cfb14f038ed6f63effdfa119e Mon Sep 17 00:00:00 2001 From: Blake Drayson Date: Tue, 18 Jun 2024 09:00:09 +0100 Subject: [PATCH 3/6] Move USB fix from keymap.c to keymap level config.h --- .../elise_v2/keymaps/blake_iso/config.h | 24 +++++++++++++++++++ .../elise_v2/keymaps/blake_iso/keymap.c | 7 ------ .../elise_v2/keymaps/default/config.h | 24 +++++++++++++++++++ .../elise_v2/keymaps/default/keymap.c | 6 ----- .../elise_v2/keymaps/default_iso/config.h | 24 +++++++++++++++++++ .../elise_v2/keymaps/default_iso/keymap.c | 6 ----- 6 files changed, 72 insertions(+), 19 deletions(-) create mode 100644 keyboards/draytronics/elise_v2/keymaps/blake_iso/config.h create mode 100644 keyboards/draytronics/elise_v2/keymaps/default/config.h create mode 100644 keyboards/draytronics/elise_v2/keymaps/default_iso/config.h diff --git a/keyboards/draytronics/elise_v2/keymaps/blake_iso/config.h b/keyboards/draytronics/elise_v2/keymaps/blake_iso/config.h new file mode 100644 index 00000000000..a30e57780a2 --- /dev/null +++ b/keyboards/draytronics/elise_v2/keymaps/blake_iso/config.h @@ -0,0 +1,24 @@ +/*Copyright 2021 Blake Drayson / Draytronics + +Contact info@draytronics.co.uk + +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 . +*/ + +//KVM Specific tweaks to prevent key repeat on wake from sleep. +//Please comment out and recompile if you do not wish to use them. +#pragma once + +#define USB_POLLING_INTERVAL_MS 8 +#define USB_SUSPEND_WAKEUP_DELAY 3000 diff --git a/keyboards/draytronics/elise_v2/keymaps/blake_iso/keymap.c b/keyboards/draytronics/elise_v2/keymaps/blake_iso/keymap.c index e045cd01af4..c8a0ecd9598 100644 --- a/keyboards/draytronics/elise_v2/keymaps/blake_iso/keymap.c +++ b/keyboards/draytronics/elise_v2/keymaps/blake_iso/keymap.c @@ -18,13 +18,6 @@ along with this program. If not, see . #include QMK_KEYBOARD_H -//Fix to prevent key repeat on wake from sleep when using a KVM / non direct usb connection. -#undef USB_POLLING_INTERVAL_MS -#define USB_POLLING_INTERVAL_MS 8 -#undef USB_SUSPEND_WAKEUP_DELAY -#define USB_SUSPEND_WAKEUP_DELAY 3000 - - enum custom_layers { _BL, _FL, diff --git a/keyboards/draytronics/elise_v2/keymaps/default/config.h b/keyboards/draytronics/elise_v2/keymaps/default/config.h new file mode 100644 index 00000000000..a30e57780a2 --- /dev/null +++ b/keyboards/draytronics/elise_v2/keymaps/default/config.h @@ -0,0 +1,24 @@ +/*Copyright 2021 Blake Drayson / Draytronics + +Contact info@draytronics.co.uk + +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 . +*/ + +//KVM Specific tweaks to prevent key repeat on wake from sleep. +//Please comment out and recompile if you do not wish to use them. +#pragma once + +#define USB_POLLING_INTERVAL_MS 8 +#define USB_SUSPEND_WAKEUP_DELAY 3000 diff --git a/keyboards/draytronics/elise_v2/keymaps/default/keymap.c b/keyboards/draytronics/elise_v2/keymaps/default/keymap.c index 7d1f4bb1e50..1989f22f97c 100644 --- a/keyboards/draytronics/elise_v2/keymaps/default/keymap.c +++ b/keyboards/draytronics/elise_v2/keymaps/default/keymap.c @@ -17,12 +17,6 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -//Fix to prevent key repeat on wake from sleep when using a KVM / non direct usb connection. -#undef USB_POLLING_INTERVAL_MS -#define USB_POLLING_INTERVAL_MS 8 -#undef USB_SUSPEND_WAKEUP_DELAY -#define USB_SUSPEND_WAKEUP_DELAY 3000 - enum custom_layers { _BL, _FL, diff --git a/keyboards/draytronics/elise_v2/keymaps/default_iso/config.h b/keyboards/draytronics/elise_v2/keymaps/default_iso/config.h new file mode 100644 index 00000000000..a30e57780a2 --- /dev/null +++ b/keyboards/draytronics/elise_v2/keymaps/default_iso/config.h @@ -0,0 +1,24 @@ +/*Copyright 2021 Blake Drayson / Draytronics + +Contact info@draytronics.co.uk + +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 . +*/ + +//KVM Specific tweaks to prevent key repeat on wake from sleep. +//Please comment out and recompile if you do not wish to use them. +#pragma once + +#define USB_POLLING_INTERVAL_MS 8 +#define USB_SUSPEND_WAKEUP_DELAY 3000 diff --git a/keyboards/draytronics/elise_v2/keymaps/default_iso/keymap.c b/keyboards/draytronics/elise_v2/keymaps/default_iso/keymap.c index 1aab7e16526..02f4b9c1cc8 100644 --- a/keyboards/draytronics/elise_v2/keymaps/default_iso/keymap.c +++ b/keyboards/draytronics/elise_v2/keymaps/default_iso/keymap.c @@ -18,12 +18,6 @@ along with this program. If not, see . #include QMK_KEYBOARD_H -//Fix to prevent key repeat on wake from sleep when using a KVM / non direct usb connection. -#undef USB_POLLING_INTERVAL_MS -#define USB_POLLING_INTERVAL_MS 8 -#undef USB_SUSPEND_WAKEUP_DELAY -#define USB_SUSPEND_WAKEUP_DELAY 3000 - enum custom_layers { _BL, _FL, From d40551b4ad2857d45e21467abe74778862d75826 Mon Sep 17 00:00:00 2001 From: Blake Date: Tue, 15 Oct 2024 13:47:00 +0100 Subject: [PATCH 4/6] Update keyboards/draytronics/elise_v2/readme.md Co-authored-by: Ryan --- keyboards/draytronics/elise_v2/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/draytronics/elise_v2/readme.md b/keyboards/draytronics/elise_v2/readme.md index f6821d1544b..63622eb155e 100644 --- a/keyboards/draytronics/elise_v2/readme.md +++ b/keyboards/draytronics/elise_v2/readme.md @@ -19,7 +19,6 @@ Entering DFU mode (to allow flashing): - If you have one of the provided keymaps flashed, then pressing FN-Tab will enter DFU. Make example for this keyboard (after setting up your build environment): - make draytronics/elise_v2:default Flashing example for this keyboard: From a3c26a32a024b9e29f2804977fea8f1e263be8ed Mon Sep 17 00:00:00 2001 From: Blake Date: Tue, 15 Oct 2024 13:47:14 +0100 Subject: [PATCH 5/6] Update keyboards/draytronics/elise_v2/readme.md Co-authored-by: Ryan --- keyboards/draytronics/elise_v2/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/draytronics/elise_v2/readme.md b/keyboards/draytronics/elise_v2/readme.md index 63622eb155e..3c599e828c7 100644 --- a/keyboards/draytronics/elise_v2/readme.md +++ b/keyboards/draytronics/elise_v2/readme.md @@ -25,7 +25,7 @@ Flashing example for this keyboard: make draytronics/elise_v2:default:flash -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with [The QMK Tutorial](https://docs.qmk.fm/#/newbs). +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). ![elise-pcb-top](https://www.draytronics.co.uk/wp-content/uploads/2021/08/Draytronics-Elise-PCB-V2-top.png) From 662da5084f4c6a5f2c98059ffe4b5fcd5833b280 Mon Sep 17 00:00:00 2001 From: Blake Date: Tue, 15 Oct 2024 15:27:05 +0100 Subject: [PATCH 6/6] Update keyboards/draytronics/elise_v2/readme.md Co-authored-by: Ryan --- keyboards/draytronics/elise_v2/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/draytronics/elise_v2/readme.md b/keyboards/draytronics/elise_v2/readme.md index 3c599e828c7..32730f930a6 100644 --- a/keyboards/draytronics/elise_v2/readme.md +++ b/keyboards/draytronics/elise_v2/readme.md @@ -19,6 +19,7 @@ Entering DFU mode (to allow flashing): - If you have one of the provided keymaps flashed, then pressing FN-Tab will enter DFU. Make example for this keyboard (after setting up your build environment): + make draytronics/elise_v2:default Flashing example for this keyboard: