diff --git a/libraries/breakout_encoder_wheel/breakout_encoder_wheel.cpp b/libraries/breakout_encoder_wheel/breakout_encoder_wheel.cpp index 44bef6f3..affda7e2 100644 --- a/libraries/breakout_encoder_wheel/breakout_encoder_wheel.cpp +++ b/libraries/breakout_encoder_wheel/breakout_encoder_wheel.cpp @@ -56,11 +56,12 @@ namespace pimoroni { } BreakoutEncoderWheel::Direction BreakoutEncoderWheel::get_encoder_direction() { - return direction; + //return direction; + return DEFAULT_DIRECTION; } void BreakoutEncoderWheel::set_encoder_direction(Direction direction) { - this->direction = direction; + //this->direction = direction; } void BreakoutEncoderWheel::set_pixel(uint8_t index, uint8_t r, uint8_t g, uint8_t b) { @@ -75,12 +76,13 @@ namespace pimoroni { } int16_t BreakoutEncoderWheel::read_wheel() { - int16_t count = ioe.read_rotary_encoder(ENC_CHANNEL); - if(direction != DIRECTION_CW) - count = 0 - count; + //int16_t count = ioe.read_rotary_encoder(ENC_CHANNEL); + //if(direction != DIRECTION_CW) + // count = 0 - count; ioe.clear_interrupt_flag(); - return count; + //return count; + return 0; } void BreakoutEncoderWheel::clear_wheel() { diff --git a/libraries/breakout_encoder_wheel/breakout_encoder_wheel.hpp b/libraries/breakout_encoder_wheel/breakout_encoder_wheel.hpp index ec17cb78..26c82054 100644 --- a/libraries/breakout_encoder_wheel/breakout_encoder_wheel.hpp +++ b/libraries/breakout_encoder_wheel/breakout_encoder_wheel.hpp @@ -83,7 +83,7 @@ namespace pimoroni { private: IOExpander ioe; IS31FL3731 led_ring; - Direction direction = DEFAULT_DIRECTION; + //Direction direction = DEFAULT_DIRECTION; uint interrupt_pin = PIN_UNUSED; // A local copy of the value passed to the IOExpander, used in initialisation diff --git a/micropython/modules/breakout_encoder_wheel/breakout_encoder_wheel.cpp b/micropython/modules/breakout_encoder_wheel/breakout_encoder_wheel.cpp index 89d67ed4..87a1153e 100644 --- a/micropython/modules/breakout_encoder_wheel/breakout_encoder_wheel.cpp +++ b/micropython/modules/breakout_encoder_wheel/breakout_encoder_wheel.cpp @@ -24,7 +24,7 @@ mp_obj_t BreakoutEncoderWheel_make_new(const mp_obj_type_t *type, size_t n_args, enum { ARG_i2c, ARG_address, ARG_interrupt }; static const mp_arg_t allowed_args[] = { { MP_QSTR_i2c, MP_ARG_OBJ, {.u_obj = nullptr} }, - { MP_QSTR_address, MP_ARG_INT, {.u_int = BreakoutEncoderWheel::DEFAULT_I2C_ADDRESS} }, + { MP_QSTR_address, MP_ARG_INT, {.u_int = BreakoutEncoderWheel::DEFAULT_IOE_I2C_ADDRESS} }, { MP_QSTR_interrupt, MP_ARG_INT, {.u_int = PIN_UNUSED} }, }; @@ -59,7 +59,7 @@ mp_obj_t BreakoutEncoderWheel_set_address(size_t n_args, const mp_obj_t *pos_arg breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); - self->breakout->set_address(args[ARG_address].u_int); + self->breakout->set_ioe_address(args[ARG_address].u_int); return mp_const_none; } @@ -77,8 +77,9 @@ mp_obj_t BreakoutEncoderWheel_clear_interrupt_flag(mp_obj_t self_in) { } mp_obj_t BreakoutEncoderWheel_get_direction(mp_obj_t self_in) { - breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); - return mp_obj_new_bool(self->breakout->get_direction()); + //breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); + //return mp_obj_new_bool(self->breakout->get_direction()); + return mp_const_none; } mp_obj_t BreakoutEncoderWheel_set_direction(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { @@ -91,9 +92,9 @@ mp_obj_t BreakoutEncoderWheel_set_direction(size_t n_args, const mp_obj_t *pos_a mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); + //breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); - self->breakout->set_direction(args[ARG_clockwise].u_bool ? BreakoutEncoderWheel::DIRECTION_CW : BreakoutEncoderWheel::DIRECTION_CCW); + //self->breakout->set_direction(args[ARG_clockwise].u_bool ? BreakoutEncoderWheel::DIRECTION_CW : BreakoutEncoderWheel::DIRECTION_CCW); return mp_const_none; } @@ -108,13 +109,13 @@ mp_obj_t BreakoutEncoderWheel_set_brightness(size_t n_args, const mp_obj_t *pos_ mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); + //breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); float brightness = mp_obj_get_float(args[ARG_brightness].u_obj); if(brightness < 0 || brightness > 1.0f) mp_raise_ValueError("brightness out of range. Expected 0.0 to 1.0"); - else - self->breakout->set_brightness(brightness); + //else + //self->breakout->set_brightness(brightness); return mp_const_none; } @@ -131,7 +132,7 @@ mp_obj_t BreakoutEncoderWheel_set_led(size_t n_args, const mp_obj_t *pos_args, m mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); + //breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); int r = args[ARG_r].u_int; int g = args[ARG_g].u_int; @@ -143,25 +144,27 @@ mp_obj_t BreakoutEncoderWheel_set_led(size_t n_args, const mp_obj_t *pos_args, m mp_raise_ValueError("g out of range. Expected 0 to 255"); else if(b < 0 || b > 255) mp_raise_ValueError("b out of range. Expected 0 to 255"); - else - self->breakout->set_led(r, g, b); + //else + //self->breakout->set_led(r, g, b); return mp_const_none; } mp_obj_t BreakoutEncoderWheel_available(mp_obj_t self_in) { - breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); - return mp_obj_new_bool(self->breakout->available()); + //breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); + //return mp_obj_new_bool(self->breakout->available()); + return mp_const_none; } mp_obj_t BreakoutEncoderWheel_read(mp_obj_t self_in) { - breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); - return mp_obj_new_int(self->breakout->read()); + //breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); + //return mp_obj_new_int(self->breakout->read()); + return mp_const_none; } mp_obj_t BreakoutEncoderWheel_clear(mp_obj_t self_in) { - breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); - self->breakout->clear(); + //breakout_encoder_wheel_BreakoutEncoderWheel_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_encoder_wheel_BreakoutEncoderWheel_obj_t); + //self->breakout->clear(); return mp_const_none; }