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

Sub: fix compiler warnings on has_disarm_function

This commit is contained in:
Peter Barker 2019-08-01 13:24:21 +10:00 committed by Peter Barker
parent 68edf6351d
commit 157da70cf7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArduSub/AP_Arming_Sub.cpp
View File

@ -12,7 +12,7 @@ bool AP_Arming_Sub::rc_calibration_checks(bool display_failure)
return rc_checks_copter_sub(display_failure, channels);
}
const bool AP_Arming_Sub::has_disarm_function () {
bool AP_Arming_Sub::has_disarm_function() const {
bool has_shift_function = false;
// make sure the craft has a disarm button assigned before it is armed
// check all the standard btn functions

2
ArduSub/AP_Arming_Sub.h
View File

@ -13,7 +13,7 @@ public:
bool rc_calibration_checks(bool display_failure) override;
bool pre_arm_checks(bool display_failure) override;
const bool has_disarm_function();
bool has_disarm_function() const;
bool disarm() override;
bool arm(AP_Arming::Method method, bool do_arming_checks=true) override;