From b89d3564c7cb01fc4c137427e48a4b6cdecd4db3 Mon Sep 17 00:00:00 2001
From: Randy Mackay <rmackay9@yahoo.com>
Date: Mon, 26 Dec 2016 17:03:40 +0900
Subject: [PATCH] Copter: move set_pre_arm_check to arming_checks

---
 ArduCopter/AP_State.cpp      | 15 ---------------
 ArduCopter/arming_checks.cpp | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ArduCopter/AP_State.cpp b/ArduCopter/AP_State.cpp
index 26a8c157c6..cf9e5ae394 100644
--- a/ArduCopter/AP_State.cpp
+++ b/ArduCopter/AP_State.cpp
@@ -101,21 +101,6 @@ void Copter::set_failsafe_gcs(bool b)
 
 // ---------------------------------------------
 
-void AP_Arming_Copter::set_pre_arm_check(bool b)
-{
-    if(copter.ap.pre_arm_check != b) {
-        copter.ap.pre_arm_check = b;
-        AP_Notify::flags.pre_arm_check = b;
-    }
-}
-
-void AP_Arming_Copter::set_pre_arm_rc_check(bool b)
-{
-    if(copter.ap.pre_arm_rc_check != b) {
-        copter.ap.pre_arm_rc_check = b;
-    }
-}
-
 void Copter::update_using_interlock()
 {
 #if FRAME_CONFIG == HELI_FRAME
diff --git a/ArduCopter/arming_checks.cpp b/ArduCopter/arming_checks.cpp
index cd8fbd1d95..2fbf3ef7f3 100644
--- a/ArduCopter/arming_checks.cpp
+++ b/ArduCopter/arming_checks.cpp
@@ -792,6 +792,21 @@ enum HomeState AP_Arming_Copter::home_status() const
     return copter.ap.home_state;
 }
 
+void AP_Arming_Copter::set_pre_arm_check(bool b)
+{
+    if(copter.ap.pre_arm_check != b) {
+        copter.ap.pre_arm_check = b;
+        AP_Notify::flags.pre_arm_check = b;
+    }
+}
+
+void AP_Arming_Copter::set_pre_arm_rc_check(bool b)
+{
+    if(copter.ap.pre_arm_rc_check != b) {
+        copter.ap.pre_arm_rc_check = b;
+    }
+}
+
 void AP_Arming_Copter::gcs_send_text(MAV_SEVERITY severity, const char *str)
 {
     copter.gcs_send_text(severity, str);