From 42f2bff6c7defb4c6bbdf718358837d3b7e48d2f Mon Sep 17 00:00:00 2001 From: ZodiusInfuser Date: Wed, 12 May 2021 17:20:42 +0100 Subject: [PATCH] Fixed pot read from returning bool to returning a float, and removed read_as_percent for read_raw --- .../breakout_potentiometer/breakout_potentiometer.cpp | 10 +++++----- .../breakout_potentiometer/breakout_potentiometer.hpp | 4 ++-- .../breakout_potentiometer/breakout_potentiometer.c | 4 ++-- .../breakout_potentiometer/breakout_potentiometer.cpp | 6 +++--- .../breakout_potentiometer/breakout_potentiometer.h | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libraries/breakout_potentiometer/breakout_potentiometer.cpp b/libraries/breakout_potentiometer/breakout_potentiometer.cpp index 0f0f9e47..07c8ffe3 100644 --- a/libraries/breakout_potentiometer/breakout_potentiometer.cpp +++ b/libraries/breakout_potentiometer/breakout_potentiometer.cpp @@ -99,11 +99,11 @@ namespace pimoroni { ioe.output(LED_B, b); // Loads all 3 pwms } - int16_t BreakoutPotentiometer::read(uint32_t adc_timeout) { - return ioe.input(POT_INPUT, adc_timeout); - } - - float BreakoutPotentiometer::read_as_percent(uint32_t adc_timeout) { +float BreakoutPotentiometer::read(uint32_t adc_timeout) { return (ioe.input_as_voltage(POT_INPUT, adc_timeout) / ioe.get_adc_vref()); } + + int16_t BreakoutPotentiometer::read_raw(uint32_t adc_timeout) { + return ioe.input(POT_INPUT, adc_timeout); + } } \ No newline at end of file diff --git a/libraries/breakout_potentiometer/breakout_potentiometer.hpp b/libraries/breakout_potentiometer/breakout_potentiometer.hpp index 624cd2d7..f8c42583 100644 --- a/libraries/breakout_potentiometer/breakout_potentiometer.hpp +++ b/libraries/breakout_potentiometer/breakout_potentiometer.hpp @@ -86,8 +86,8 @@ namespace pimoroni { void set_brightness(float brightness); void set_led(uint8_t r, uint8_t g, uint8_t b); - int16_t read(uint32_t adc_timeout = DEFAULT_ADC_TIMEOUT); - float read_as_percent(uint32_t adc_timeout = DEFAULT_ADC_TIMEOUT); + float read(uint32_t adc_timeout = DEFAULT_ADC_TIMEOUT); + int16_t read_raw(uint32_t adc_timeout = DEFAULT_ADC_TIMEOUT); }; } \ No newline at end of file diff --git a/micropython/modules/breakout_potentiometer/breakout_potentiometer.c b/micropython/modules/breakout_potentiometer/breakout_potentiometer.c index 3c5ce6fa..7c834101 100644 --- a/micropython/modules/breakout_potentiometer/breakout_potentiometer.c +++ b/micropython/modules/breakout_potentiometer/breakout_potentiometer.c @@ -13,7 +13,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(BreakoutPotentiometer_set_direction_obj, 2, BreakoutP MP_DEFINE_CONST_FUN_OBJ_KW(BreakoutPotentiometer_set_brightness_obj, 2, BreakoutPotentiometer_set_brightness); MP_DEFINE_CONST_FUN_OBJ_KW(BreakoutPotentiometer_set_led_obj, 4, BreakoutPotentiometer_set_led); MP_DEFINE_CONST_FUN_OBJ_1(BreakoutPotentiometer_read_obj, BreakoutPotentiometer_read); -MP_DEFINE_CONST_FUN_OBJ_1(BreakoutPotentiometer_read_as_percent_obj, BreakoutPotentiometer_read_as_percent); +MP_DEFINE_CONST_FUN_OBJ_1(BreakoutPotentiometer_read_raw_obj, BreakoutPotentiometer_read_raw); /***** Binding of Methods *****/ STATIC const mp_rom_map_elem_t BreakoutPotentiometer_locals_dict_table[] = { @@ -25,7 +25,7 @@ STATIC const mp_rom_map_elem_t BreakoutPotentiometer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_set_brightness), MP_ROM_PTR(&BreakoutPotentiometer_set_brightness_obj) }, { MP_ROM_QSTR(MP_QSTR_set_led), MP_ROM_PTR(&BreakoutPotentiometer_set_led_obj) }, { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&BreakoutPotentiometer_read_obj) }, - { MP_ROM_QSTR(MP_QSTR_read_as_percent), MP_ROM_PTR(&BreakoutPotentiometer_read_as_percent_obj) }, + { MP_ROM_QSTR(MP_QSTR_read_raw), MP_ROM_PTR(&BreakoutPotentiometer_read_raw_obj) }, }; STATIC MP_DEFINE_CONST_DICT(BreakoutPotentiometer_locals_dict, BreakoutPotentiometer_locals_dict_table); diff --git a/micropython/modules/breakout_potentiometer/breakout_potentiometer.cpp b/micropython/modules/breakout_potentiometer/breakout_potentiometer.cpp index 799bb4a5..ee3a2bdc 100644 --- a/micropython/modules/breakout_potentiometer/breakout_potentiometer.cpp +++ b/micropython/modules/breakout_potentiometer/breakout_potentiometer.cpp @@ -225,11 +225,11 @@ mp_obj_t BreakoutPotentiometer_set_led(size_t n_args, const mp_obj_t *pos_args, mp_obj_t BreakoutPotentiometer_read(mp_obj_t self_in) { breakout_potentiometer_BreakoutPotentiometer_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_potentiometer_BreakoutPotentiometer_obj_t); - return mp_obj_new_bool(self->breakout->read()); + return mp_obj_new_float(self->breakout->read()); } -mp_obj_t BreakoutPotentiometer_read_as_percent(mp_obj_t self_in) { +mp_obj_t BreakoutPotentiometer_read_raw(mp_obj_t self_in) { breakout_potentiometer_BreakoutPotentiometer_obj_t *self = MP_OBJ_TO_PTR2(self_in, breakout_potentiometer_BreakoutPotentiometer_obj_t); - return mp_obj_new_float(self->breakout->read_as_percent()); + return mp_obj_new_int(self->breakout->read_raw()); } } \ No newline at end of file diff --git a/micropython/modules/breakout_potentiometer/breakout_potentiometer.h b/micropython/modules/breakout_potentiometer/breakout_potentiometer.h index f72f65fc..7aca57a6 100644 --- a/micropython/modules/breakout_potentiometer/breakout_potentiometer.h +++ b/micropython/modules/breakout_potentiometer/breakout_potentiometer.h @@ -15,4 +15,4 @@ extern mp_obj_t BreakoutPotentiometer_set_direction(size_t n_args, const mp_obj_ extern mp_obj_t BreakoutPotentiometer_set_brightness(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args); extern mp_obj_t BreakoutPotentiometer_set_led(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args); extern mp_obj_t BreakoutPotentiometer_read(mp_obj_t self_in); -extern mp_obj_t BreakoutPotentiometer_read_as_percent(mp_obj_t self_in); \ No newline at end of file +extern mp_obj_t BreakoutPotentiometer_read_raw(mp_obj_t self_in); \ No newline at end of file