aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorRamon Imbao <ramonimbao@gmail.com>2021-12-09 01:38:47 +0800
committerGitHub <noreply@github.com>2021-12-08 09:38:47 -0800
commitc09837e092ff3c8e74dde8567ef9eb3e7a343805 (patch)
treebef84436c8451a61595fd98931a2b121d5af595a /keyboards
parentcf9239a88277b0fbdd6de184374c6c84c39d8d8f (diff)
downloadqmk_firmware-c09837e092ff3c8e74dde8567ef9eb3e7a343805.tar.gz
qmk_firmware-c09837e092ff3c8e74dde8567ef9eb3e7a343805.zip
[Keyboard] Flip encoder and fix weird volume behavior for Herringbone Pro (#15423)
Co-authored-by: Joel Challis <git@zvecr.com>
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/ramonimbao/herringbone/pro/config.h4
-rw-r--r--keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/keyboards/ramonimbao/herringbone/pro/config.h b/keyboards/ramonimbao/herringbone/pro/config.h
index 20f92282b..4aab52fcb 100644
--- a/keyboards/ramonimbao/herringbone/pro/config.h
+++ b/keyboards/ramonimbao/herringbone/pro/config.h
@@ -48,8 +48,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
48#define DIODE_DIRECTION COL2ROW 48#define DIODE_DIRECTION COL2ROW
49 49
50/* Encoder pin assignment */ 50/* Encoder pin assignment */
51#define ENCODERS_PAD_A { C2 } 51#define ENCODERS_PAD_A { C3 }
52#define ENCODERS_PAD_B { C3 } 52#define ENCODERS_PAD_B { C2 }
53 53
54/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 54/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
55#define DEBOUNCE 5 55#define DEBOUNCE 5
diff --git a/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c b/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c
index fceca1a8b..8acc01767 100644
--- a/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c
+++ b/keyboards/ramonimbao/herringbone/pro/keymaps/via/keymap.c
@@ -88,12 +88,14 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
88 encoder_cw.pressed = true; 88 encoder_cw.pressed = true;
89 encoder_cw.time = (timer_read() | 1); 89 encoder_cw.time = (timer_read() | 1);
90 action_exec(encoder_cw); 90 action_exec(encoder_cw);
91 wait_ms(20);
91 anim_sleep = timer_read32(); 92 anim_sleep = timer_read32();
92 oled_on(); 93 oled_on();
93 } else { 94 } else {
94 encoder_ccw.pressed = true; 95 encoder_ccw.pressed = true;
95 encoder_ccw.time = (timer_read() | 1); 96 encoder_ccw.time = (timer_read() | 1);
96 action_exec(encoder_ccw); 97 action_exec(encoder_ccw);
98 wait_ms(20);
97 anim_sleep = timer_read32(); 99 anim_sleep = timer_read32();
98 oled_on(); 100 oled_on();
99 } 101 }