~ruther/qmk_firmware

2b61cc739fa3ec24391752335c92703862726544 — QMK Bot 2 years ago 69a9577 + 444760e
Merge remote-tracking branch 'origin/master' into develop
1 files changed, 9 insertions(+), 8 deletions(-)

M keyboards/ploopyco/trackball_mini/trackball_mini.c
M keyboards/ploopyco/trackball_mini/trackball_mini.c => keyboards/ploopyco/trackball_mini/trackball_mini.c +9 -8
@@ 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) {