1 files changed, 16 insertions, 14 deletions

diff --git a/quantum/process_keycode/process_haptic.c b/quantum/process_keycode/process_haptic.c
index 64d455d00..85b2ffcdd 100644
--- a/quantum/process_keycode/process_haptic.c
+++ b/quantum/process_keycode/process_haptic.c
@@ -17,6 +17,7 @@
 #include "process_haptic.h"
 #include "quantum_keycodes.h"
 #include "action_tapping.h"
+#include "usb_device_state.h"
 
 __attribute__((weak)) bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
@@ -30,8 +31,9 @@ __attribute__((weak)) bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t
         case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
             if (record->tap.count == 0) return false;
             break;
-        case KC_LCTRL ... KC_RGUI:
+        case KC_LEFT_CTRL ... KC_RIGHT_GUI:
         case QK_MOMENTARY ... QK_MOMENTARY_MAX:
+        case QK_LAYER_MOD ... QK_LAYER_MOD_MAX:
 #endif
 #ifdef NO_HAPTIC_FN
         case KC_FN0 ... KC_FN31:
@@ -42,34 +44,34 @@ __attribute__((weak)) bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t
 #ifdef NO_HAPTIC_PUNCTUATION
         case KC_ENTER:
         case KC_ESCAPE:
-        case KC_BSPACE:
+        case KC_BACKSPACE:
         case KC_SPACE:
         case KC_MINUS:
         case KC_EQUAL:
-        case KC_LBRACKET:
-        case KC_RBRACKET:
-        case KC_BSLASH:
+        case KC_LEFT_BRACKET:
+        case KC_RIGHT_BRACKET:
+        case KC_BACKSLASH:
         case KC_NONUS_HASH:
-        case KC_SCOLON:
+        case KC_SEMICOLON:
         case KC_QUOTE:
         case KC_GRAVE:
         case KC_COMMA:
         case KC_SLASH:
         case KC_DOT:
-        case KC_NONUS_BSLASH:
+        case KC_NONUS_BACKSLASH:
 #endif
 #ifdef NO_HAPTIC_LOCKKEYS
-        case KC_CAPSLOCK:
-        case KC_SCROLLLOCK:
-        case KC_NUMLOCK:
+        case KC_CAPS_LOCK:
+        case KC_SCROLL_LOCK:
+        case KC_NUM_LOCK:
 #endif
 #ifdef NO_HAPTIC_NAV
-        case KC_PSCREEN:
+        case KC_PRINT_SCREEN:
         case KC_PAUSE:
         case KC_INSERT:
         case KC_DELETE:
-        case KC_PGDOWN:
-        case KC_PGUP:
+        case KC_PAGE_DOWN:
+        case KC_PAGE_UP:
         case KC_LEFT:
         case KC_UP:
         case KC_RIGHT:
@@ -130,7 +132,7 @@ bool process_haptic(uint16_t keycode, keyrecord_t *record) {
         }
     }
 
-    if (haptic_get_enable()) {
+    if (haptic_get_enable() && ((!HAPTIC_OFF_IN_LOW_POWER) || (usb_device_state == USB_DEVICE_STATE_CONFIGURED))) {
         if (record->event.pressed) {
             // keypress
             if (haptic_get_feedback() < 2 && get_haptic_enabled_key(keycode, record)) {