backup commit dev

ArduCopter/AP_Arming.cpp

@@ -457,7 +457,7 @@ bool AP_Arming_Copter::mandatory_deadline_checks(bool display_failure)
 {
    const AP_GPS &gps   =  AP::gps();
     if(gps.status()<2)
-        return true;
+        return false;
     if (!copter.deadline_ok())
     {
         int32_t deadline = 0;

ArduCopter/system.cpp

@@ -339,9 +339,9 @@ bool Copter::deadline_ok()
     int32_t deadline =0;
     copter.get_deadline_params(deadline);
     int32_t gps_date =0;
-if((AP::gps().time_week() ==0)||(AP::gps().time_week_ms() ==0)){
-    return  false;
-}
+    if((AP::gps().time_week() ==0)||(AP::gps().time_week_ms() ==0)){
+        return  false;
+    }
     uint64_t timestamp  = AP::gps().time_epoch_convert(AP::gps().time_week(),AP::gps().time_week_ms())/1000;
       //tick  -timestamp - uint:s
     time_t tick = (time_t)timestamp;