Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Hosted Weblate 2021-05-24 23:25:09 +02:00
commit a84998adb4

View File

@ -143,7 +143,9 @@ void reset_board_busses(void) {
} }
} }
#endif #endif
// make sure I2C lock is not held over a soft reset
if (i2c_singleton != NULL) { if (i2c_singleton != NULL) {
common_hal_busio_i2c_unlock(i2c_singleton);
if (!display_using_i2c) { if (!display_using_i2c) {
common_hal_busio_i2c_deinit(i2c_singleton); common_hal_busio_i2c_deinit(i2c_singleton);
i2c_singleton = NULL; i2c_singleton = NULL;