Browse Source

Tracker: move base_mode and frame_type into GCS from GCS_MAVLink

master
Peter Barker 6 years ago committed by Peter Barker
parent
commit
4e49e89b33
  1. 4
      AntennaTracker/GCS_Mavlink.cpp
  2. 2
      AntennaTracker/GCS_Mavlink.h
  3. 3
      AntennaTracker/GCS_Tracker.h

4
AntennaTracker/GCS_Mavlink.cpp

@ -12,7 +12,7 @@
* pattern below when adding any new messages * pattern below when adding any new messages
*/ */
MAV_TYPE GCS_MAVLINK_Tracker::frame_type() const MAV_TYPE GCS_Tracker::frame_type() const
{ {
return MAV_TYPE_ANTENNA_TRACKER; return MAV_TYPE_ANTENNA_TRACKER;
} }
@ -60,7 +60,7 @@ MAV_MODE GCS_MAVLINK_Tracker::base_mode() const
return (MAV_MODE)_base_mode; return (MAV_MODE)_base_mode;
} }
uint32_t GCS_MAVLINK_Tracker::custom_mode() const uint32_t GCS_Tracker::custom_mode() const
{ {
return tracker.control_mode; return tracker.control_mode;
} }

2
AntennaTracker/GCS_Mavlink.h

@ -44,9 +44,7 @@ private:
void handle_change_alt_request(AP_Mission::Mission_Command &cmd) override; void handle_change_alt_request(AP_Mission::Mission_Command &cmd) override;
void send_global_position_int() override; void send_global_position_int() override;
MAV_TYPE frame_type() const override;
MAV_MODE base_mode() const override; MAV_MODE base_mode() const override;
uint32_t custom_mode() const override;
MAV_STATE system_status() const override; MAV_STATE system_status() const override;
}; };

3
AntennaTracker/GCS_Tracker.h

@ -19,6 +19,9 @@ public:
void update_sensor_status_flags() override; void update_sensor_status_flags() override;
uint32_t custom_mode() const override;
MAV_TYPE frame_type() const override;
private: private:
void request_datastream_position(uint8_t sysid, uint8_t compid); void request_datastream_position(uint8_t sysid, uint8_t compid);

Loading…
Cancel
Save