aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sub: rc calibration checks are called by AP_Arming

Browse Source
This commit is contained in:
Peter Barker 2017-09-04 14:17:07 +10:00 committed by Randy Mackay
parent 818faa92d4
commit 7961a8f5c8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduSub/AP_Arming_Sub.cpp
View File

@ -6,7 +6,7 @@ enum HomeState AP_Arming_Sub::home_status() const
return sub.ap.home_state;
}
bool AP_Arming_Sub::rc_check(bool display_failure)
bool AP_Arming_Sub::rc_calibration_checks(bool display_failure)
{
const RC_Channel *channels[] = {
sub.channel_roll,
@ -23,7 +23,7 @@ bool AP_Arming_Sub::pre_arm_checks(bool report)
return true;
}
return AP_Arming::pre_arm_checks(report) & rc_check(report) & ins_checks(report);
return AP_Arming::pre_arm_checks(report) & ins_checks(report);
}
bool AP_Arming_Sub::ins_checks(bool report)

2
ArduSub/AP_Arming_Sub.h
View File

@ -14,7 +14,7 @@ public:
AP_Arming_Sub(const AP_Arming_Sub &other) = delete;
AP_Arming_Sub &operator=(const AP_Baro&) = delete;
bool rc_check(bool report=true);
bool rc_calibration_checks(bool report=true) override;
bool pre_arm_checks(bool report) override;
protected:

2
ArduSub/radio.cpp
View File

@ -54,7 +54,7 @@ void Sub::init_rc_out()
motors.set_throttle_range(channel_throttle->get_radio_min(), channel_throttle->get_radio_max());
// enable output to motors
if (arming.rc_check()) {
if (arming.rc_calibration_checks(true)) {
enable_motor_output();
}