From d6c26942a5fadeb95305c86a604233257a7858db Mon Sep 17 00:00:00 2001 From: Jerry Needell Date: Sun, 13 May 2018 21:54:44 -0400 Subject: add timeout keyword to I2C - for bitbangio - ignored for busio --- shared-module/bitbangio/I2C.c | 15 +++++++++++---- shared-module/bitbangio/types.h | 1 + shared-module/busio/I2C.c | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) (limited to 'shared-module') diff --git a/shared-module/bitbangio/I2C.c b/shared-module/bitbangio/I2C.c index 7eeda0e00..ac2f9aead 100644 --- a/shared-module/bitbangio/I2C.c +++ b/shared-module/bitbangio/I2C.c @@ -25,8 +25,8 @@ */ #include "shared-bindings/bitbangio/I2C.h" - #include "py/mperrno.h" +#include "py/nlr.h" #include "py/obj.h" #include "common-hal/microcontroller/Pin.h" @@ -34,7 +34,6 @@ #include "shared-bindings/digitalio/DigitalInOut.h" #include "shared-module/bitbangio/types.h" -#define I2C_STRETCH_LIMIT 255 STATIC void delay(bitbangio_i2c_obj_t *self) { // We need to use an accurate delay to get acceptable I2C @@ -48,11 +47,16 @@ STATIC void scl_low(bitbangio_i2c_obj_t *self) { STATIC void scl_release(bitbangio_i2c_obj_t *self) { common_hal_digitalio_digitalinout_set_value(&self->scl, true); + uint32_t count = self->us_timeout; delay(self); // For clock stretching, wait for the SCL pin to be released, with timeout. - for (int count = I2C_STRETCH_LIMIT; !common_hal_digitalio_digitalinout_get_value(&self->scl) && count; --count) { + for (; !common_hal_digitalio_digitalinout_get_value(&self->scl) && count; --count) { common_hal_mcu_delay_us(1); } + if(count==0) { /// raise exception on timeout + nlr_raise(mp_obj_new_exception_msg(&mp_type_TimeoutError, + "Clock Stretching Timeout.")); + } } STATIC void sda_low(bitbangio_i2c_obj_t *self) { @@ -142,7 +146,10 @@ STATIC bool read_byte(bitbangio_i2c_obj_t *self, uint8_t *val, bool ack) { void shared_module_bitbangio_i2c_construct(bitbangio_i2c_obj_t *self, const mcu_pin_obj_t * scl, const mcu_pin_obj_t * sda, - uint32_t frequency) { + uint32_t frequency, + uint32_t us_timeout) { + + self->us_timeout = us_timeout; self->us_delay = 500000 / frequency; if (self->us_delay == 0) { self->us_delay = 1; diff --git a/shared-module/bitbangio/types.h b/shared-module/bitbangio/types.h index dfe50f049..6d1723474 100644 --- a/shared-module/bitbangio/types.h +++ b/shared-module/bitbangio/types.h @@ -36,6 +36,7 @@ typedef struct { digitalio_digitalinout_obj_t scl; digitalio_digitalinout_obj_t sda; uint32_t us_delay; + uint32_t us_timeout; volatile bool locked; } bitbangio_i2c_obj_t; diff --git a/shared-module/busio/I2C.c b/shared-module/busio/I2C.c index 68d6ea22a..06e1af10a 100644 --- a/shared-module/busio/I2C.c +++ b/shared-module/busio/I2C.c @@ -30,8 +30,8 @@ #include "py/nlr.h" void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, - const mcu_pin_obj_t* scl, const mcu_pin_obj_t* sda, uint32_t freq) { - shared_module_bitbangio_i2c_construct(&self->bitbang, scl, sda, freq); + const mcu_pin_obj_t* scl, const mcu_pin_obj_t* sda, uint32_t freq, uint32_t timeout) { + shared_module_bitbangio_i2c_construct(&self->bitbang, scl, sda, freq, timeout); } bool common_hal_busio_i2c_deinited(busio_i2c_obj_t *self) { -- cgit v1.2.3 From aa9309704bb174c351034a866bb6b5b7073463db Mon Sep 17 00:00:00 2001 From: Jerry Needell Date: Sun, 13 May 2018 22:21:05 -0400 Subject: revise to use mp_raise_msg insead of nlr_raise.... --- shared-module/bitbangio/I2C.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'shared-module') diff --git a/shared-module/bitbangio/I2C.c b/shared-module/bitbangio/I2C.c index ac2f9aead..8381f051a 100644 --- a/shared-module/bitbangio/I2C.c +++ b/shared-module/bitbangio/I2C.c @@ -28,6 +28,7 @@ #include "py/mperrno.h" #include "py/nlr.h" #include "py/obj.h" +#include "py/runtime.h" #include "common-hal/microcontroller/Pin.h" #include "shared-bindings/microcontroller/__init__.h" @@ -54,8 +55,8 @@ STATIC void scl_release(bitbangio_i2c_obj_t *self) { common_hal_mcu_delay_us(1); } if(count==0) { /// raise exception on timeout - nlr_raise(mp_obj_new_exception_msg(&mp_type_TimeoutError, - "Clock Stretching Timeout.")); + mp_raise_msg(&mp_type_TimeoutError, + "Clock Stretching Timeout."); } } -- cgit v1.2.3 From d9f1b1f5b786a1e11e41da10bddb404e0285987c Mon Sep 17 00:00:00 2001 From: Jerry Needell Date: Sun, 13 May 2018 22:32:32 -0400 Subject: remove #include py/nlr.h from I2C.c --- shared-module/bitbangio/I2C.c | 1 - 1 file changed, 1 deletion(-) (limited to 'shared-module') diff --git a/shared-module/bitbangio/I2C.c b/shared-module/bitbangio/I2C.c index 8381f051a..7bf8292db 100644 --- a/shared-module/bitbangio/I2C.c +++ b/shared-module/bitbangio/I2C.c @@ -26,7 +26,6 @@ #include "shared-bindings/bitbangio/I2C.h" #include "py/mperrno.h" -#include "py/nlr.h" #include "py/obj.h" #include "py/runtime.h" -- cgit v1.2.3 From 9a2cda7fd3917c3e4f57b4a8510bc7690945774a Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Wed, 16 May 2018 13:19:51 -0500 Subject: Reformat the error message --- shared-module/bitbangio/I2C.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'shared-module') diff --git a/shared-module/bitbangio/I2C.c b/shared-module/bitbangio/I2C.c index 7bf8292db..47529748a 100644 --- a/shared-module/bitbangio/I2C.c +++ b/shared-module/bitbangio/I2C.c @@ -53,9 +53,9 @@ STATIC void scl_release(bitbangio_i2c_obj_t *self) { for (; !common_hal_digitalio_digitalinout_get_value(&self->scl) && count; --count) { common_hal_mcu_delay_us(1); } - if(count==0) { /// raise exception on timeout - mp_raise_msg(&mp_type_TimeoutError, - "Clock Stretching Timeout."); + // raise exception on timeout + if (count == 0) { + mp_raise_msg(&mp_type_TimeoutError, "Clock stretch too long"); } } -- cgit v1.2.3