From 49020a59c93f02cec216410e9f8516cc97fad5b4 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] ArduCopter: adjust for renaming of RC_Channel and GCS_MAVLink
 headers

---
 ArduCopter/Copter.h               |  4 ++--
 ArduCopter/GCS_Copter.h           |  2 +-
 ArduCopter/GCS_MAVLink_Copter.cpp |  2 +-
 ArduCopter/Parameters.cpp         | 14 +++++++-------
 ArduCopter/Parameters.h           |  2 +-
 ArduCopter/RC_Channel_Copter.cpp  |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ArduCopter/Copter.h b/ArduCopter/Copter.h
index a94edddef2..c98efeec3e 100644
--- a/ArduCopter/Copter.h
+++ b/ArduCopter/Copter.h
@@ -87,9 +87,9 @@
  #include <AC_Autorotation/AC_Autorotation.h> // Autorotation controllers
 #endif
 
-#include "RC_Channel.h"         // RC Channel Library
+#include "RC_Channel_Copter.h"         // RC Channel Library
 
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Copter.h"
 #include "GCS_Copter.h"
 #include "AP_Rally.h"           // Rally point library
 #include "AP_Arming.h"
diff --git a/ArduCopter/GCS_Copter.h b/ArduCopter/GCS_Copter.h
index 423857fd6f..4b5e9ee21a 100644
--- a/ArduCopter/GCS_Copter.h
+++ b/ArduCopter/GCS_Copter.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <GCS_MAVLink/GCS.h>
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Copter.h"
 
 class GCS_Copter : public GCS
 {
diff --git a/ArduCopter/GCS_MAVLink_Copter.cpp b/ArduCopter/GCS_MAVLink_Copter.cpp
index 1b5833ec75..1c0f2115d8 100644
--- a/ArduCopter/GCS_MAVLink_Copter.cpp
+++ b/ArduCopter/GCS_MAVLink_Copter.cpp
@@ -1,6 +1,6 @@
 #include "Copter.h"
 
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Copter.h"
 #include <AP_RPM/AP_RPM_config.h>
 #include <AP_EFI/AP_EFI_config.h>
 
diff --git a/ArduCopter/Parameters.cpp b/ArduCopter/Parameters.cpp
index 44a14b1956..94d04cf5ed 100644
--- a/ArduCopter/Parameters.cpp
+++ b/ArduCopter/Parameters.cpp
@@ -503,42 +503,42 @@ const AP_Param::Info Copter::var_info[] = {
     GOBJECTPTR(pos_control, "PSC", AC_PosControl),
 
     // @Group: SR0_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Copter.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_Copter.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_Copter.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_Copter.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_Copter.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_Copter.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_Copter.cpp
     GOBJECTN(_gcs.chan_parameters[6],  gcs6,       "SR6_",     GCS_MAVLINK_Parameters),
 #endif
 
diff --git a/ArduCopter/Parameters.h b/ArduCopter/Parameters.h
index 2a85bc9ee9..f07ebf297e 100644
--- a/ArduCopter/Parameters.h
+++ b/ArduCopter/Parameters.h
@@ -3,7 +3,7 @@
 #define AP_PARAM_VEHICLE_NAME copter
 
 #include <AP_Common/AP_Common.h>
-#include "RC_Channel.h"
+#include "RC_Channel_Copter.h"
 #include <AP_Proximity/AP_Proximity.h>
 
 #if MODE_FOLLOW_ENABLED
diff --git a/ArduCopter/RC_Channel_Copter.cpp b/ArduCopter/RC_Channel_Copter.cpp
index 0e4be776e5..78750a49f3 100644
--- a/ArduCopter/RC_Channel_Copter.cpp
+++ b/ArduCopter/RC_Channel_Copter.cpp
@@ -1,6 +1,6 @@
 #include "Copter.h"
 
-#include "RC_Channel.h"
+#include "RC_Channel_Copter.h"
 
 
 // defining these two macros and including the RC_Channels_VarInfo header defines the parameter information common to all vehicle types