Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Notify: display gets semaphore protecting display buffer

This commit is contained in:
Randy Mackay 2017-01-21 14:03:04 +09:00 committed by Lucas De Marchi
parent 80c1433682
commit 4691bc76f3
4 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libraries/AP_Notify/Display_SH1106_I2C.cpp
View File

@ -23,7 +23,10 @@ static const AP_HAL::HAL& hal = AP_HAL::get_HAL();
// constructor
Display_SH1106_I2C::Display_SH1106_I2C(AP_HAL::OwnPtr<AP_HAL::Device> dev) :
_dev(std::move(dev)) {}
_dev(std::move(dev))
{
_displaybuffer_sem = hal.util->new_semaphore();
}
bool Display_SH1106_I2C::hw_init()
{
@ -100,11 +103,17 @@ void Display_SH1106_I2C::_timer()
command.page = 0xB0 | (i & 0x0F);
_dev->transfer((uint8_t *)&command, sizeof(command), nullptr, 0);
memcpy(&display_buffer.db[0], &_displaybuffer[i * SH1106_COLUMNS], SH1106_COLUMNS/2);
_dev->transfer((uint8_t *)&display_buffer, SH1106_COLUMNS/2 + 1, nullptr, 0);
if (_displaybuffer_sem->take(0)) {
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);
}
memcpy(&display_buffer.db[0], &_displaybuffer[i * SH1106_COLUMNS + SH1106_COLUMNS/2 ], SH1106_COLUMNS/2);
_dev->transfer((uint8_t *)&display_buffer, SH1106_COLUMNS/2 + 1, nullptr, 0);
if (_displaybuffer_sem->take(0)) {
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);
}
}
}
@ -115,8 +124,12 @@ void Display_SH1106_I2C::set_pixel(uint16_t x, uint16_t y)
return;
}
// set pixel in buffer
if (!_displaybuffer_sem->take(0)) {
return;
}
_displaybuffer[x + (y / 8 * SH1106_COLUMNS)] |= 1 << (y % 8);
_displaybuffer_sem->give();
}
void Display_SH1106_I2C::clear_pixel(uint16_t x, uint16_t y)
@ -125,12 +138,19 @@ 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)) {
return;
}
// clear pixel in buffer
_displaybuffer[x + (y / 8 * SH1106_COLUMNS)] &= ~(1 << (y % 8));
_displaybuffer_sem->give();
}
void Display_SH1106_I2C::clear_screen()
{
memset(_displaybuffer, 0, SH1106_COLUMNS * SH1106_ROWS_PER_PAGE);
if (!_displaybuffer_sem->take(0)) {
return;
}
memset(_displaybuffer, 0, SH1106_COLUMNS * SH1106_ROWS_PER_PAGE);
_displaybuffer_sem->give();
}

1
libraries/AP_Notify/Display_SH1106_I2C.h
View File

@ -24,5 +24,6 @@ private:
AP_HAL::OwnPtr<AP_HAL::Device> _dev;
uint8_t _displaybuffer[SH1106_COLUMNS * SH1106_ROWS_PER_PAGE];
AP_HAL::Semaphore *_displaybuffer_sem;
bool _need_hw_update;
};

31
libraries/AP_Notify/Display_SSD1306_I2C.cpp
View File

@ -23,7 +23,10 @@ static const AP_HAL::HAL& hal = AP_HAL::get_HAL();
// constructor
Display_SSD1306_I2C::Display_SSD1306_I2C(AP_HAL::OwnPtr<AP_HAL::Device> dev) :
_dev(std::move(dev)) {}
_dev(std::move(dev))
{
_displaybuffer_sem = hal.util->new_semaphore();
}
bool Display_SSD1306_I2C::hw_init()
{
@ -106,11 +109,17 @@ void Display_SSD1306_I2C::_timer()
command.cmd[4] = i;
_dev->transfer((uint8_t *)&command, sizeof(command), nullptr, 0);
memcpy(&display_buffer.db[0], &_displaybuffer[i * SSD1306_COLUMNS], SSD1306_COLUMNS/2);
_dev->transfer((uint8_t *)&display_buffer, SSD1306_COLUMNS/2 + 1, nullptr, 0);
if (_displaybuffer_sem->take(0)) {
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);
}
memcpy(&display_buffer.db[0], &_displaybuffer[i * SSD1306_COLUMNS + SSD1306_COLUMNS/2 ], SSD1306_COLUMNS/2);
_dev->transfer((uint8_t *)&display_buffer, SSD1306_COLUMNS/2 + 1, nullptr, 0);
if (_displaybuffer_sem->take(0)) {
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);
}
}
}
@ -120,9 +129,13 @@ 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)) {
return;
}
// set pixel in buffer
_displaybuffer[x + (y / 8 * SSD1306_COLUMNS)] |= 1 << (y % 8);
_displaybuffer_sem->give();
}
void Display_SSD1306_I2C::clear_pixel(uint16_t x, uint16_t y)
@ -131,11 +144,19 @@ 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)) {
return;
}
// clear pixel in buffer
_displaybuffer[x + (y / 8 * SSD1306_COLUMNS)] &= ~(1 << (y % 8));
_displaybuffer_sem->give();
}
void Display_SSD1306_I2C::clear_screen()
{
if (!_displaybuffer_sem->take(0)) {
return;
}
memset(_displaybuffer, 0, SSD1306_COLUMNS * SSD1306_ROWS_PER_PAGE);
_displaybuffer_sem->give();
}

1
libraries/AP_Notify/Display_SSD1306_I2C.h
View File

@ -24,5 +24,6 @@ private:
AP_HAL::OwnPtr<AP_HAL::Device> _dev;
uint8_t _displaybuffer[SSD1306_COLUMNS * SSD1306_ROWS_PER_PAGE];
AP_HAL::Semaphore *_displaybuffer_sem;
bool _need_hw_update;
};