From f4c3400bf0af2ff021d3369ec7ee7ae3d5786d72 Mon Sep 17 00:00:00 2001 From: Blake Drayson Date: Fri, 14 Jun 2024 21:53:58 +0100 Subject: [PATCH 1/6] Fix for key repeat on wake from sleep, RBG sleep tweak, readme update --- keyboards/draytronics/elise/config.h | 20 ++++++++++++++++++++ keyboards/draytronics/elise/keyboard.json | 3 +-- keyboards/draytronics/elise/readme.md | 5 ++--- 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 keyboards/draytronics/elise/config.h diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h new file mode 100644 index 00000000000..9553b3816da --- /dev/null +++ b/keyboards/draytronics/elise/config.h @@ -0,0 +1,20 @@ + +/*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/keyboard.json b/keyboards/draytronics/elise/keyboard.json index 782c61d7643..046a9854859 100644 --- a/keyboards/draytronics/elise/keyboard.json +++ b/keyboards/draytronics/elise/keyboard.json @@ -18,6 +18,7 @@ "rgblight": true }, "qmk": { + "tap_keycode_delay": 10, "locking": { "enabled": true, "resync": true @@ -29,8 +30,6 @@ }, "diode_direction": "COL2ROW", "rgblight": { - "saturation_steps": 8, - "brightness_steps": 8, "led_count": 7, "sleep": true, "animations": { diff --git a/keyboards/draytronics/elise/readme.md b/keyboards/draytronics/elise/readme.md index 278bc106564..23e05d6579d 100644 --- a/keyboards/draytronics/elise/readme.md +++ b/keyboards/draytronics/elise/readme.md @@ -15,7 +15,7 @@ Entering DFU mode (to allow flashing): - Pressing the reset button on the back of the board when it is plugged in will enter DFU. - Holding down the ESC key whilst plugging in the keyboard will enter DFU. - 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:default @@ -24,8 +24,7 @@ Flashing example for this keyboard: make draytronics/elise: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/04/Draytronics-Elise-PCB-V1-top.png) From 51f6b4be9335d9b228a338ec33be5cdfdb0f31cd Mon Sep 17 00:00:00 2001 From: Blake Date: Fri, 14 Jun 2024 23:19:27 +0100 Subject: [PATCH 2/6] Update config.h Lint fix for copyright header. --- keyboards/draytronics/elise/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h index 9553b3816da..58b3d69ebad 100644 --- a/keyboards/draytronics/elise/config.h +++ b/keyboards/draytronics/elise/config.h @@ -1,4 +1,3 @@ - /*Copyright 2021 Blake Drayson / Draytronics Contact info@draytronics.co.uk This program is free software: you can redistribute it and/or modify From 22c76248cdfa06e761918405bb96987f4bea5243 Mon Sep 17 00:00:00 2001 From: Blake Drayson Date: Sat, 15 Jun 2024 10:44:09 +0100 Subject: [PATCH 3/6] Moved key repeat sleep fix to user space. --- keyboards/draytronics/elise/keymaps/blake_iso/keymap.c | 6 ++++++ keyboards/draytronics/elise/keymaps/default/keymap.c | 6 ++++++ keyboards/draytronics/elise/keymaps/default_iso/keymap.c | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/keyboards/draytronics/elise/keymaps/blake_iso/keymap.c b/keyboards/draytronics/elise/keymaps/blake_iso/keymap.c index c8a0ecd9598..adca91d842e 100644 --- a/keyboards/draytronics/elise/keymaps/blake_iso/keymap.c +++ b/keyboards/draytronics/elise/keymaps/blake_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, diff --git a/keyboards/draytronics/elise/keymaps/default/keymap.c b/keyboards/draytronics/elise/keymaps/default/keymap.c index ecafbf13c95..4637e339694 100644 --- a/keyboards/draytronics/elise/keymaps/default/keymap.c +++ b/keyboards/draytronics/elise/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/keymaps/default_iso/keymap.c b/keyboards/draytronics/elise/keymaps/default_iso/keymap.c index 02f4b9c1cc8..1aab7e16526 100644 --- a/keyboards/draytronics/elise/keymaps/default_iso/keymap.c +++ b/keyboards/draytronics/elise/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 ff7f4cc57649430e8aa325c5b8079478e92d5e5d Mon Sep 17 00:00:00 2001 From: Blake Drayson Date: Sat, 15 Jun 2024 10:47:35 +0100 Subject: [PATCH 4/6] Remove global config file, changed moved to user space. --- keyboards/draytronics/elise/config.h | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 keyboards/draytronics/elise/config.h diff --git a/keyboards/draytronics/elise/config.h b/keyboards/draytronics/elise/config.h deleted file mode 100644 index 58b3d69ebad..00000000000 --- a/keyboards/draytronics/elise/config.h +++ /dev/null @@ -1,19 +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 From 75fb148bb01cd512449cb8ed427b8d31913adf57 Mon Sep 17 00:00:00 2001 From: Blake Drayson Date: Tue, 18 Jun 2024 09:02:57 +0100 Subject: [PATCH 5/6] Move USB fix from keymap.c to keymap level config.h --- .../elise/keymaps/blake_iso/config.h | 24 +++++++++++++++++++ .../elise/keymaps/blake_iso/keymap.c | 6 ----- .../elise/keymaps/default/config.h | 24 +++++++++++++++++++ .../elise/keymaps/default/keymap.c | 6 ----- .../elise/keymaps/default_iso/config.h | 24 +++++++++++++++++++ .../elise/keymaps/default_iso/keymap.c | 6 ----- 6 files changed, 72 insertions(+), 18 deletions(-) create mode 100644 keyboards/draytronics/elise/keymaps/blake_iso/config.h create mode 100644 keyboards/draytronics/elise/keymaps/default/config.h create mode 100644 keyboards/draytronics/elise/keymaps/default_iso/config.h diff --git a/keyboards/draytronics/elise/keymaps/blake_iso/config.h b/keyboards/draytronics/elise/keymaps/blake_iso/config.h new file mode 100644 index 00000000000..a30e57780a2 --- /dev/null +++ b/keyboards/draytronics/elise/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/keymaps/blake_iso/keymap.c b/keyboards/draytronics/elise/keymaps/blake_iso/keymap.c index adca91d842e..c8a0ecd9598 100644 --- a/keyboards/draytronics/elise/keymaps/blake_iso/keymap.c +++ b/keyboards/draytronics/elise/keymaps/blake_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, diff --git a/keyboards/draytronics/elise/keymaps/default/config.h b/keyboards/draytronics/elise/keymaps/default/config.h new file mode 100644 index 00000000000..a30e57780a2 --- /dev/null +++ b/keyboards/draytronics/elise/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/keymaps/default/keymap.c b/keyboards/draytronics/elise/keymaps/default/keymap.c index 4637e339694..ecafbf13c95 100644 --- a/keyboards/draytronics/elise/keymaps/default/keymap.c +++ b/keyboards/draytronics/elise/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/keymaps/default_iso/config.h b/keyboards/draytronics/elise/keymaps/default_iso/config.h new file mode 100644 index 00000000000..a30e57780a2 --- /dev/null +++ b/keyboards/draytronics/elise/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/keymaps/default_iso/keymap.c b/keyboards/draytronics/elise/keymaps/default_iso/keymap.c index 1aab7e16526..02f4b9c1cc8 100644 --- a/keyboards/draytronics/elise/keymaps/default_iso/keymap.c +++ b/keyboards/draytronics/elise/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 c0933bc732d1cdbc0fd2e1b3e9931b7cac4238f6 Mon Sep 17 00:00:00 2001 From: Blake Date: Tue, 15 Oct 2024 13:46:36 +0100 Subject: [PATCH 6/6] Update keyboards/draytronics/elise/readme.md Co-authored-by: Ryan --- keyboards/draytronics/elise/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/draytronics/elise/readme.md b/keyboards/draytronics/elise/readme.md index 23e05d6579d..37abf40d32a 100644 --- a/keyboards/draytronics/elise/readme.md +++ b/keyboards/draytronics/elise/readme.md @@ -24,7 +24,7 @@ Flashing example for this keyboard: make draytronics/elise: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/04/Draytronics-Elise-PCB-V1-top.png)