zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

AP_Arming: Do not set check results each time.

master
murata 8 years ago committed by Francisco Ferreira
parent
202c33491e
commit
86e495f415
1 changed files with 9 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      libraries/AP_Arming/AP_Arming.cpp

21
libraries/AP_Arming/AP_Arming.cpp
Unescape View File

@ -445,24 +445,21 @@ bool AP_Arming::board_voltage_checks(bool report)
bool AP_Arming::pre_arm_checks(bool report) bool AP_Arming::pre_arm_checks(bool report)
{ {
bool ret = true;
if (armed || require == NONE) { if (armed || require == NONE) {
// if we are already armed or don't need any arming checks // if we are already armed or don't need any arming checks
// then skip the checks // then skip the checks
return true; return true;
} }
ret &= hardware_safety_check(report); return hardware_safety_check(report)
ret &= barometer_checks(report); & barometer_checks(report)
ret &= ins_checks(report); & ins_checks(report)
ret &= compass_checks(report); & compass_checks(report)
ret &= gps_checks(report); & gps_checks(report)
ret &= battery_checks(report); & battery_checks(report)
ret &= logging_checks(report); & logging_checks(report)
ret &= manual_transmitter_checks(report); & manual_transmitter_checks(report)
ret &= board_voltage_checks(report); & board_voltage_checks(report);
return ret;
} }
bool AP_Arming::arm_checks(uint8_t method) bool AP_Arming::arm_checks(uint8_t method)

Write Preview
Loading…
Cancel
Save