mirror of https://github.com/ArduPilot/ardupilot
Copter: Only run AP_ARMING throttle arming check if PILOT_THR_BHV bit "Feedback from mid stick" is not set
This commit is contained in:
parent
169375d14f
commit
804efb51e0
|
@ -48,6 +48,16 @@ bool RC_Channels_Copter::has_valid_input() const
|
|||
return true;
|
||||
}
|
||||
|
||||
// returns true if throttle arming checks should be run
|
||||
bool RC_Channels_Copter::arming_check_throttle() const {
|
||||
if ((copter.g.throttle_behavior & THR_BEHAVE_FEEDBACK_FROM_MID_STICK) != 0) {
|
||||
// center sprung throttle configured, dont run AP_Arming check
|
||||
// Copter already checks this case in its own arming checks
|
||||
return false;
|
||||
}
|
||||
return RC_Channels::arming_check_throttle();
|
||||
}
|
||||
|
||||
RC_Channel * RC_Channels_Copter::get_arming_channel(void) const
|
||||
{
|
||||
return copter.channel_yaw;
|
||||
|
|
|
@ -42,6 +42,9 @@ public:
|
|||
return &obj_channels[chan];
|
||||
}
|
||||
|
||||
// returns true if throttle arming checks should be run
|
||||
bool arming_check_throttle() const override;
|
||||
|
||||
protected:
|
||||
|
||||
int8_t flight_mode_channel_number() const override;
|
||||
|
|
Loading…
Reference in New Issue