aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Notify: Change from magic number 0 to definition name.

Browse Source
This commit is contained in:
murata 2017-02-18 13:38:54 +09:00 committed by Francisco Ferreira
parent d9dbf6e1eb
commit eb6cdd27fb
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_Notify/Display_SH1106_I2C.cpp
View File

@ -103,13 +103,13 @@ void Display_SH1106_I2C::_timer()
command.page = 0xB0 | (i & 0x0F);
_dev->transfer((uint8_t *)&command, sizeof(command), nullptr, 0);
if (_displaybuffer_sem->take(0)) {
if (_displaybuffer_sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
memcpy(&display_buffer.db[0], &_displaybuffer[i * SH1106_COLUMNS], SH1106_COLUMNS/2);
_displaybuffer_sem->give();
_dev->transfer((uint8_t *)&display_buffer, SH1106_COLUMNS/2 + 1, nullptr, 0);
}
if (_displaybuffer_sem->take(0)) {
if (_displaybuffer_sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
memcpy(&display_buffer.db[0], &_displaybuffer[i * SH1106_COLUMNS + SH1106_COLUMNS/2 ], SH1106_COLUMNS/2);
_displaybuffer_sem->give();
_dev->transfer((uint8_t *)&display_buffer, SH1106_COLUMNS/2 + 1, nullptr, 0);
@ -124,7 +124,7 @@ void Display_SH1106_I2C::set_pixel(uint16_t x, uint16_t y)
return;
}
// set pixel in buffer
if (!_displaybuffer_sem->take(0)) {
if (!_displaybuffer_sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
return;
}
_displaybuffer[x + (y / 8 * SH1106_COLUMNS)] |= 1 << (y % 8);
@ -137,7 +137,7 @@ void Display_SH1106_I2C::clear_pixel(uint16_t x, uint16_t y)
if ((x >= SH1106_COLUMNS) || (y >= SH1106_ROWS)) {
return;
}
if (!_displaybuffer_sem->take(0)) {
if (!_displaybuffer_sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
return;
}
// clear pixel in buffer
@ -147,7 +147,7 @@ void Display_SH1106_I2C::clear_pixel(uint16_t x, uint16_t y)
void Display_SH1106_I2C::clear_screen()
{
if (!_displaybuffer_sem->take(0)) {
if (!_displaybuffer_sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
return;
}
memset(_displaybuffer, 0, SH1106_COLUMNS * SH1106_ROWS_PER_PAGE);

10
libraries/AP_Notify/Display_SSD1306_I2C.cpp
View File

@ -109,13 +109,13 @@ void Display_SSD1306_I2C::_timer()
command.cmd[4] = i;
_dev->transfer((uint8_t *)&command, sizeof(command), nullptr, 0);
if (_displaybuffer_sem->take(0)) {
if (_displaybuffer_sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
memcpy(&display_buffer.db[0], &_displaybuffer[i * SSD1306_COLUMNS], SSD1306_COLUMNS/2);
_displaybuffer_sem->give();
_dev->transfer((uint8_t *)&display_buffer, SSD1306_COLUMNS/2 + 1, nullptr, 0);
}
if (_displaybuffer_sem->take(0)) {
if (_displaybuffer_sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
memcpy(&display_buffer.db[0], &_displaybuffer[i * SSD1306_COLUMNS + SSD1306_COLUMNS/2 ], SSD1306_COLUMNS/2);
_displaybuffer_sem->give();
_dev->transfer((uint8_t *)&display_buffer, SSD1306_COLUMNS/2 + 1, nullptr, 0);
@ -129,7 +129,7 @@ void Display_SSD1306_I2C::set_pixel(uint16_t x, uint16_t y)
if ((x >= SSD1306_COLUMNS) || (y >= SSD1306_ROWS)) {
return;
}
if (!_displaybuffer_sem->take(0)) {
if (!_displaybuffer_sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
return;
}
// set pixel in buffer
@ -143,7 +143,7 @@ void Display_SSD1306_I2C::clear_pixel(uint16_t x, uint16_t y)
if ((x >= SSD1306_COLUMNS) || (y >= SSD1306_ROWS)) {
return;
}
if (!_displaybuffer_sem->take(0)) {
if (!_displaybuffer_sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
return;
}
// clear pixel in buffer
@ -153,7 +153,7 @@ void Display_SSD1306_I2C::clear_pixel(uint16_t x, uint16_t y)
void Display_SSD1306_I2C::clear_screen()
{
if (!_displaybuffer_sem->take(0)) {
if (!_displaybuffer_sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
return;
}
memset(_displaybuffer, 0, SSD1306_COLUMNS * SSD1306_ROWS_PER_PAGE);