Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-30 12:38:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Notify: use take_blocking instead of HAL_SEMAPHORE_BLOCK_FOREVER

Browse Source 
this makes for cleaner and smaller code as the failure case is not
needed
This commit is contained in:
Andrew Tridgell 2020-01-19 08:42:34 +11:00
parent b89c241329
commit 0d44d666d0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/AP_Notify/Display_SH1106_I2C.cpp
View File

@ -68,9 +68,10 @@ bool Display_SH1106_I2C::hw_init()
memset(_displaybuffer, 0, SH1106_COLUMNS * SH1106_ROWS_PER_PAGE); memset(_displaybuffer, 0, SH1106_COLUMNS * SH1106_ROWS_PER_PAGE);
// take i2c bus semaphore // take i2c bus semaphore
if (!_dev || !_dev->get_semaphore()->take(HAL_SEMAPHORE_BLOCK_FOREVER)) { if (!_dev) {
return false; return false;
} }
_dev->get_semaphore()->take_blocking();
// init display // init display
bool success = _dev->transfer((uint8_t *)&init_seq, sizeof(init_seq), nullptr, 0); bool success = _dev->transfer((uint8_t *)&init_seq, sizeof(init_seq), nullptr, 0);

3
libraries/AP_Notify/Display_SSD1306_I2C.cpp
View File

@ -76,9 +76,10 @@ bool Display_SSD1306_I2C::hw_init()
memset(_displaybuffer, 0, SSD1306_COLUMNS * SSD1306_ROWS_PER_PAGE); memset(_displaybuffer, 0, SSD1306_COLUMNS * SSD1306_ROWS_PER_PAGE);
// take i2c bus semaphore // take i2c bus semaphore
if (!_dev || !_dev->get_semaphore()->take(HAL_SEMAPHORE_BLOCK_FOREVER)) { if (!_dev) {
return false; return false;
} }
_dev->get_semaphore()->take_blocking();
// init display // init display
bool success = _dev->transfer((uint8_t *)&init_seq, sizeof(init_seq), nullptr, 0); bool success = _dev->transfer((uint8_t *)&init_seq, sizeof(init_seq), nullptr, 0);