djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

atmel-samd: Clean up I2C correctly when an initialization error occurs. Fixes #95.

Browse Source
This commit is contained in:
Scott Shawcroft 2017-02-13 16:46:57 +01:00
parent 26c61d43f4
commit 9ed3e11aec
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
atmel-samd/common-hal/nativeio/I2C.c
View File

@ -81,15 +81,21 @@ void common_hal_nativeio_i2c_construct(nativeio_i2c_obj_t *self,
enum status_code status = i2c_master_init(&self->i2c_master_instance, enum status_code status = i2c_master_init(&self->i2c_master_instance,
sercom, &config_i2c_master); sercom, &config_i2c_master);
if (status != STATUS_OK) { if (status != STATUS_OK) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "I2C bus init error")); common_hal_nativeio_i2c_deinit(self);
if (status == STATUS_ERR_BAUDRATE_UNAVAILABLE) {
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Unsupported baudrate"));
} else {
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "I2C bus init error"));
}
} }
i2c_master_enable(&self->i2c_master_instance); i2c_master_enable(&self->i2c_master_instance);
} }
void common_hal_nativeio_i2c_deinit(nativeio_i2c_obj_t *self) { void common_hal_nativeio_i2c_deinit(nativeio_i2c_obj_t *self) {
i2c_master_disable(&self->i2c_master_instance); i2c_master_reset(&self->i2c_master_instance);
reset_pin(self->sda_pin); reset_pin(self->sda_pin);
reset_pin(self->scl_pin); reset_pin(self->scl_pin);
} }