diff options
| author | jacqueline <me@jacqueline.id.au> | 2024-06-04 08:09:40 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2024-06-04 08:09:40 +1000 |
| commit | 72344b5777dd78bbad6bbc8b52c0fa271671cf90 (patch) | |
| tree | e060c1a54cafed5c8c0cd5974250e8fab95e3349 /src/drivers | |
| parent | 39460931d8e3d044f00f7a4f58b44b1035338f09 (diff) | |
| download | tangara-fw-72344b5777dd78bbad6bbc8b52c0fa271671cf90.tar.gz | |
no more acquire_spi :)
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/display.cpp | 9 | ||||
| -rw-r--r-- | src/drivers/include/drivers/spi.hpp | 1 | ||||
| -rw-r--r-- | src/drivers/spi.cpp | 6 |
3 files changed, 2 insertions, 14 deletions
diff --git a/src/drivers/display.cpp b/src/drivers/display.cpp index e28b6b47..bd219f4b 100644 --- a/src/drivers/display.cpp +++ b/src/drivers/display.cpp @@ -284,13 +284,8 @@ void Display::SendTransaction(TransactionType type, gpio_set_level(kDisplayDr, type); - esp_err_t ret; - { - auto lock = drivers::acquire_spi(); - // TODO(jacqueline): Handle these errors. - ret = spi_device_transmit(handle_, &sTransaction); - } - ESP_ERROR_CHECK(ret); + // TODO(jacqueline): Handle these errors better. + ESP_ERROR_CHECK(spi_device_transmit(handle_, &sTransaction)); } void Display::OnLvglFlush(lv_disp_drv_t* disp_drv, diff --git a/src/drivers/include/drivers/spi.hpp b/src/drivers/include/drivers/spi.hpp index 95b002b4..4a63d7cc 100644 --- a/src/drivers/include/drivers/spi.hpp +++ b/src/drivers/include/drivers/spi.hpp @@ -13,6 +13,5 @@ namespace drivers { esp_err_t init_spi(void); esp_err_t deinit_spi(void); -int acquire_spi(void); } // namespace drivers diff --git a/src/drivers/spi.cpp b/src/drivers/spi.cpp index 50799c6e..632fe89f 100644 --- a/src/drivers/spi.cpp +++ b/src/drivers/spi.cpp @@ -56,10 +56,4 @@ esp_err_t deinit_spi(void) { return spi_bus_free(kSpiHost); } -int acquire_spi(void) { - // Cross fingers emoji: I *think* this is now resolved??? - // return std::lock_guard<std::mutex>{sSpiMutex}; - return 1; -} - } // namespace drivers |
