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

AP_VideoTX: prioritize pitmode changes over power changes

This commit is contained in:
Andy Piper 2021-04-05 11:17:03 +01:00 committed by Peter Barker
parent de64467ca3
commit bfcefa3f34
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/AP_VideoTX/AP_SmartAudio.cpp
View File

@ -201,7 +201,14 @@ void AP_SmartAudio::update_vtx_params()
}
}
if (_vtx_freq_change_pending) {
if (pitMode) {// prevent power changes in pitmode as this takes the VTX out of pitmode
_vtx_power_change_pending = false;
}
// prioritize pitmode changes
if (_vtx_options_change_pending) {
set_operation_mode(mode);
} else if (_vtx_freq_change_pending) {
if (_vtx_use_set_freq) {
set_frequency(vtx.get_configured_frequency_mhz(), false);
} else {
@ -224,8 +231,6 @@ void AP_SmartAudio::update_vtx_params()
}
break;
}
} else if (_vtx_options_change_pending) {
set_operation_mode(mode);
}
}
}