Skip to content

Commit 3a7a231

Browse files
committed
GMMK Pro: fix unintended volume encoder taps
Fixes some user layouts that were affected by e335d62 (#16721
1 parent 56bad5d commit 3a7a231

File tree

25 files changed

+85
-127
lines changed

25 files changed

+85
-127
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
6262
} else {
6363
tap_code(KC_VOLD);
6464
}
65-
return true;
65+
//return true; //set to return false to counteract enabled encoder in pro.c
66+
return false;
6667
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2021 Andre Brait
1+
/* Copyright 2022 Andre Brait
22
*
33
* This program is free software: you can redistribute it and/or modify
44
* it under the terms of the GNU General Public License as published by

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
102102
};
103103
// clang-format on
104104

105-
#ifdef ENCODER_ENABLE
106-
bool encoder_update_user(uint8_t index, bool clockwise) {
107-
if (clockwise) {
108-
tap_code(KC_VOLU);
109-
} else {
110-
tap_code(KC_VOLD);
111-
}
112-
return true;
113-
}
114-
#endif // ENCODER_ENABLE
115-
116105
#ifdef RGB_MATRIX_ENABLE
117106

118107
#define RGB_CONFIRMATION_BLINKING_TIME 2000 // 2 seconds

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ The differences are as follows:
88
- Dedicated MacOS and Windows/Linux layers
99
- Switching between them by pressing Fn + CAPS LOCK
1010
- Disabled Mouse Keys (to fix issues with KVM switches and also because they're not used here anyway)
11-
- Short DEBOUNCE time (5 ms)
12-
- Per-key debounce algorithm (sym_defer_pk)
1311
- RGB turns off after 20 minutes of inactivity
1412
- RGB turns off when USB is suspended
1513
- Layer 0:
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# Enable additional features.
22

3-
DEBOUNCE_TYPE = sym_defer_pk
4-
53
# Disabling MouseKey because it breaks my KVM switch
64
MOUSEKEY_ENABLE = no

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
7474
tap_code16(KC_VOLD);
7575
}
7676
}
77-
return true;
77+
//return true; //set to return false to counteract enabled encoder in pro.c
78+
return false;
7879
}
7980
#endif // ENCODER_ENABLE
8081

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
6868
} else {
6969
tap_code(KC_VOLD);
7070
}
71-
return true;
71+
//return true; //set to return false to counteract enabled encoder in pro.c
72+
return false;
7273
}
7374
#endif // ENCODER_ENABLE
7475

@@ -77,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7778
//void set_layer_rgb(uint8_t led_min, uint8_t led_max, int layer) {
7879
// const ledmap *l = &(ledmaps[layer]);
7980
//
80-
//
81+
//
8182
//
8283
// for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
8384
// HSV hsv = {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
107107
else {
108108
tap_code(KC_VOLD);
109109
}
110-
return true;
110+
//return true; //set to return false to counteract enabled encoder in pro.c
111+
return false;
111112
}

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5959

6060
};
6161
// clang-format on
62-
63-
#ifdef ENCODER_ENABLE
64-
bool encoder_update_user(uint8_t index, bool clockwise) {
65-
if (clockwise) {
66-
tap_code(KC_VOLU);
67-
} else {
68-
tap_code(KC_VOLD);
69-
}
70-
return false;
71-
}
72-
#endif // ENCODER_ENABLE

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
5252
} else {
5353
tap_code(KC_VOLD);
5454
}
55-
return true;
55+
//return true; //set to return false to counteract enabled encoder in pro.c
56+
return false;
5657
}
5758

5859
void rgb_matrix_indicators_user(void) {

0 commit comments

Comments
 (0)