From c67b2c16619c456935dd93675b478668aeac0352 Mon Sep 17 00:00:00 2001 From: Kamil Tomaszewski Date: Mon, 14 Oct 2019 08:18:17 +0200 Subject: Return None if reference_voltage is 0.0 --- shared-bindings/analogio/AnalogIn.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'shared-bindings') diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c index a8bbbf59a..de48ba082 100644 --- a/shared-bindings/analogio/AnalogIn.c +++ b/shared-bindings/analogio/AnalogIn.c @@ -138,7 +138,13 @@ const mp_obj_property_t analogio_analogin_value_obj = { STATIC mp_obj_t analogio_analogin_obj_get_reference_voltage(mp_obj_t self_in) { analogio_analogin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); - return mp_obj_new_float(common_hal_analogio_analogin_get_reference_voltage(self)); + + float reference_voltage = common_hal_analogio_analogin_get_reference_voltage(self); + if (reference_voltage == 0.0f) { + return mp_const_none; + } else { + return mp_obj_new_float(reference_voltage); + } } MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogin_get_reference_voltage_obj, analogio_analogin_obj_get_reference_voltage); -- cgit v1.2.3 From 150f9041e32f8d0887378d6568db1f50bf2b9317 Mon Sep 17 00:00:00 2001 From: Kamil Tomaszewski Date: Mon, 14 Oct 2019 09:05:55 +0200 Subject: Fix unsafe floating point comparison --- shared-bindings/analogio/AnalogIn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'shared-bindings') diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c index de48ba082..9a9b525d8 100644 --- a/shared-bindings/analogio/AnalogIn.c +++ b/shared-bindings/analogio/AnalogIn.c @@ -140,7 +140,7 @@ STATIC mp_obj_t analogio_analogin_obj_get_reference_voltage(mp_obj_t self_in) { check_for_deinit(self); float reference_voltage = common_hal_analogio_analogin_get_reference_voltage(self); - if (reference_voltage == 0.0f) { + if (reference_voltage <= 0.0f) { return mp_const_none; } else { return mp_obj_new_float(reference_voltage); -- cgit v1.2.3