From 5c388507d45359bf63f21081b4f6e46bd226a844 Mon Sep 17 00:00:00 2001 From: Rob Ratcliff Date: Wed, 22 Jan 2020 10:00:02 -0600 Subject: [PATCH] RC_Channel: fix handling of rc_override_time of -1 --- libraries/RC_Channel/RC_Channel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/RC_Channel/RC_Channel.cpp b/libraries/RC_Channel/RC_Channel.cpp index 9487930a7a..97d07e8438 100644 --- a/libraries/RC_Channel/RC_Channel.cpp +++ b/libraries/RC_Channel/RC_Channel.cpp @@ -359,7 +359,7 @@ bool RC_Channel::has_override() const } const float override_timeout_ms = rc().override_timeout_ms(); - return is_positive(override_timeout_ms) && ((AP_HAL::millis() - last_override_time) < (uint32_t)override_timeout_ms); + return (override_timeout_ms < 0) || (is_positive(override_timeout_ms) && ((AP_HAL::millis() - last_override_time) < (uint32_t)override_timeout_ms)); } /*