From c86c89f05c13fdf8288c9e7a99271c8be490eef6 Mon Sep 17 00:00:00 2001
From: Henry Wurzburg <hwurzburg@yahoo.com>
Date: Mon, 10 Apr 2023 07:08:01 -0500
Subject: [PATCH] ArduPlane: move estop pre-arm to AP_Arming and add exception

---
 ArduPlane/AP_Arming.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ArduPlane/AP_Arming.cpp b/ArduPlane/AP_Arming.cpp
index 46e5262087..54fdc5592f 100644
--- a/ArduPlane/AP_Arming.cpp
+++ b/ArduPlane/AP_Arming.cpp
@@ -106,11 +106,6 @@ bool AP_Arming_Plane::pre_arm_checks(bool display_failure)
         ret = false;
     }
 
-    if (SRV_Channels::get_emergency_stop()) {
-        check_failed(display_failure,"Motors Emergency Stopped");
-        ret = false;
-    }
-
     if (plane.g2.flight_options & FlightOptions::CENTER_THROTTLE_TRIM){
        int16_t trim = plane.channel_throttle->get_radio_trim();
        if (trim < 1250 || trim > 1750) {