From ff7ef21456f9c9f4b068ee0d889455e307638125 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 14 Feb 2019 11:42:43 +1100 Subject: [PATCH] Tracker: move sensor flags to be a GCS thing rather than a GCS_MAVLINK thing --- AntennaTracker/GCS_Mavlink.cpp | 2 +- AntennaTracker/GCS_Mavlink.h | 1 - AntennaTracker/GCS_Tracker.h | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AntennaTracker/GCS_Mavlink.cpp b/AntennaTracker/GCS_Mavlink.cpp index 0696ef7c65..f665b28908 100644 --- a/AntennaTracker/GCS_Mavlink.cpp +++ b/AntennaTracker/GCS_Mavlink.cpp @@ -71,7 +71,7 @@ MAV_STATE GCS_MAVLINK_Tracker::system_status() const return MAV_STATE_ACTIVE; } -void GCS_MAVLINK_Tracker::get_sensor_status_flags(uint32_t &present, +void GCS_Tracker::get_sensor_status_flags(uint32_t &present, uint32_t &enabled, uint32_t &health) { diff --git a/AntennaTracker/GCS_Mavlink.h b/AntennaTracker/GCS_Mavlink.h index fda4513635..5340ba008b 100644 --- a/AntennaTracker/GCS_Mavlink.h +++ b/AntennaTracker/GCS_Mavlink.h @@ -46,6 +46,5 @@ private: MAV_MODE base_mode() const override; uint32_t custom_mode() const override; MAV_STATE system_status() const override; - void get_sensor_status_flags(uint32_t &present, uint32_t &enabled, uint32_t &health); }; diff --git a/AntennaTracker/GCS_Tracker.h b/AntennaTracker/GCS_Tracker.h index 10ebc0298c..8bc9f93978 100644 --- a/AntennaTracker/GCS_Tracker.h +++ b/AntennaTracker/GCS_Tracker.h @@ -17,6 +17,8 @@ public: GCS_MAVLINK_Tracker &chan(const uint8_t ofs) override { return _chan[ofs]; }; const GCS_MAVLINK_Tracker &chan(const uint8_t ofs) const override { return _chan[ofs]; }; + void get_sensor_status_flags(uint32_t &present, uint32_t &enabled, uint32_t &health); + private: void request_datastream_position(uint8_t sysid, uint8_t compid);