Browse Source

AP_Arming: add type-correctness for is-armed check

Also, correct the constant we're testing against
mission-4.1.18
Peter Barker 7 years ago committed by Peter Barker
parent
commit
5d1d435451
  1. 2
      libraries/AP_Arming/AP_Arming.cpp

2
libraries/AP_Arming/AP_Arming.cpp

@ -95,7 +95,7 @@ uint16_t AP_Arming::compass_magfield_expected() const @@ -95,7 +95,7 @@ uint16_t AP_Arming::compass_magfield_expected() const
bool AP_Arming::is_armed()
{
return require == NONE || armed;
return (ArmingRequired)require.get() == NO || armed;
}
uint16_t AP_Arming::get_enabled_checks()

Loading…
Cancel
Save