jepler/circuitpython
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add quarter-click logic to adafruit/circuitpython#1045

Browse source
This commit is contained in:
Nick Moore 2019-02-05 16:40:39 +11:00
parent 95454ecde0
commit a7c349bc6e
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ports/nrf/common-hal/rotaryio/IncrementalEncoder.c
View file

@ -43,11 +43,21 @@ static void _intr_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) {
new_state = (new_state << 1) + (new_state ^ nrf_gpio_pin_read(self->pin_b)); new_state = (new_state << 1) + (new_state ^ nrf_gpio_pin_read(self->pin_b));
uint8_t change = (new_state - self->state) & 0x03; uint8_t change = (new_state - self->state) & 0x03;
if (change == 1) self->position++; if (change == 1) self->quarter++;
else if (change == 3) self->position--; else if (change == 3) self->quarter--;
// ignore other state transitions // ignore other state transitions
self->state = new_state; self->state = new_state;
// logic from the atmel-samd port: provides some damping and scales movement
// down by 4:1.
if (self->quarter >= 4) {
self->position++;
self->quarter = 0;
} else if (self->quarter <= -4) {
self->position--;
self->quarter = 0;
}
} }
void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t* self, void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t* self,

1
ports/nrf/common-hal/rotaryio/IncrementalEncoder.h
View file

@ -36,6 +36,7 @@ typedef struct {
uint8_t pin_a; uint8_t pin_a;
uint8_t pin_b; uint8_t pin_b;
uint8_t state; uint8_t state;
int8_t quarter;
mp_int_t position; mp_int_t position;
} rotaryio_incrementalencoder_obj_t; } rotaryio_incrementalencoder_obj_t;