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

GCS_MAVLink: consider NO_CHANGE as success for bootloader flash 

this prevents GCS users from seeing "update failed"
This commit is contained in:
Andrew Tridgell 2020-03-11 12:28:36 +11:00
parent d8b33bcac9
commit aaf828c9d4
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/GCS_MAVLink/GCS_Common.cpp
View File

@ -3436,11 +3436,16 @@ MAV_RESULT GCS_MAVLINK::handle_command_flash_bootloader(const mavlink_command_lo
return MAV_RESULT_FAILED;
}
if (hal.util->flash_bootloader() != AP_HAL::Util::FlashBootloader::OK) {
return MAV_RESULT_FAILED;
switch (hal.util->flash_bootloader()) {
case AP_HAL::Util::FlashBootloader::OK:
case AP_HAL::Util::FlashBootloader::NO_CHANGE:
// consider NO_CHANGE as success (so as not to display error to user)
return MAV_RESULT_ACCEPTED;
default:
break;
}
return MAV_RESULT_ACCEPTED;
return MAV_RESULT_FAILED;
}
MAV_RESULT GCS_MAVLINK::handle_command_preflight_set_sensor_offsets(const mavlink_command_long_t &packet)