From 1ba5f4626d62a3e769f0c3fc61eac6296224519c Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Wed, 27 Nov 2019 16:52:32 +0900 Subject: [PATCH] AP_OADatabase: remove unnecessary const on arguments also swap order of angle and distance arguments to be consistent with proximity library --- libraries/AC_Avoidance/AP_OADatabase.cpp | 2 +- libraries/AC_Avoidance/AP_OADatabase.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AC_Avoidance/AP_OADatabase.cpp b/libraries/AC_Avoidance/AP_OADatabase.cpp index 686fac29f3..2e7b17446d 100644 --- a/libraries/AC_Avoidance/AP_OADatabase.cpp +++ b/libraries/AC_Avoidance/AP_OADatabase.cpp @@ -106,7 +106,7 @@ void AP_OADatabase::update() } // push a location into the database -void AP_OADatabase::queue_push(const Location &loc, const uint32_t timestamp_ms, const float distance, const float angle) +void AP_OADatabase::queue_push(const Location &loc, uint32_t timestamp_ms, float angle, float distance) { if (!healthy()) { return; diff --git a/libraries/AC_Avoidance/AP_OADatabase.h b/libraries/AC_Avoidance/AP_OADatabase.h index 1d2f37dac8..03507a1789 100644 --- a/libraries/AC_Avoidance/AP_OADatabase.h +++ b/libraries/AC_Avoidance/AP_OADatabase.h @@ -37,7 +37,7 @@ public: void update(); // push a location into the database - void queue_push(const Location &loc, const uint32_t timestamp_ms, const float distance, const float angle); + void queue_push(const Location &loc, uint32_t timestamp_ms, float angle, float distance); // returns true if database is healthy bool healthy() const { return (_queue.items != nullptr) && (_database.items != nullptr); } @@ -131,7 +131,7 @@ class AP_OADatabase { public: static AP_OADatabase *get_singleton() { return nullptr; } void init() {}; - void queue_push(const Location &loc, const uint32_t timestamp_ms, const float distance, const float angle) {}; + void queue_push(const Location &loc, uint32_t timestamp_ms, float angle, float distance) {}; bool healthy() const { return false; } void send_adsb_vehicle(mavlink_channel_t chan, uint16_t interval_ms) {}; };