Pass the divisor to common_hal_rotaryio_incrementalencoder_construct

Author: domdfcoding

ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c

@@ -35,8 +35,11 @@
 #include "py/runtime.h"
 #include "supervisor/shared/translate.h"
 
-void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t *self,
-    const mcu_pin_obj_t *pin_a, const mcu_pin_obj_t *pin_b) {
+void common_hal_rotaryio_incrementalencoder_construct(
+    rotaryio_incrementalencoder_obj_t *self,
+    const mcu_pin_obj_t *pin_a,
+    const mcu_pin_obj_t *pin_b,
+    const mp_int_t divisor) {
     if (!pin_a->has_extint || !pin_b->has_extint) {
         mp_raise_RuntimeError(translate("Both pins must support hardware interrupts"));
     }
@@ -57,6 +60,7 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode
     self->eic_channel_b = pin_b->extint_channel;
     self->pin_a = pin_a->number;
     self->pin_b = pin_b->number;
+    self->divisor = divisor;
 
     gpio_set_pin_function(self->pin_a, GPIO_PIN_FUNCTION_A);
     gpio_set_pin_pull_mode(self->pin_a, GPIO_PULL_UP);

ports/espressif/common-hal/rotaryio/IncrementalEncoder.c

@@ -30,8 +30,11 @@
 
 #include "py/runtime.h"
 
-void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t *self,
-    const mcu_pin_obj_t *pin_a, const mcu_pin_obj_t *pin_b) {
+void common_hal_rotaryio_incrementalencoder_construct(
+    rotaryio_incrementalencoder_obj_t *self,
+    const mcu_pin_obj_t *pin_a,
+    const mcu_pin_obj_t *pin_b,
+    const mp_int_t divisor) {
     claim_pin(pin_a);
     claim_pin(pin_b);
 
@@ -57,7 +60,7 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode
 
     pcnt_unit_config(&pcnt_config);
 
-    if ((self->divisor == 2) || (self->divisor == 1)) {
+    if ((divisor == 2) || (divisor == 1)) {
         // Setup channel 1 for divisor=2 or divisor=1
         pcnt_config.pulse_gpio_num = pin_b->number;     // What was control is now signal
         pcnt_config.ctrl_gpio_num = pin_a->number;      // What was signal is now control
@@ -93,6 +96,7 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode
     self->pin_a = pin_a->number;
     self->pin_b = pin_b->number;
     self->unit = (pcnt_unit_t)unit;
+    self->divisor = divisor;
 }
 
 bool common_hal_rotaryio_incrementalencoder_deinited(rotaryio_incrementalencoder_obj_t *self) {

ports/nrf/common-hal/rotaryio/IncrementalEncoder.c

@@ -49,11 +49,15 @@ static void _intr_handler(nrfx_gpiote_pin_t pin, nrf_gpiote_polarity_t action) {
     shared_module_softencoder_state_update(self, new_state);
 }
 
-void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t *self,
-    const mcu_pin_obj_t *pin_a, const mcu_pin_obj_t *pin_b) {
+void common_hal_rotaryio_incrementalencoder_construct(
+    rotaryio_incrementalencoder_obj_t *self,
+    const mcu_pin_obj_t *pin_a,
+    const mcu_pin_obj_t *pin_b,
+    const mp_int_t divisor) {
 
     self->pin_a = pin_a->number;
     self->pin_b = pin_b->number;
+    self->divisor = divisor;
 
     _objs[self->pin_a] = self;
     _objs[self->pin_b] = self;

ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c

@@ -59,8 +59,11 @@ STATIC const uint16_t encoder_init[] = {
 
 STATIC void incrementalencoder_interrupt_handler(void *self_in);
 
-void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t *self,
-    const mcu_pin_obj_t *pin_a, const mcu_pin_obj_t *pin_b) {
+void common_hal_rotaryio_incrementalencoder_construct(
+    rotaryio_incrementalencoder_obj_t *self,
+    const mcu_pin_obj_t *pin_a,
+    const mcu_pin_obj_t *pin_b,
+    const mp_int_t divisor) {
     mp_obj_t pins[] = {MP_OBJ_FROM_PTR(pin_a), MP_OBJ_FROM_PTR(pin_b)};
     // Start out with swapped to match behavior with other ports.
     self->swapped = true;
@@ -75,6 +78,7 @@ void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencode
 
     self->position = 0;
     self->sub_count = 0;
+    self->divisor
 
     common_hal_rp2pio_statemachine_construct(&self->state_machine,
         encoder, MP_ARRAY_SIZE(encoder),

shared-bindings/rotaryio/IncrementalEncoder.c

@@ -77,8 +77,7 @@ STATIC mp_obj_t rotaryio_incrementalencoder_make_new(const mp_obj_type_t *type,
     rotaryio_incrementalencoder_obj_t *self = m_new_obj(rotaryio_incrementalencoder_obj_t);
     self->base.type = &rotaryio_incrementalencoder_type;
 
-    common_hal_rotaryio_incrementalencoder_set_divisor(self, args[ARG_divisor].u_int);
-    common_hal_rotaryio_incrementalencoder_construct(self, pin_a, pin_b);
+    common_hal_rotaryio_incrementalencoder_construct(self, pin_a, pin_b, args[ARG_divisor].u_int);
 
     return MP_OBJ_FROM_PTR(self);
 }

shared-bindings/rotaryio/IncrementalEncoder.h

@@ -32,8 +32,11 @@
 
 extern const mp_obj_type_t rotaryio_incrementalencoder_type;
 
-extern void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t *self,
-    const mcu_pin_obj_t *pin_a, const mcu_pin_obj_t *pin_b);
+extern void common_hal_rotaryio_incrementalencoder_construct(
+    rotaryio_incrementalencoder_obj_t *self,
+    const mcu_pin_obj_t *pin_a,
+    const mcu_pin_obj_t *pin_b,
+    const mp_int_t divisor);
 extern void common_hal_rotaryio_incrementalencoder_deinit(rotaryio_incrementalencoder_obj_t *self);
 extern bool common_hal_rotaryio_incrementalencoder_deinited(rotaryio_incrementalencoder_obj_t *self);
 extern mp_int_t common_hal_rotaryio_incrementalencoder_get_position(rotaryio_incrementalencoder_obj_t *self);