diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-25 01:33:46 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-25 01:33:46 +0000 |
| commit | c823160d94733bf156d766c02a27be4b60f921a7 (patch) | |
| tree | 77a010dfec77f5df520082454f62c2d3a3fc7635 | |
| parent | d6b18ebfe7b5a23964b845b924296081cbb61c8b (diff) | |
| parent | 97a73637e0c04091b793c0e555d1a36e8be24091 (diff) | |
| download | qmk_firmware-c823160d94733bf156d766c02a27be4b60f921a7.tar.gz qmk_firmware-c823160d94733bf156d766c02a27be4b60f921a7.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/ploopyco/mouse/mouse.c | 2 | ||||
| -rw-r--r-- | keyboards/ploopyco/trackball/trackball.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/ploopyco/mouse/mouse.c b/keyboards/ploopyco/mouse/mouse.c index 1a1e5648b..1eb5e3ead 100644 --- a/keyboards/ploopyco/mouse/mouse.c +++ b/keyboards/ploopyco/mouse/mouse.c | |||
| @@ -96,7 +96,7 @@ __attribute__((weak)) void process_wheel(report_mouse_t* mouse_report) { | |||
| 96 | uint16_t p2 = adc_read(OPT_ENC2_MUX); | 96 | uint16_t p2 = adc_read(OPT_ENC2_MUX); |
| 97 | if (debug_encoder) dprintf("OPT1: %d, OPT2: %d\n", p1, p2); | 97 | if (debug_encoder) dprintf("OPT1: %d, OPT2: %d\n", p1, p2); |
| 98 | 98 | ||
| 99 | uint8_t dir = opt_encoder_handler(p1, p2); | 99 | int dir = opt_encoder_handler(p1, p2); |
| 100 | 100 | ||
| 101 | if (dir == 0) return; | 101 | if (dir == 0) return; |
| 102 | process_wheel_user(mouse_report, mouse_report->h, (int)(mouse_report->v + (dir * OPT_SCALE))); | 102 | process_wheel_user(mouse_report, mouse_report->h, (int)(mouse_report->v + (dir * OPT_SCALE))); |
diff --git a/keyboards/ploopyco/trackball/trackball.c b/keyboards/ploopyco/trackball/trackball.c index c5effd005..b9c29b54e 100644 --- a/keyboards/ploopyco/trackball/trackball.c +++ b/keyboards/ploopyco/trackball/trackball.c | |||
| @@ -96,7 +96,7 @@ __attribute__((weak)) void process_wheel(report_mouse_t* mouse_report) { | |||
| 96 | uint16_t p2 = adc_read(OPT_ENC2_MUX); | 96 | uint16_t p2 = adc_read(OPT_ENC2_MUX); |
| 97 | if (debug_encoder) dprintf("OPT1: %d, OPT2: %d\n", p1, p2); | 97 | if (debug_encoder) dprintf("OPT1: %d, OPT2: %d\n", p1, p2); |
| 98 | 98 | ||
| 99 | uint8_t dir = opt_encoder_handler(p1, p2); | 99 | int dir = opt_encoder_handler(p1, p2); |
| 100 | 100 | ||
| 101 | if (dir == 0) return; | 101 | if (dir == 0) return; |
| 102 | process_wheel_user(mouse_report, mouse_report->h, (int)(mouse_report->v + (dir * OPT_SCALE))); | 102 | process_wheel_user(mouse_report, mouse_report->h, (int)(mouse_report->v + (dir * OPT_SCALE))); |