From abdd72ea95ba1637cbe54ffb3a9b9a3482b1418b Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Mon, 23 Dec 2024 13:26:52 +1100
Subject: [PATCH] AntennaTracker: adjust for renaming of RC_Channel and
 GCS_MAVLink headers

---
 AntennaTracker/GCS_MAVLink_Tracker.cpp |  2 +-
 AntennaTracker/GCS_Tracker.h           |  2 +-
 AntennaTracker/Parameters.cpp          | 14 +++++++-------
 AntennaTracker/RC_Channel_Tracker.cpp  |  2 +-
 AntennaTracker/Tracker.h               |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/AntennaTracker/GCS_MAVLink_Tracker.cpp b/AntennaTracker/GCS_MAVLink_Tracker.cpp
index c9ec2050c7..eb3141b259 100644
--- a/AntennaTracker/GCS_MAVLink_Tracker.cpp
+++ b/AntennaTracker/GCS_MAVLink_Tracker.cpp
@@ -1,4 +1,4 @@
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Tracker.h"
 #include "Tracker.h"
 
 MAV_TYPE GCS_Tracker::frame_type() const
diff --git a/AntennaTracker/GCS_Tracker.h b/AntennaTracker/GCS_Tracker.h
index 30cfaef564..b58d28157b 100644
--- a/AntennaTracker/GCS_Tracker.h
+++ b/AntennaTracker/GCS_Tracker.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <GCS_MAVLink/GCS.h>
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Tracker.h"
 
 class GCS_Tracker : public GCS
 {
diff --git a/AntennaTracker/Parameters.cpp b/AntennaTracker/Parameters.cpp
index 2c0b1f3e86..cfbd8fed2a 100644
--- a/AntennaTracker/Parameters.cpp
+++ b/AntennaTracker/Parameters.cpp
@@ -222,42 +222,42 @@ const AP_Param::Info Tracker::var_info[] = {
     GOBJECT(scheduler, "SCHED_", AP_Scheduler),
 
     // @Group: SR0_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Tracker.cpp
     GOBJECTN(_gcs.chan_parameters[0], gcs0,        "SR0_",     GCS_MAVLINK_Parameters),
 
 #if MAVLINK_COMM_NUM_BUFFERS >= 2
     // @Group: SR1_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Tracker.cpp
     GOBJECTN(_gcs.chan_parameters[1],  gcs1,       "SR1_",     GCS_MAVLINK_Parameters),
 #endif
 
 #if MAVLINK_COMM_NUM_BUFFERS >= 3
     // @Group: SR2_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Tracker.cpp
     GOBJECTN(_gcs.chan_parameters[2],  gcs2,       "SR2_",     GCS_MAVLINK_Parameters),
 #endif
 
 #if MAVLINK_COMM_NUM_BUFFERS >= 4
     // @Group: SR3_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Tracker.cpp
     GOBJECTN(_gcs.chan_parameters[3],  gcs3,       "SR3_",     GCS_MAVLINK_Parameters),
 #endif
 
 #if MAVLINK_COMM_NUM_BUFFERS >= 5
     // @Group: SR4_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Tracker.cpp
     GOBJECTN(_gcs.chan_parameters[4],  gcs4,       "SR4_",     GCS_MAVLINK_Parameters),
 #endif
 
 #if MAVLINK_COMM_NUM_BUFFERS >= 6
     // @Group: SR5_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Tracker.cpp
     GOBJECTN(_gcs.chan_parameters[5],  gcs5,       "SR5_",     GCS_MAVLINK_Parameters),
 #endif
 
 #if MAVLINK_COMM_NUM_BUFFERS >= 7
     // @Group: SR6_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Tracker.cpp
     GOBJECTN(_gcs.chan_parameters[6],  gcs6,       "SR6_",     GCS_MAVLINK_Parameters),
 #endif
 
diff --git a/AntennaTracker/RC_Channel_Tracker.cpp b/AntennaTracker/RC_Channel_Tracker.cpp
index 9b0ecbf239..3854e3aefd 100644
--- a/AntennaTracker/RC_Channel_Tracker.cpp
+++ b/AntennaTracker/RC_Channel_Tracker.cpp
@@ -1,6 +1,6 @@
 #include "Tracker.h"
 
-#include "RC_Channel.h"
+#include "RC_Channel_Tracker.h"
 
 // defining these two macros and including the RC_Channels_VarInfo
 // header defines the parameter information common to all vehicle
diff --git a/AntennaTracker/Tracker.h b/AntennaTracker/Tracker.h
index 975a271b6e..18a73036fc 100644
--- a/AntennaTracker/Tracker.h
+++ b/AntennaTracker/Tracker.h
@@ -46,9 +46,9 @@
 #include "config.h"
 #include "defines.h"
 
-#include "RC_Channel.h"
+#include "RC_Channel_Tracker.h"
 #include "Parameters.h"
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Tracker.h"
 #include "GCS_Tracker.h"
 
 #include "AP_Arming.h"