Skip to content

Commit c81247f

Browse files
committed
extmod/machine_i2c: Rewrite i2c.scan in terms of C-level protocol.
1 parent bc4ea69 commit c81247f

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

extmod/machine_i2c.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -293,16 +293,14 @@ STATIC mp_obj_t machine_i2c_obj_init(size_t n_args, const mp_obj_t *args, mp_map
293293
MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2c_init_obj, 1, machine_i2c_obj_init);
294294

295295
STATIC mp_obj_t machine_i2c_scan(mp_obj_t self_in) {
296-
machine_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
296+
mp_obj_base_t *self = MP_OBJ_TO_PTR(self_in);
297+
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
297298
mp_obj_t list = mp_obj_new_list(0, NULL);
298299
// 7-bit addresses 0b0000xxx and 0b1111xxx are reserved
299300
for (int addr = 0x08; addr < 0x78; ++addr) {
300-
if (mp_hal_i2c_start(self)) {
301-
int ack = mp_hal_i2c_write_byte(self, (addr << 1));
302-
if (ack) {
303-
mp_obj_list_append(list, MP_OBJ_NEW_SMALL_INT(addr));
304-
}
305-
mp_hal_i2c_stop(self); // ignore error
301+
int ret = i2c_p->writeto(self, addr, NULL, 0, true);
302+
if (ret == 0) {
303+
mp_obj_list_append(list, MP_OBJ_NEW_SMALL_INT(addr));
306304
}
307305
}
308306
return list;

0 commit comments

Comments
 (0)