From c5abcb5584db9906dd93331f610a4a4ff60b2dd5 Mon Sep 17 00:00:00 2001
From: Mark Whitehorn <kd0aij@gmail.com>
Date: Mon, 4 Nov 2019 14:24:34 -0700
Subject: [PATCH] RC_Channel: don't panic on unsupported RCn_OPTION in SITL

---
 libraries/RC_Channel/RC_Channel.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libraries/RC_Channel/RC_Channel.cpp b/libraries/RC_Channel/RC_Channel.cpp
index 347a38439b..ff584aa6cb 100644
--- a/libraries/RC_Channel/RC_Channel.cpp
+++ b/libraries/RC_Channel/RC_Channel.cpp
@@ -476,10 +476,7 @@ void RC_Channel::init_aux_function(const aux_func_t ch_option, const aux_switch_
         do_aux_function(ch_option, ch_flag);
         break;
     default:
-        gcs().send_text(MAV_SEVERITY_WARNING, "Failed to initialise RC function (%u)", (unsigned)ch_option);
-#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
-        AP_HAL::panic("RC function (%u) initialisation not handled", (unsigned)ch_option);
-#endif
+        gcs().send_text(MAV_SEVERITY_WARNING, "Unsupported RC function (%u)", (unsigned)ch_option);
         break;
     }
 }