From a52db9f29d86dfe062026f885365b5c3802b1da9 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Mon, 9 Jan 2017 14:43:39 +0900 Subject: [PATCH] Copter: fix motors_checks to AP_Arming --- ArduCopter/arming_checks.cpp | 4 ++-- ArduCopter/arming_checks.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ArduCopter/arming_checks.cpp b/ArduCopter/arming_checks.cpp index d2b1e59476..c1f6d00138 100644 --- a/ArduCopter/arming_checks.cpp +++ b/ArduCopter/arming_checks.cpp @@ -297,10 +297,10 @@ bool AP_Arming_Copter::parameter_checks(bool display_failure) } // check motor setup was successful -bool Copter::motor_checks(bool display_failure) +bool AP_Arming_Copter::motor_checks(bool display_failure) { // check motors initialised correctly - if (!motors->initialised_ok()) { + if (!copter.motors->initialised_ok()) { if (display_failure) { gcs_send_text(MAV_SEVERITY_CRITICAL,"PreArm: check firmware or FRAME_CLASS"); } diff --git a/ArduCopter/arming_checks.h b/ArduCopter/arming_checks.h index b60c2bce37..863007e0f6 100644 --- a/ArduCopter/arming_checks.h +++ b/ArduCopter/arming_checks.h @@ -37,6 +37,7 @@ protected: bool fence_checks(bool display_failure); bool board_voltage_checks(bool display_failure); bool parameter_checks(bool display_failure); + bool motor_checks(bool display_failure); bool pilot_throttle_checks(bool display_failure); bool barometer_checks(bool display_failure); bool rc_calibration_checks(bool display_failure);