Copter: don't take any action on Solo button press events if there is…

… a radio failsafe
3drobotics · Nov 13, 2015 · ad51c76 · ad51c76
1 parent 64c9735
commit ad51c76
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/ArduCopter/GCS_Mavlink.pde b/ArduCopter/GCS_Mavlink.pde
@@ -1487,6 +1487,11 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
         case MAV_CMD_SOLO_BTN_FLY_CLICK: {
             result = MAV_RESULT_ACCEPTED;
 
+            // don't do anything if there is a radio failsafe
+            if (failsafe.radio) {
+                break;
+            }
+
             if (set_mode(LOITER)) {
                 send_heartbeat_immediately = true;
             } else if (set_mode(ALT_HOLD)) {
@@ -1498,6 +1503,11 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
         case MAV_CMD_SOLO_BTN_FLY_HOLD: {
             result = MAV_RESULT_ACCEPTED;
 
+            // don't do anything if there is a radio failsafe
+            if (failsafe.radio) {
+                break;
+            }
+
             if (!motors.armed()) {
                 init_arm_motors(true);
             } else if (ap.land_complete) {
@@ -1516,6 +1526,11 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
         case MAV_CMD_SOLO_BTN_PAUSE_CLICK: {
             result = MAV_RESULT_ACCEPTED;
 
+            // don't do anything if there is a radio failsafe
+            if (failsafe.radio) {
+                break;
+            }
+
             if (motors.armed()) {
                 if (ap.land_complete) {
                     // if landed, disarm motors