StackRduino
diff --git a/‎extmod/machine_i2c.c‎
Lines changed: 11 additions & 4 deletions b/‎extmod/machine_i2c.c‎
Lines changed: 11 additions & 4 deletions
@@ -134,14 +134,15 @@ STATIC void mp_hal_i2c_write(machine_i2c_obj_t *self, uint8_t addr, uint8_t *dat
             goto er;
         }
     }
+    mp_hal_i2c_stop(self);
     return;
 
 er:
     mp_hal_i2c_stop(self);
     nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "I2C bus error"));
 }
 
-STATIC int mp_hal_i2c_read_byte(machine_i2c_obj_t *self, uint8_t *val) {
+STATIC int mp_hal_i2c_read_byte(machine_i2c_obj_t *self, uint8_t *val, int nack) {
     mp_hal_i2c_delay(self);
     mp_hal_i2c_scl_low(self);
     mp_hal_i2c_delay(self);
@@ -156,10 +157,15 @@ STATIC int mp_hal_i2c_read_byte(machine_i2c_obj_t *self, uint8_t *val) {
     }
     *val = data;
 
+    // send ack/nack bit
+    if (!nack) {
+        mp_hal_i2c_sda_low(self);
+    }
+    mp_hal_i2c_delay(self);
     mp_hal_i2c_scl_release(self);
     mp_hal_i2c_delay(self);
     mp_hal_i2c_scl_low(self);
-    mp_hal_i2c_delay(self);
+    mp_hal_i2c_sda_release(self);
 
     return 1; // success
 }
@@ -170,10 +176,11 @@ STATIC void mp_hal_i2c_read(machine_i2c_obj_t *self, uint8_t addr, uint8_t *data
         goto er;
     }
     while (len--) {
-        if (!mp_hal_i2c_read_byte(self, data++)) {
+        if (!mp_hal_i2c_read_byte(self, data++, len == 0)) {
             goto er;
         }
     }
+    mp_hal_i2c_stop(self);
     return;
 
 er:
@@ -254,7 +261,7 @@ STATIC mp_obj_t machine_i2c_readinto(mp_obj_t self_in, mp_obj_t buf_in) {
     // do the read
     uint8_t *dest = bufinfo.buf;
     while (bufinfo.len--) {
-        if (!mp_hal_i2c_read_byte(self, dest++)) {
+        if (!mp_hal_i2c_read_byte(self, dest++, bufinfo.len == 0)) {
             nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "I2C bus error"));
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -134,14 +134,15 @@ STATIC void mp_hal_i2c_write(machine_i2c_obj_t self, uint8_t addr, uint8_t dat`
`134`	`134`	`goto er;`
`135`	`135`	`}`
`136`	`136`	`}`
	`137`	`+ mp_hal_i2c_stop(self);`
`137`	`138`	`return;`
`138`	`139`
`139`	`140`	`er:`
`140`	`141`	`mp_hal_i2c_stop(self);`
`141`	`142`	`nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "I2C bus error"));`
`142`	`143`	`}`
`143`	`144`
`144`		`-STATIC int mp_hal_i2c_read_byte(machine_i2c_obj_t self, uint8_t val) {`
	`145`	`+STATIC int mp_hal_i2c_read_byte(machine_i2c_obj_t self, uint8_t val, int nack) {`
`145`	`146`	`mp_hal_i2c_delay(self);`
`146`	`147`	`mp_hal_i2c_scl_low(self);`
`147`	`148`	`mp_hal_i2c_delay(self);`
`@@ -156,10 +157,15 @@ STATIC int mp_hal_i2c_read_byte(machine_i2c_obj_t self, uint8_t val) {`
`156`	`157`	`}`
`157`	`158`	`*val = data;`
`158`	`159`
	`160`	`+ // send ack/nack bit`
	`161`	`+ if (!nack) {`
	`162`	`+ mp_hal_i2c_sda_low(self);`
	`163`	`+ }`
	`164`	`+ mp_hal_i2c_delay(self);`
`159`	`165`	`mp_hal_i2c_scl_release(self);`
`160`	`166`	`mp_hal_i2c_delay(self);`
`161`	`167`	`mp_hal_i2c_scl_low(self);`
`162`		`- mp_hal_i2c_delay(self);`
	`168`	`+ mp_hal_i2c_sda_release(self);`
`163`	`169`
`164`	`170`	`return 1; // success`
`165`	`171`	`}`
`@@ -170,10 +176,11 @@ STATIC void mp_hal_i2c_read(machine_i2c_obj_t self, uint8_t addr, uint8_t data`
`170`	`176`	`goto er;`
`171`	`177`	`}`
`172`	`178`	`while (len--) {`
`173`		`- if (!mp_hal_i2c_read_byte(self, data++)) {`
	`179`	`+ if (!mp_hal_i2c_read_byte(self, data++, len == 0)) {`
`174`	`180`	`goto er;`
`175`	`181`	`}`
`176`	`182`	`}`
	`183`	`+ mp_hal_i2c_stop(self);`
`177`	`184`	`return;`
`178`	`185`
`179`	`186`	`er:`
`@@ -254,7 +261,7 @@ STATIC mp_obj_t machine_i2c_readinto(mp_obj_t self_in, mp_obj_t buf_in) {`
`254`	`261`	`// do the read`
`255`	`262`	`uint8_t *dest = bufinfo.buf;`
`256`	`263`	`while (bufinfo.len--) {`
`257`		`- if (!mp_hal_i2c_read_byte(self, dest++)) {`
	`264`	`+ if (!mp_hal_i2c_read_byte(self, dest++, bufinfo.len == 0)) {`
`258`	`265`	`nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "I2C bus error"));`
`259`	`266`	`}`
`260`	`267`	`}`