Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-21 15:23:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: handle FLASH_BOOTLOADER as command-long and command-int

Browse Source
This commit is contained in:
Peter Barker 2023-10-26 14:16:03 +11:00 committed by Andrew Tridgell
parent afd85c8613
commit 78475cad5c
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/GCS_MAVLink/GCS.h
View File

@ -629,7 +629,7 @@ protected:
virtual uint32_t telem_delay() const = 0;
MAV_RESULT handle_command_run_prearm_checks(const mavlink_command_long_t &packet);
MAV_RESULT handle_command_flash_bootloader(const mavlink_command_long_t &packet);
MAV_RESULT handle_command_flash_bootloader(const mavlink_command_int_t &packet);
// generally this should not be overridden; Plane overrides it to ensure
// failsafe isn't triggered during calibration

15
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -4311,9 +4311,9 @@ void GCS_MAVLINK::send_sim_state() const
#endif
#if AP_BOOTLOADER_FLASHING_ENABLED
MAV_RESULT GCS_MAVLINK::handle_command_flash_bootloader(const mavlink_command_long_t &packet)
MAV_RESULT GCS_MAVLINK::handle_command_flash_bootloader(const mavlink_command_int_t &packet)
{
if (uint32_t(packet.param5) != 290876) {
if (packet.x != 290876) {
gcs().send_text(MAV_SEVERITY_INFO, "Magic not set");
return MAV_RESULT_FAILED;
}
@ -4784,12 +4784,6 @@ MAV_RESULT GCS_MAVLINK::handle_command_long_packet(const mavlink_command_long_t
result = handle_command_run_prearm_checks(packet);
break;
#if AP_BOOTLOADER_FLASHING_ENABLED
case MAV_CMD_FLASH_BOOTLOADER:
result = handle_command_flash_bootloader(packet);
break;
#endif
default:
result = try_command_long_as_command_int(packet, msg);
break;
@ -5122,6 +5116,11 @@ MAV_RESULT GCS_MAVLINK::handle_command_int_packet(const mavlink_command_int_t &p
return handle_command_mag_cal(packet);
#endif
#if AP_BOOTLOADER_FLASHING_ENABLED
case MAV_CMD_FLASH_BOOTLOADER:
return handle_command_flash_bootloader(packet);
#endif
#if AP_AHRS_ENABLED
case MAV_CMD_GET_HOME_POSITION:
return handle_command_get_home_position(packet);