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

AP_OSD: allow for runtime H and V offset change

This commit is contained in:
Andrew Tridgell 2018-07-10 08:50:30 +10:00
parent a085b33729
commit a561aa2f6d
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/AP_OSD/AP_OSD_MAX7456.cpp
View File

@ -342,6 +342,8 @@ void AP_OSD_MAX7456::reinit()
int8_t vos = constrain_int16(_osd.v_offset, 0, 31); int8_t vos = constrain_int16(_osd.v_offset, 0, 31);
_dev->write_register(MAX7456ADD_HOS, hos); _dev->write_register(MAX7456ADD_HOS, hos);
_dev->write_register(MAX7456ADD_VOS, vos); _dev->write_register(MAX7456ADD_VOS, vos);
last_v_offset = _osd.v_offset;
last_h_offset = _osd.h_offset;
// force redrawing all screen // force redrawing all screen
memset(shadow_frame, 0xFF, sizeof(shadow_frame)); memset(shadow_frame, 0xFF, sizeof(shadow_frame));
@ -355,6 +357,23 @@ void AP_OSD_MAX7456::flush()
if (last_font != get_font_num()) { if (last_font != get_font_num()) {
update_font(); update_font();
} }
// check for offset changes
if (last_v_offset != _osd.v_offset) {
int8_t vos = constrain_int16(_osd.v_offset, 0, 31);
_dev->get_semaphore()->take_blocking();
_dev->write_register(MAX7456ADD_VOS, vos);
_dev->get_semaphore()->give();
last_v_offset = _osd.v_offset;
}
if (last_h_offset != _osd.h_offset) {
int8_t hos = constrain_int16(_osd.h_offset, 0, 63);
_dev->get_semaphore()->take_blocking();
_dev->write_register(MAX7456ADD_HOS, hos);
_dev->get_semaphore()->give();
last_h_offset = _osd.h_offset;
}
check_reinit(); check_reinit();
transfer_frame(); transfer_frame();
} }

2
libraries/AP_OSD/AP_OSD_MAX7456.h
View File

@ -60,6 +60,8 @@ private:
uint8_t video_signal_reg; uint8_t video_signal_reg;
bool initialized; bool initialized;
uint8_t last_font; uint8_t last_font;
int8_t last_v_offset;
int8_t last_h_offset;
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;