From d3c5369352e316055ac53f02fe5ff5bf62917f57 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Tue, 25 Jul 2017 17:07:26 +1000 Subject: [PATCH] Tracker: handle common GPS messages in base GCS_MAVLINK class --- AntennaTracker/GCS_Mavlink.cpp | 11 +++++------ AntennaTracker/GCS_Mavlink.h | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AntennaTracker/GCS_Mavlink.cpp b/AntennaTracker/GCS_Mavlink.cpp index 883cda8244..82217b22a9 100644 --- a/AntennaTracker/GCS_Mavlink.cpp +++ b/AntennaTracker/GCS_Mavlink.cpp @@ -817,12 +817,6 @@ mission_failed: handle_gps_inject(msg, tracker.gps); break; - case MAVLINK_MSG_ID_GPS_RTCM_DATA: - case MAVLINK_MSG_ID_GPS_INPUT: - case MAVLINK_MSG_ID_HIL_GPS: - tracker.gps.handle_msg(msg); - break; - case MAVLINK_MSG_ID_AUTOPILOT_VERSION_REQUEST: send_autopilot_version(FIRMWARE_VERSION); break; @@ -895,6 +889,11 @@ void Tracker::gcs_retry_deferred(void) gcs().service_statustext(); } +AP_GPS *GCS_MAVLINK_Tracker::get_gps() const +{ + return &tracker.gps; +} + Compass *GCS_MAVLINK_Tracker::get_compass() const { return &tracker.compass; diff --git a/AntennaTracker/GCS_Mavlink.h b/AntennaTracker/GCS_Mavlink.h index 64ac42d053..28d56c12fb 100644 --- a/AntennaTracker/GCS_Mavlink.h +++ b/AntennaTracker/GCS_Mavlink.h @@ -20,6 +20,7 @@ protected: AP_Mission *get_mission() override { return nullptr; }; AP_Rally *get_rally() const override { return nullptr; }; AP_ServoRelayEvents *get_servorelayevents() const override { return nullptr; } + AP_GPS *get_gps() const override; uint8_t sysid_my_gcs() const override;