Revert "Copter: INS prearm failures take priority over EKF prearm fai…

…lures" This reverts commit 29e4062.
3drobotics · Nov 6, 2015 · b2267ba · b2267ba
1 parent f678c68
commit b2267ba
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/ArduCopter/motors.pde b/ArduCopter/motors.pde
@@ -332,6 +332,20 @@ static bool pre_arm_checks(bool display_failure)
         }
     }
 
+    // check GPS
+    if (!pre_arm_gps_checks(display_failure)) {
+        return false;
+    }
+
+#if AC_FENCE == ENABLED
+    // check fence is initialised
+    if(!fence.pre_arm_check()) {
+        if (display_failure) {
+            gcs_send_text_P(SEVERITY_HIGH,PSTR("PreArm: check fence"));
+        }
+        return false;
+    }
+#endif
 
     // check INS
     if ((g.arming_check == ARMING_CHECK_ALL) || (g.arming_check & ARMING_CHECK_INS)) {
@@ -417,22 +431,6 @@ static bool pre_arm_checks(bool display_failure)
             return false;
         }
     }
-
-    // check GPS
-    if (!pre_arm_gps_checks(display_failure)) {
-        return false;
-    }
-
-#if AC_FENCE == ENABLED
-    // check fence is initialised
-    if(!fence.pre_arm_check()) {
-        if (display_failure) {
-            gcs_send_text_P(SEVERITY_HIGH,PSTR("PreArm: check fence"));
-        }
-        return false;
-    }
-#endif
-
 #if CONFIG_HAL_BOARD != HAL_BOARD_VRBRAIN
 #ifndef CONFIG_ARCH_BOARD_PX4FMU_V1
     // check board voltage