From 73e7e64bb86f31f29091c82b5e8a1be5ce82b35d Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Thu, 17 Sep 2015 21:33:41 +0900 Subject: [PATCH] AP_Arming: remove unused set_skip_gyro_cal --- libraries/AP_Arming/AP_Arming.cpp | 3 +-- libraries/AP_Arming/AP_Arming.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp index 72465be62d..8fe8c4e893 100644 --- a/libraries/AP_Arming/AP_Arming.cpp +++ b/libraries/AP_Arming/AP_Arming.cpp @@ -44,7 +44,6 @@ AP_Arming::AP_Arming(const AP_AHRS &ahrs_ref, const AP_Baro &baro, Compass &comp const enum HomeState &home_set) : armed(false) , logging_available(false) - , skip_gyro_cal(false) , arming_method(NONE) , ahrs(ahrs_ref) , barometer(baro) @@ -130,7 +129,7 @@ bool AP_Arming::ins_checks(bool report) } return false; } - if (!skip_gyro_cal && ! ins.gyro_calibrated_ok_all()) { + if (!ins.gyro_calibrated_ok_all()) { if (report) { GCS_MAVLINK::send_statustext_all(MAV_SEVERITY_CRITICAL, PSTR("PreArm: gyros not calibrated!")); } diff --git a/libraries/AP_Arming/AP_Arming.h b/libraries/AP_Arming/AP_Arming.h index 1408286502..c6d349651d 100644 --- a/libraries/AP_Arming/AP_Arming.h +++ b/libraries/AP_Arming/AP_Arming.h @@ -58,7 +58,6 @@ public: in a vehicle specific subclass */ virtual bool pre_arm_checks(bool report); - void set_skip_gyro_cal(bool set) { skip_gyro_cal = set; } void set_logging_available(bool set) { logging_available = set; } @@ -68,7 +67,6 @@ public: protected: bool armed:1; bool logging_available:1; - bool skip_gyro_cal:1; //Parameters AP_Int8 require;