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

---
 ArduPlane/GCS_MAVLink_Plane.cpp |  2 +-
 ArduPlane/GCS_Plane.h           |  2 +-
 ArduPlane/Parameters.cpp        | 14 +++++++-------
 ArduPlane/Plane.h               |  4 ++--
 ArduPlane/RC_Channel_Plane.cpp  |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ArduPlane/GCS_MAVLink_Plane.cpp b/ArduPlane/GCS_MAVLink_Plane.cpp
index 7aaba22f70..17b723fdc5 100644
--- a/ArduPlane/GCS_MAVLink_Plane.cpp
+++ b/ArduPlane/GCS_MAVLink_Plane.cpp
@@ -1,4 +1,4 @@
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Plane.h"
 
 #include "Plane.h"
 #include <AP_RPM/AP_RPM_config.h>
diff --git a/ArduPlane/GCS_Plane.h b/ArduPlane/GCS_Plane.h
index 9d5ca814e5..35174f941a 100644
--- a/ArduPlane/GCS_Plane.h
+++ b/ArduPlane/GCS_Plane.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <GCS_MAVLink/GCS.h>
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Plane.h"
 
 class GCS_Plane : public GCS
 {
diff --git a/ArduPlane/Parameters.cpp b/ArduPlane/Parameters.cpp
index 78d30542f7..df62bcd653 100644
--- a/ArduPlane/Parameters.cpp
+++ b/ArduPlane/Parameters.cpp
@@ -877,42 +877,42 @@ const AP_Param::Info Plane::var_info[] = {
     GOBJECT(rcmap,                "RCMAP_",         RCMapper),
 
     // @Group: SR0_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Plane.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_Plane.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_Plane.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_Plane.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_Plane.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_Plane.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_Plane.cpp
     GOBJECTN(_gcs.chan_parameters[6],  gcs6,       "SR6_",     GCS_MAVLINK_Parameters),
 #endif
 
diff --git a/ArduPlane/Plane.h b/ArduPlane/Plane.h
index ec66ada1b2..88ade0d534 100644
--- a/ArduPlane/Plane.h
+++ b/ArduPlane/Plane.h
@@ -92,7 +92,7 @@
  # include <AC_PrecLand/AC_PrecLand.h>
 #endif
 
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Plane.h"
 #include "GCS_Plane.h"
 #include "quadplane.h"
 #include <AP_Tuning/AP_Tuning_config.h>
@@ -115,7 +115,7 @@
 #include <AP_Scripting/AP_Scripting.h>
 #endif
 
-#include "RC_Channel.h"     // RC Channel Library
+#include "RC_Channel_Plane.h"     // RC Channel Library
 #include "Parameters.h"
 #if HAL_ADSB_ENABLED
 #include "avoidance_adsb.h"
diff --git a/ArduPlane/RC_Channel_Plane.cpp b/ArduPlane/RC_Channel_Plane.cpp
index acd4c8531e..67450cafa1 100644
--- a/ArduPlane/RC_Channel_Plane.cpp
+++ b/ArduPlane/RC_Channel_Plane.cpp
@@ -1,6 +1,6 @@
 #include "Plane.h"
 
-#include "RC_Channel.h"
+#include "RC_Channel_Plane.h"
 #include "qautotune.h"
 
 // defining these two macros and including the RC_Channels_VarInfo