AP_Motors: Heli: remove output_armed_zero_throttle and use identica…

…l `output_armed_stabilizing`
ArduPilot · Mar 5, 2024 · 1bf7792 · 1bf7792
1 parent 4a310fb
commit 1bf7792
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/libraries/AP_Motors/AP_MotorsHeli.cpp b/libraries/AP_Motors/AP_MotorsHeli.cpp
@@ -211,11 +211,7 @@ void AP_MotorsHeli::output()
         // block servo_test from happening at disarm
         _servo_test_cycle_counter = 0;
         calculate_armed_scalars();
-        if (!get_interlock()) {
-            output_armed_zero_throttle();
-        } else {
-            output_armed_stabilizing();
-        }
+        output_armed_stabilizing();
     } else {
         output_disarmed();
     }
@@ -237,17 +233,6 @@ void AP_MotorsHeli::output_armed_stabilizing()
     move_actuators(_roll_in, _pitch_in, get_throttle(), _yaw_in);
 }
 
-// output_armed_zero_throttle - sends commands to the motors
-void AP_MotorsHeli::output_armed_zero_throttle()
-{
-    // if manual override active after arming, deactivate it and reinitialize servos
-    if (_servo_mode != SERVO_CONTROL_MODE_AUTOMATED) {
-        reset_flight_controls();
-    }
-
-    move_actuators(_roll_in, _pitch_in, get_throttle(), _yaw_in);
-}
-
 // output_disarmed - sends commands to the motors
 void AP_MotorsHeli::output_disarmed()
 {

diff --git a/libraries/AP_Motors/AP_MotorsHeli.h b/libraries/AP_Motors/AP_MotorsHeli.h
@@ -182,7 +182,6 @@ class AP_MotorsHeli : public AP_Motors {
 
     // output - sends commands to the motors
     void output_armed_stabilizing() override;
-    void output_armed_zero_throttle();
     void output_disarmed();
 
     // external objects we depend upon