Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-01 21:48:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Arming: use HAL_HAVE_BOARD_VOLTAGE rather than magic-0

Browse Source
This commit is contained in:
Peter Barker 2017-07-15 17:38:37 +10:00 committed by Francisco Ferreira
parent a7bc111485
commit b8ddf8a289
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Arming/AP_Arming.cpp
View File

@ -454,17 +454,17 @@ bool AP_Arming::manual_transmitter_checks(bool report)
bool AP_Arming::board_voltage_checks(bool report) bool AP_Arming::board_voltage_checks(bool report)
{ {
#if HAL_HAVE_BOARD_VOLTAGE
// check board voltage // check board voltage
if ((checks_to_perform & ARMING_CHECK_ALL) || (checks_to_perform & ARMING_CHECK_VOLTAGE)) { if ((checks_to_perform & ARMING_CHECK_ALL) || (checks_to_perform & ARMING_CHECK_VOLTAGE)) {
if(!is_zero(hal.analogin->board_voltage()) && if(((hal.analogin->board_voltage() < AP_ARMING_BOARD_VOLTAGE_MIN) || (hal.analogin->board_voltage() > AP_ARMING_BOARD_VOLTAGE_MAX))) {
((hal.analogin->board_voltage() < AP_ARMING_BOARD_VOLTAGE_MIN) || (hal.analogin->board_voltage() > AP_ARMING_BOARD_VOLTAGE_MAX))) {
if (report) { if (report) {
gcs().send_text(MAV_SEVERITY_CRITICAL,"PreArm: Check board voltage"); gcs().send_text(MAV_SEVERITY_CRITICAL,"PreArm: Check board voltage");
} }
return false; return false;
} }
} }
#endif
return true; return true;
} }