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

Plane: move mavlink reboot code up to base class

Browse Source
This commit is contained in:
Peter Barker 2017-07-24 09:54:26 +10:00 committed by Peter Barker
parent c84b102c1c
commit 320e24af65
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ArduPlane/GCS_Mavlink.cpp
View File

@ -753,6 +753,11 @@ void GCS_MAVLINK_Plane::packetReceived(const mavlink_status_t &status,
GCS_MAVLINK::packetReceived(status, msg);
}
bool GCS_MAVLINK_Plane::should_disable_overrides_on_reboot() const
{
return (plane.quadplane.enable != 0);
}
void GCS_MAVLINK_Plane::handleMessage(mavlink_message_t* msg)
{
switch (msg->msgid) {
@ -993,10 +998,6 @@ void GCS_MAVLINK_Plane::handleMessage(mavlink_message_t* msg)
}
break;
case MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN:
result = handle_preflight_reboot(packet, plane.quadplane.enable != 0);
break;
case MAV_CMD_DO_LAND_START:
result = MAV_RESULT_FAILED;

1
ArduPlane/GCS_Mavlink.h
View File

@ -27,6 +27,7 @@ protected:
uint8_t sysid_my_gcs() const override;
bool set_mode(uint8_t mode) override;
bool should_disable_overrides_on_reboot() const override;
MAV_RESULT handle_command_preflight_calibration(const mavlink_command_long_t &packet) override;
MAV_RESULT _handle_command_preflight_calibration(const mavlink_command_long_t &packet) override;