Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
2b61cc739f
|
@ -92,6 +92,13 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
|
|||
}
|
||||
|
||||
void process_wheel(void) {
|
||||
uint16_t p1 = adc_read(OPT_ENC1_MUX);
|
||||
uint16_t p2 = adc_read(OPT_ENC2_MUX);
|
||||
|
||||
if (debug_encoder) dprintf("OPT1: %d, OPT2: %d\n", p1, p2);
|
||||
|
||||
int8_t dir = opt_encoder_handler(p1, p2);
|
||||
|
||||
// If the mouse wheel was just released, do not scroll.
|
||||
if (timer_elapsed(lastMidClick) < SCROLL_BUTT_DEBOUNCE) return;
|
||||
|
||||
|
@ -105,16 +112,10 @@ void process_wheel(void) {
|
|||
#endif
|
||||
}
|
||||
|
||||
lastScroll = timer_read();
|
||||
uint16_t p1 = adc_read(OPT_ENC1_MUX);
|
||||
uint16_t p2 = adc_read(OPT_ENC2_MUX);
|
||||
|
||||
if (debug_encoder) dprintf("OPT1: %d, OPT2: %d\n", p1, p2);
|
||||
|
||||
int8_t dir = opt_encoder_handler(p1, p2);
|
||||
|
||||
if (dir == 0) return;
|
||||
encoder_update_kb(0, dir > 0);
|
||||
|
||||
lastScroll = timer_read();
|
||||
}
|
||||
|
||||
void pointing_device_init_kb(void) {
|
||||
|
|
Loading…
Reference in a new issue