summary refs log tree commit diff
path: root/quantum/encoder.c
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2022-08-29 14:53:08 +1000
committerGitHub <noreply@github.com>2022-08-28 21:53:08 -0700
commitd910e8df77150bab0b9cc2c3794554b4c8c81d71 (patch)
treef1aba103818da93378f0f30b8dde5526fb29d443 /quantum/encoder.c
parent7ef6c179e44632840dac7c8c6896becdf60b9e48 (diff)
Use `TAP_CODE_DELAY` for encoder mapping by default (#18098)
Diffstat (limited to 'quantum/encoder.c')
-rw-r--r--quantum/encoder.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/quantum/encoder.c b/quantum/encoder.c
index 5f8a7ce080..1393e34868 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -24,7 +24,8 @@
 #include <string.h>
 
 #ifndef ENCODER_MAP_KEY_DELAY
-#    define ENCODER_MAP_KEY_DELAY 2
+#    include "action.h"
+#    define ENCODER_MAP_KEY_DELAY TAP_CODE_DELAY
 #endif
 
 #if !defined(ENCODER_RESOLUTIONS) && !defined(ENCODER_RESOLUTION)
@@ -143,9 +144,14 @@ void encoder_init(void) {
 static void encoder_exec_mapping(uint8_t index, bool clockwise) {
     // The delays below cater for Windows and its wonderful requirements.
     action_exec(clockwise ? ENCODER_CW_EVENT(index, true) : ENCODER_CCW_EVENT(index, true));
+#    if ENCODER_MAP_KEY_DELAY > 0
     wait_ms(ENCODER_MAP_KEY_DELAY);
+#    endif // ENCODER_MAP_KEY_DELAY > 0
+
     action_exec(clockwise ? ENCODER_CW_EVENT(index, false) : ENCODER_CCW_EVENT(index, false));
+#    if ENCODER_MAP_KEY_DELAY > 0
     wait_ms(ENCODER_MAP_KEY_DELAY);
+#    endif // ENCODER_MAP_KEY_DELAY > 0
 }
 #endif // ENCODER_MAP_ENABLE