Browse Source

Sub: move sensor flags to be a GCS thing rather than a GCS_MAVLINK thing

master
Peter Barker 6 years ago committed by Peter Barker
parent
commit
bb706305d0
  1. 2
      ArduSub/GCS_Mavlink.cpp
  2. 1
      ArduSub/GCS_Mavlink.h
  3. 2
      ArduSub/GCS_Sub.h

2
ArduSub/GCS_Mavlink.cpp

@ -206,7 +206,7 @@ void Sub::get_sensor_status_flags(uint32_t &control_sensors_present, @@ -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)
{

1
ArduSub/GCS_Mavlink.h

@ -52,7 +52,6 @@ private: @@ -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;

2
ArduSub/GCS_Sub.h

@ -20,6 +20,8 @@ public: @@ -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];

Loading…
Cancel
Save