From bb706305d0edf0d28d3b2c261294291308c92232 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 14 Feb 2019 11:43:10 +1100 Subject: [PATCH] Sub: move sensor flags to be a GCS thing rather than a GCS_MAVLINK thing --- ArduSub/GCS_Mavlink.cpp | 2 +- ArduSub/GCS_Mavlink.h | 1 - ArduSub/GCS_Sub.h | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ArduSub/GCS_Mavlink.cpp b/ArduSub/GCS_Mavlink.cpp index f3eb2ac7f2..7603625877 100644 --- a/ArduSub/GCS_Mavlink.cpp +++ b/ArduSub/GCS_Mavlink.cpp @@ -206,7 +206,7 @@ void Sub::get_sensor_status_flags(uint32_t &control_sensors_present, } } -void GCS_MAVLINK_Sub::get_sensor_status_flags(uint32_t &control_sensors_present, +void GCS_Sub::get_sensor_status_flags(uint32_t &control_sensors_present, uint32_t &control_sensors_enabled, uint32_t &control_sensors_health) { diff --git a/ArduSub/GCS_Mavlink.h b/ArduSub/GCS_Mavlink.h index 78d4eb7eac..850cb97733 100644 --- a/ArduSub/GCS_Mavlink.h +++ b/ArduSub/GCS_Mavlink.h @@ -52,7 +52,6 @@ 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); int16_t vfr_hud_throttle() const override; diff --git a/ArduSub/GCS_Sub.h b/ArduSub/GCS_Sub.h index 5413e983f8..6c68077f68 100644 --- a/ArduSub/GCS_Sub.h +++ b/ArduSub/GCS_Sub.h @@ -20,6 +20,8 @@ public: return _chan[ofs]; }; + void get_sensor_status_flags(uint32_t &present, uint32_t &enabled, uint32_t &health); + private: GCS_MAVLINK_Sub _chan[MAVLINK_COMM_NUM_BUFFERS];