Merge pull request #4146 from gamblor21/busdevice_write_read_fix

Fix write_then_readinto in adafruit_bus_device I2CDevice
adafruit · Feb 8, 2021 · f66caa2 · f66caa2
2 parents 1043d61 + ea4a120
commit f66caa2
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/shared-bindings/adafruit_bus_device/I2CDevice.c b/shared-bindings/adafruit_bus_device/I2CDevice.c
@@ -234,23 +234,24 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_write_then_readinto(size_t n_args,
 
     mp_obj_t dest[13];
     uint8_t num_kws = 2;
+    uint8_t index = 2;
 
     mp_load_method(self->i2c, MP_QSTR_writeto_then_readfrom, dest);
-    dest[2] = MP_OBJ_NEW_SMALL_INT(self->device_address);
-    dest[3] = args[ARG_out_buffer].u_obj;
-    dest[4] = args[ARG_in_buffer].u_obj;
-    dest[5] = MP_OBJ_NEW_QSTR(MP_QSTR_out_start);
-    dest[6] = MP_OBJ_NEW_SMALL_INT(args[ARG_out_start].u_int);
+    dest[index++] = MP_OBJ_NEW_SMALL_INT(self->device_address);
+    dest[index++] = args[ARG_out_buffer].u_obj;
+    dest[index++] = args[ARG_in_buffer].u_obj;
+    dest[index++] = MP_OBJ_NEW_QSTR(MP_QSTR_out_start);
+    dest[index++] = MP_OBJ_NEW_SMALL_INT(args[ARG_out_start].u_int);
     if (args[ARG_out_end].u_int != INT_MAX) {
-        dest[7] = MP_OBJ_NEW_QSTR(MP_QSTR_out_end);
-        dest[8] = MP_OBJ_NEW_SMALL_INT(args[ARG_out_end].u_int);
+        dest[index++] = MP_OBJ_NEW_QSTR(MP_QSTR_out_end);
+        dest[index++] = MP_OBJ_NEW_SMALL_INT(args[ARG_out_end].u_int);
         num_kws++;
     }
-    dest[9] = MP_OBJ_NEW_QSTR(MP_QSTR_in_start);
-    dest[10] = MP_OBJ_NEW_SMALL_INT(args[ARG_in_start].u_int);
+    dest[index++] = MP_OBJ_NEW_QSTR(MP_QSTR_in_start);
+    dest[index++] = MP_OBJ_NEW_SMALL_INT(args[ARG_in_start].u_int);
     if (args[ARG_in_end].u_int != INT_MAX) {
-        dest[11] = MP_OBJ_NEW_QSTR(MP_QSTR_in_end);
-        dest[12] = MP_OBJ_NEW_SMALL_INT(args[ARG_in_end].u_int);
+        dest[index++] = MP_OBJ_NEW_QSTR(MP_QSTR_in_end);
+        dest[index++] = MP_OBJ_NEW_SMALL_INT(args[ARG_in_end].u_int);
         num_kws++;
     }