Skip to content

Commit 24037cc

Browse files
wmarkowgreyltc
authored andcommitted
#1476 Disable TWI before init.
1 parent 4653ce4 commit 24037cc

File tree

1 file changed

+5
-0
lines changed
  • libraries/Wire/src/utility

1 file changed

+5
-0
lines changed

libraries/Wire/src/utility/twi.c

+5
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ uint8_t twi_readFrom(uint8_t address, uint8_t* data, uint8_t length, uint8_t sen
159159
while(TWI_READY != twi_state){
160160
if((twi_timeout_ms > 0) && (millis() - startMillis > twi_timeout_ms)) {
161161
//timeout
162+
twi_disable();
162163
twi_init();
163164

164165
return 0;
@@ -205,6 +206,7 @@ uint8_t twi_readFrom(uint8_t address, uint8_t* data, uint8_t length, uint8_t sen
205206
while(TWI_MRX == twi_state){
206207
if((twi_timeout_ms > 0) && (millis() - startMillis > twi_timeout_ms)) {
207208
//timeout
209+
twi_disable();
208210
twi_init();
209211

210212
return 0;
@@ -252,6 +254,7 @@ uint8_t twi_writeTo(uint8_t address, uint8_t* data, uint8_t length, uint8_t wait
252254
while(TWI_READY != twi_state){
253255
if((twi_timeout_ms > 0) && (millis() - startMillis > twi_timeout_ms)) {
254256
//timeout
257+
twi_disable();
255258
twi_init();
256259

257260
return 4;
@@ -301,6 +304,7 @@ uint8_t twi_writeTo(uint8_t address, uint8_t* data, uint8_t length, uint8_t wait
301304
while(wait && (TWI_MTX == twi_state)){
302305
if((twi_timeout_ms > 0) && (millis() - startMillis > twi_timeout_ms)) {
303306
//timeout
307+
twi_disable();
304308
twi_init();
305309

306310
return 4;
@@ -407,6 +411,7 @@ void twi_stop(void)
407411
counter++;
408412
if((twi_timeout_ms > 0) && (counter >= 25000)) {
409413
// timeout
414+
twi_disable();
410415
twi_init();
411416

412417
return;

0 commit comments

Comments
 (0)