marco/qmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2022-12-30 00:45:52 +00:00
commit 2b61cc739f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
keyboards/ploopyco/trackball_mini/trackball_mini.c
View File

@ -92,6 +92,13 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
} }
void process_wheel(void) { 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 the mouse wheel was just released, do not scroll.
if (timer_elapsed(lastMidClick) < SCROLL_BUTT_DEBOUNCE) return; if (timer_elapsed(lastMidClick) < SCROLL_BUTT_DEBOUNCE) return;
@ -105,16 +112,10 @@ void process_wheel(void) {
#endif #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; if (dir == 0) return;
encoder_update_kb(0, dir > 0); encoder_update_kb(0, dir > 0);
lastScroll = timer_read();
} }
void pointing_device_init_kb(void) { void pointing_device_init_kb(void) {