From 73e51c480ad303542baf6aea27c5e4c124d17d7c Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sat, 8 Feb 2020 12:27:16 +1100 Subject: [PATCH] RC_Channel: correct RC_set_override parameter name This was just misnamed. All callers appear to be passing ms in. --- libraries/RC_Channel/RC_Channel.cpp | 4 ++-- libraries/RC_Channel/RC_Channel.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/RC_Channel/RC_Channel.cpp b/libraries/RC_Channel/RC_Channel.cpp index 97d07e8438..d74dc49a57 100644 --- a/libraries/RC_Channel/RC_Channel.cpp +++ b/libraries/RC_Channel/RC_Channel.cpp @@ -335,13 +335,13 @@ bool RC_Channel::in_trim_dz() const return is_bounded_int32(radio_in, radio_trim - dead_zone, radio_trim + dead_zone); } -void RC_Channel::set_override(const uint16_t v, const uint32_t timestamp_us) +void RC_Channel::set_override(const uint16_t v, const uint32_t timestamp_ms) { if (!rc().gcs_overrides_enabled()) { return; } - last_override_time = timestamp_us != 0 ? timestamp_us : AP_HAL::millis(); + last_override_time = timestamp_ms != 0 ? timestamp_ms : AP_HAL::millis(); override_value = v; rc().new_override_received(); } diff --git a/libraries/RC_Channel/RC_Channel.h b/libraries/RC_Channel/RC_Channel.h index 68cb050727..4f943f770c 100644 --- a/libraries/RC_Channel/RC_Channel.h +++ b/libraries/RC_Channel/RC_Channel.h @@ -68,7 +68,7 @@ public: void set_control_in(int16_t val) { control_in = val;} void clear_override(); - void set_override(const uint16_t v, const uint32_t timestamp_us); + void set_override(const uint16_t v, const uint32_t timestamp_ms); bool has_override() const; int16_t stick_mixing(const int16_t servo_in);