GMMK Pro: fix unintended volume encoder taps (#17129)

keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c

@@ -62,5 +62,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     } else {
       tap_code(KC_VOLD);
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }

keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h

@@ -1,4 +1,4 @@
-/* Copyright 2021 Andre Brait
+/* Copyright 2022 Andre Brait
  *
  * 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

keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c

@@ -102,17 +102,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return true;
-}
-#endif // ENCODER_ENABLE
-
 #ifdef RGB_MATRIX_ENABLE
 
 #define RGB_CONFIRMATION_BLINKING_TIME 2000 // 2 seconds

keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/readme.md

@@ -8,8 +8,6 @@ The differences are as follows:
 - Dedicated MacOS and Windows/Linux layers
   - Switching between them by pressing Fn + CAPS LOCK
 - Disabled Mouse Keys (to fix issues with KVM switches and also because they're not used here anyway)
-- Short DEBOUNCE time (5 ms)
-- Per-key debounce algorithm (sym_defer_pk)
 - RGB turns off after 20 minutes of inactivity
 - RGB turns off when USB is suspended
 - Layer 0:

keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk

@@ -1,6 +1,4 @@
 # Enable additional features.
 
-DEBOUNCE_TYPE = sym_defer_pk
-
 # Disabling MouseKey because it breaks my KVM switch
 MOUSEKEY_ENABLE = no

keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c

@@ -74,7 +74,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             tap_code16(KC_VOLD);
         }
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
 #endif  // ENCODER_ENABLE
 

keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c

@@ -68,7 +68,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         } else {
             tap_code(KC_VOLD);
         }
-        return true;
+        //return true; //set to return false to counteract enabled encoder in pro.c
+        return false;
     }
 #endif // ENCODER_ENABLE
 

keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c

@@ -107,5 +107,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
   else {
     tap_code(KC_VOLD);
   }
-  return true;
+  //return true; //set to return false to counteract enabled encoder in pro.c
+  return false;
 }

keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c

@@ -59,14 +59,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 // clang-format on
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif // ENCODER_ENABLE

keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c

@@ -52,7 +52,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     } else {
         tap_code(KC_VOLD);
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
 
 void rgb_matrix_indicators_user(void) {

keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c

@@ -83,7 +83,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     } else {
       tap_code(KC_VOLD);
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
 #endif // ENCODER_ENABLE
 

keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c

@@ -62,5 +62,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
   else {
     tap_code(KC_VOLD);
   }
-  return true;
+  //return true; //set to return false to counteract enabled encoder in pro.c
+  return false;
 }

keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c

@@ -112,7 +112,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 break;
             }
         }
-        return true;
+        //return true; //set to return false to counteract enabled encoder in pro.c
+        return false;
     }
 #endif // ENCODER_ENABLE && !ENCODER_DEFAULTACTIONS_ENABLE
 

keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c

@@ -144,7 +144,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     } else {
       tap_code(KC_VOLD);
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
   }
 #endif //ENCODER_ENABLE
 

keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c

@@ -173,7 +173,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             }
         }
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
 
 

keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c

@@ -49,7 +49,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         (*encoder_mapping[state][1])();
     }
 
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
 
 void handle_rgb_key(bool pressed) {

keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c

@@ -138,7 +138,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 			}
 			break;
 		}
-        return true;
+        //return true; //set to return false to counteract enabled encoder in pro.c
+        return false;
     }
 #endif
 

keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c

@@ -96,7 +96,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
   } else {
     tap_code(KC_VOLD);
   }
-  return true;
+  //return true; //set to return false to counteract enabled encoder in pro.c
+  return false;
 }
 #endif //ENCODER_ENABLE
 

keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c

@@ -76,14 +76,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 // clang-format on
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif // ENCODER_ENABLE

keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c

@@ -53,5 +53,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     } else {
       tap_code(KC_MS_WH_LEFT);
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }

keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c

@@ -69,5 +69,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     } else {
         tap_code(KC_VOLD);
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }

keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c

@@ -59,14 +59,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 // clang-format on
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    } else {
-      tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif

keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c

@@ -102,7 +102,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 break;
             }
         }
-        return true;
+        //return true; //set to return false to counteract enabled encoder in pro.c
+        return false;
     }
 #endif // ENCODER_ENABLE && !ENCODER_DEFAULTACTIONS_ENABLE
 

keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c

@@ -78,14 +78,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 // clang-format on
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        tap_code(KC_VOLU);
-    } else {
-        tap_code(KC_VOLD);
-    }
-    return false;
-}
-#endif // ENCODER_ENABLE

keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c

@@ -84,7 +84,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             }
             break;
     }
-    return true;
+    //return true; //set to return false to counteract enabled encoder in pro.c
+    return false;
 }
 #endif // ENCODER_ENABLE