Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-06-29 03:31:16 +00:00
commit be2c95ad76

View file

@ -51,7 +51,7 @@ void matrix_scan_user(void) {
} }
} }
void encoder_update_user(uint8_t index, bool clockwise) { bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) { if (clockwise) {
encoder_cw.pressed = true; encoder_cw.pressed = true;
encoder_cw.time = (timer_read() | 1); encoder_cw.time = (timer_read() | 1);
@ -61,4 +61,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
encoder_ccw.time = (timer_read() | 1); encoder_ccw.time = (timer_read() | 1);
action_exec(encoder_ccw); action_exec(encoder_ccw);
} }
return true;
} }