From f2a4253ed2944e728385fa047dad38fbd206cf94 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] Blimp: adjust for renaming of RC_Channel and GCS_MAVLink
 headers

---
 Blimp/Blimp.h               |  4 ++--
 Blimp/GCS_Blimp.h           |  2 +-
 Blimp/GCS_MAVLink_Blimp.cpp |  2 +-
 Blimp/Parameters.cpp        | 14 +++++++-------
 Blimp/Parameters.h          |  2 +-
 Blimp/RC_Channel_Blimp.cpp  |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Blimp/Blimp.h b/Blimp/Blimp.h
index aa4d2e449d..80d1f723d1 100644
--- a/Blimp/Blimp.h
+++ b/Blimp/Blimp.h
@@ -60,9 +60,9 @@
 #include "Fins.h"
 #include "Loiter.h"
 
-#include "RC_Channel.h"         // RC Channel Library
+#include "RC_Channel_Blimp.h"         // RC Channel Library
 
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Blimp.h"
 #include "GCS_Blimp.h"
 #include "AP_Arming.h"
 
diff --git a/Blimp/GCS_Blimp.h b/Blimp/GCS_Blimp.h
index 315d122498..c05c154190 100644
--- a/Blimp/GCS_Blimp.h
+++ b/Blimp/GCS_Blimp.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <GCS_MAVLink/GCS.h>
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Blimp.h"
 
 class GCS_Blimp : public GCS
 {
diff --git a/Blimp/GCS_MAVLink_Blimp.cpp b/Blimp/GCS_MAVLink_Blimp.cpp
index 1eb5985e81..48bdf93886 100644
--- a/Blimp/GCS_MAVLink_Blimp.cpp
+++ b/Blimp/GCS_MAVLink_Blimp.cpp
@@ -1,6 +1,6 @@
 #include "Blimp.h"
 
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Blimp.h"
 #include <AP_RPM/AP_RPM_config.h>
 #include <AP_OpticalFlow/AP_OpticalFlow_config.h>
 
diff --git a/Blimp/Parameters.cpp b/Blimp/Parameters.cpp
index 7a1d34c239..9a267a3ea6 100644
--- a/Blimp/Parameters.cpp
+++ b/Blimp/Parameters.cpp
@@ -292,42 +292,42 @@ const AP_Param::Info Blimp::var_info[] = {
     GOBJECT(ins,            "INS", AP_InertialSensor),
 
     // @Group: SR0_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Blimp.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_Blimp.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_Blimp.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_Blimp.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_Blimp.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_Blimp.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_Blimp.cpp
     GOBJECTN(_gcs.chan_parameters[6],  gcs6,       "SR6_",     GCS_MAVLINK_Parameters),
 #endif
 
diff --git a/Blimp/Parameters.h b/Blimp/Parameters.h
index fd3f321064..e658bdadce 100644
--- a/Blimp/Parameters.h
+++ b/Blimp/Parameters.h
@@ -3,7 +3,7 @@
 #define AP_PARAM_VEHICLE_NAME blimp
 
 #include <AP_Common/AP_Common.h>
-#include "RC_Channel.h"
+#include "RC_Channel_Blimp.h"
 #include <SRV_Channel/SRV_Channel.h>
 
 // Global parameter class.
diff --git a/Blimp/RC_Channel_Blimp.cpp b/Blimp/RC_Channel_Blimp.cpp
index 6dafa3b8e5..0bf99c36f4 100644
--- a/Blimp/RC_Channel_Blimp.cpp
+++ b/Blimp/RC_Channel_Blimp.cpp
@@ -1,6 +1,6 @@
 #include "Blimp.h"
 
-#include "RC_Channel.h"
+#include "RC_Channel_Blimp.h"
 
 
 // defining these two macros and including the RC_Channels_VarInfo header defines the parameter information common to all vehicle types