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

AP_OSD: added blink for SITL backend

This commit is contained in:
Andrew Tridgell 2018-07-04 20:27:10 +10:00
parent 7d4a6795d8
commit 9df4be7f49
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/AP_OSD/AP_OSD_SITL.cpp
View File

@ -97,6 +97,7 @@ void AP_OSD_SITL::write(uint8_t x, uint8_t y, const char* text, uint8_t char_att
mutex->take_blocking();
while ((x < video_cols) && (*text != 0)) {
buffer[y][x] = *text;
attr[y][x] = char_attr;
++text;
++x;
}
@ -125,6 +126,8 @@ void AP_OSD_SITL::update_thread(void)
if (!w) {
AP_HAL::panic("Unable to create OSD window");
}
uint8_t blink = 0;
while (w->isOpen())
{
sf::Event event;
@ -139,21 +142,32 @@ void AP_OSD_SITL::update_thread(void)
last_counter = counter;
uint8_t buffer2[video_lines][video_cols];
uint8_t attr2[video_lines][video_cols];
mutex->take_blocking();
memcpy(buffer2, buffer, sizeof(buffer2));
memcpy(attr2, attr, sizeof(attr2));
mutex->give();
w->clear();
for (uint8_t y=0; y<video_lines; y++) {
for (uint8_t x=0; x<video_cols; x++) {
uint16_t px = x * (char_width+char_spacing) * char_scale;
uint16_t py = y * (char_height+char_spacing) * char_scale;
sf::Sprite s;
s.setTexture(font[buffer2[y][x]]);
uint8_t c = buffer2[y][x];
if (attr2[y][x] & BLINK) {
if (blink >= 2) {
c = ' ';
}
}
s.setTexture(font[c]);
s.setPosition(sf::Vector2f(px, py));
s.scale(sf::Vector2f(char_scale,char_scale));
w->draw(s);
}
}
blink = (blink+1) % 4;
w->display();
usleep(10000);
}

1
libraries/AP_OSD/AP_OSD_SITL.h
View File

@ -61,6 +61,7 @@ private:
static const uint8_t char_scale = 2;
uint8_t buffer[video_lines][video_cols];
uint8_t attr[video_lines][video_cols];
void update_thread();
static void *update_thread_start(void *obj);