mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-06-21 20:57:09 -04:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
3be301c014
1 changed files with 2 additions and 0 deletions
|
@ -88,12 +88,14 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
|
||||||
encoder_cw.pressed = true;
|
encoder_cw.pressed = true;
|
||||||
encoder_cw.time = (timer_read() | 1);
|
encoder_cw.time = (timer_read() | 1);
|
||||||
action_exec(encoder_cw);
|
action_exec(encoder_cw);
|
||||||
|
wait_ms(20);
|
||||||
anim_sleep = timer_read32();
|
anim_sleep = timer_read32();
|
||||||
oled_on();
|
oled_on();
|
||||||
} else {
|
} else {
|
||||||
encoder_ccw.pressed = true;
|
encoder_ccw.pressed = true;
|
||||||
encoder_ccw.time = (timer_read() | 1);
|
encoder_ccw.time = (timer_read() | 1);
|
||||||
action_exec(encoder_ccw);
|
action_exec(encoder_ccw);
|
||||||
|
wait_ms(20);
|
||||||
anim_sleep = timer_read32();
|
anim_sleep = timer_read32();
|
||||||
oled_on();
|
oled_on();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue