Merge pull request #4801 from dhalbert/unlock-board-i2c-on-reset

tannewt · web-flow · commit de89fc7011bd · 2021-05-24T14:25:03.000-07:00
unlock board.I2C() on reset
diff --git a/shared-module/board/__init__.c b/shared-module/board/__init__.c
@@ -143,7 +143,9 @@ void reset_board_busses(void) {
         }
     }
     #endif
+    // make sure I2C lock is not held over a soft reset
     if (i2c_singleton != NULL) {
+        common_hal_busio_i2c_unlock(i2c_singleton);
         if (!display_using_i2c) {
             common_hal_busio_i2c_deinit(i2c_singleton);
             i2c_singleton = NULL;

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,9 @@ void reset_board_busses(void) {`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`	`#endif`
	`146`	`+ // make sure I2C lock is not held over a soft reset`
`146`	`147`	`if (i2c_singleton != NULL) {`
	`148`	`+ common_hal_busio_i2c_unlock(i2c_singleton);`
`147`	`149`	`if (!display_using_i2c) {`
`148`	`150`	`common_hal_busio_i2c_deinit(i2c_singleton);`
`149`	`151`	`i2c_singleton = NULL;`