Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-27 11:08:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_OSD: ensure spi_buffer space

Browse Source
This commit is contained in:
Alexander Malishev 2018-07-10 00:51:15 +04:00 committed by Andrew Tridgell
parent ac71a181d6
commit d2e05eb927
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_OSD/AP_OSD_MAX7456.cpp
View File

@ -361,7 +361,6 @@ void AP_OSD_MAX7456::flush()
void AP_OSD_MAX7456::transfer_frame() void AP_OSD_MAX7456::transfer_frame()
{ {
uint16_t updated_chars = 0;
uint8_t last_attribute = 0xFF; uint8_t last_attribute = 0xFF;
uint16_t previous_pos = UINT16_MAX - 1; uint16_t previous_pos = UINT16_MAX - 1;
if (!initialized) { if (!initialized) {
@ -375,7 +374,8 @@ void AP_OSD_MAX7456::transfer_frame()
if (frame[y][x] == shadow_frame[y][x] && attr[y][x] == shadow_attr[y][x]) { if (frame[y][x] == shadow_frame[y][x] && attr[y][x] == shadow_attr[y][x]) {
continue; continue;
} }
if (updated_chars > max_updated_chars) { //ensure space for 1 char and escape sequence
if (buffer_offset >= spi_buffer_size - 32) {
break; break;
} }
shadow_frame[y][x] = frame[y][x]; shadow_frame[y][x] = frame[y][x];
@ -389,7 +389,7 @@ void AP_OSD_MAX7456::transfer_frame()
if (position_changed) { if (position_changed) {
//it is impossible to write to MAX7456ADD_DMAH/MAX7456ADD_DMAL in autoincrement mode //it is impossible to write to MAX7456ADD_DMAH/MAX7456ADD_DMAL in autoincrement mode
//so, exit autoincrement mode //so, exit autoincrement mode
if (updated_chars != 0) { if (buffer_offset != 0) {
buffer_add_cmd(MAX7456ADD_DMDI, 0xFF); buffer_add_cmd(MAX7456ADD_DMDI, 0xFF);
buffer_add_cmd(MAX7456ADD_DMM, 0); buffer_add_cmd(MAX7456ADD_DMM, 0);
} }
@ -404,7 +404,6 @@ void AP_OSD_MAX7456::transfer_frame()
} }
buffer_add_cmd(MAX7456ADD_DMDI, chr); buffer_add_cmd(MAX7456ADD_DMDI, chr);
updated_chars++;
previous_pos = pos; previous_pos = pos;
} }
} }

3
libraries/AP_OSD/AP_OSD_MAX7456.h
View File

@ -64,8 +64,7 @@ private:
static const uint8_t video_lines_ntsc = 13; static const uint8_t video_lines_ntsc = 13;
static const uint8_t video_lines_pal = 16; static const uint8_t video_lines_pal = 16;
static const uint8_t video_columns = 30; static const uint8_t video_columns = 30;
static const uint16_t max_updated_chars = 64; //up to 480 static const uint16_t spi_buffer_size = 512;
static const uint16_t spi_buffer_size = ((max_updated_chars + 1) * 8);
uint8_t frame[video_lines_pal][video_columns]; uint8_t frame[video_lines_pal][video_columns];