diff --git a/APMrover2/AP_Arming.cpp b/APMrover2/AP_Arming.cpp index 3a86b16796..670b2e2b7f 100644 --- a/APMrover2/AP_Arming.cpp +++ b/APMrover2/AP_Arming.cpp @@ -105,15 +105,6 @@ void AP_Arming_Rover::update_soft_armed() AP::logger().set_vehicle_armed(hal.util->get_soft_armed()); } -/* - update AHRS soft arm state and log as needed - */ -void AP_Arming_Rover::change_arm_state(void) -{ - Log_Write_Arm_Disarm(); - update_soft_armed(); -} - /* arm motors */ @@ -133,7 +124,7 @@ bool AP_Arming_Rover::arm(AP_Arming::Method method, const bool do_arming_checks) // save home heading for use in sail vehicles rover.g2.windvane.record_home_heading(); - change_arm_state(); + update_soft_armed(); gcs().send_text(MAV_SEVERITY_INFO, "Throttle armed"); @@ -153,8 +144,7 @@ bool AP_Arming_Rover::disarm(void) rover.mode_auto.mission.reset(); } - // only log if disarming was successful - change_arm_state(); + update_soft_armed(); gcs().send_text(MAV_SEVERITY_INFO, "Throttle disarmed"); diff --git a/APMrover2/AP_Arming.h b/APMrover2/AP_Arming.h index 167beb6851..9c2e6bc1b3 100644 --- a/APMrover2/AP_Arming.h +++ b/APMrover2/AP_Arming.h @@ -31,7 +31,4 @@ protected: bool oa_check(bool report); bool parameter_checks(bool report); -private: - - void change_arm_state(void); };