diff options
| author | root <siehputz@gmail.com> | 2020-09-09 09:32:25 -0500 |
|---|---|---|
| committer | root <siehputz@gmail.com> | 2020-09-09 09:32:25 -0500 |
| commit | 24a18c63f9d3990661cc58888896faba9c8fad50 (patch) | |
| tree | 1717255adc20a9b72bcbf3ae9cb61a2414e7aa83 | |
| parent | 8d27533cd45f0dc759f84e68408839f118c0c9d2 (diff) | |
Moved SPI unlock to reset_board_busses()
| -rw-r--r-- | shared-module/board/__init__.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/shared-module/board/__init__.c b/shared-module/board/__init__.c index 903b8fa71..153aa086c 100644 --- a/shared-module/board/__init__.c +++ b/shared-module/board/__init__.c @@ -89,8 +89,6 @@ mp_obj_t common_hal_board_create_spi(void) { const mcu_pin_obj_t* mosi = MP_OBJ_TO_PTR(DEFAULT_SPI_BUS_MOSI); const mcu_pin_obj_t* miso = MP_OBJ_TO_PTR(DEFAULT_SPI_BUS_MISO); common_hal_busio_spi_construct(self, clock, mosi, miso); - // make sure lock is not held initially - common_hal_busio_spi_unlock(self); spi_singleton = (mp_obj_t)self; return spi_singleton; } @@ -153,6 +151,7 @@ void reset_board_busses(void) { #endif #if BOARD_SPI bool display_using_spi = false; + busio_spi_obj_t *self = &spi_obj; #if CIRCUITPY_DISPLAYIO for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) { mp_const_obj_t bus_type = displays[i].bus_base.type; @@ -169,6 +168,8 @@ void reset_board_busses(void) { } #endif if (!display_using_spi) { + // make sure lock is not held over a soft reset + common_hal_busio_spi_unlock(self); spi_singleton = NULL; } #endif |