diff options
author | Purdea Andrei <andrei@purdea.ro> | 2021-10-03 22:02:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-03 12:02:05 -0700 |
commit | eb5b24f97c8ab5f9ca85a5bbb60b3b806e1507e6 (patch) | |
tree | 5a432a1b87747eef45a5a35f5827e7cc5ae1a1c2 | |
parent | 5ce2bb83ce6fd2448be4880e44068217c4e5b2de (diff) | |
download | qmk_firmware-eb5b24f97c8ab5f9ca85a5bbb60b3b806e1507e6.tar.gz qmk_firmware-eb5b24f97c8ab5f9ca85a5bbb60b3b806e1507e6.zip |
Add LM() keys to the list of keys disabled by NO_HAPTIC_MOD (#14181)
-rw-r--r-- | docs/feature_haptic_feedback.md | 1 | ||||
-rw-r--r-- | quantum/process_keycode/process_haptic.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/feature_haptic_feedback.md b/docs/feature_haptic_feedback.md index 1f36f5b05..a12bb4bcd 100644 --- a/docs/feature_haptic_feedback.md +++ b/docs/feature_haptic_feedback.md | |||
@@ -172,6 +172,7 @@ With the entry of `#define NO_HAPTIC_MOD` in config.h, the following keys will n | |||
172 | 172 | ||
173 | * Usual modifier keys such as Control/Shift/Alt/Gui (For example `KC_LCTRL`) | 173 | * Usual modifier keys such as Control/Shift/Alt/Gui (For example `KC_LCTRL`) |
174 | * `MO()` momentary keys. See also [Layers](feature_layers.md). | 174 | * `MO()` momentary keys. See also [Layers](feature_layers.md). |
175 | * `LM()` momentary keys with mod active. | ||
175 | * `LT()` layer tap keys, when held to activate a layer. However when tapped, and the key is quickly released, and sends a keycode, haptic feedback is still triggered. | 176 | * `LT()` layer tap keys, when held to activate a layer. However when tapped, and the key is quickly released, and sends a keycode, haptic feedback is still triggered. |
176 | * `TT()` layer tap toggle keys, when held to activate a layer. However when tapped `TAPPING_TOGGLE` times to permanently toggle the layer, on the last tap haptic feedback is still triggered. | 177 | * `TT()` layer tap toggle keys, when held to activate a layer. However when tapped `TAPPING_TOGGLE` times to permanently toggle the layer, on the last tap haptic feedback is still triggered. |
177 | * `MT()` mod tap keys, when held to keep a usual modifier key pressed. However when tapped, and the key is quickly released, and sends a keycode, haptic feedback is still triggered. See also [Mod-Tap](mod_tap.md). | 178 | * `MT()` mod tap keys, when held to keep a usual modifier key pressed. However when tapped, and the key is quickly released, and sends a keycode, haptic feedback is still triggered. See also [Mod-Tap](mod_tap.md). |
diff --git a/quantum/process_keycode/process_haptic.c b/quantum/process_keycode/process_haptic.c index 64d455d00..1b9c2f24f 100644 --- a/quantum/process_keycode/process_haptic.c +++ b/quantum/process_keycode/process_haptic.c | |||
@@ -32,6 +32,7 @@ __attribute__((weak)) bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t | |||
32 | break; | 32 | break; |
33 | case KC_LCTRL ... KC_RGUI: | 33 | case KC_LCTRL ... KC_RGUI: |
34 | case QK_MOMENTARY ... QK_MOMENTARY_MAX: | 34 | case QK_MOMENTARY ... QK_MOMENTARY_MAX: |
35 | case QK_LAYER_MOD ... QK_LAYER_MOD_MAX: | ||
35 | #endif | 36 | #endif |
36 | #ifdef NO_HAPTIC_FN | 37 | #ifdef NO_HAPTIC_FN |
37 | case KC_FN0 ... KC_FN31: | 38 | case KC_FN0 ... KC_FN31: |