From 866e00f143721fd98b58e62739bce993edcb16b0 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Tue, 12 Nov 2024 14:56:10 +1100
Subject: [PATCH] GCS_MAVLink: remove handling of HIL_GPS

... per deprecation/removal schedule
---
 libraries/GCS_MAVLink/GCS_Common.cpp | 5 -----
 libraries/GCS_MAVLink/GCS_config.h   | 9 ---------
 2 files changed, 14 deletions(-)

diff --git a/libraries/GCS_MAVLink/GCS_Common.cpp b/libraries/GCS_MAVLink/GCS_Common.cpp
index 69598bf695..806831a345 100644
--- a/libraries/GCS_MAVLink/GCS_Common.cpp
+++ b/libraries/GCS_MAVLink/GCS_Common.cpp
@@ -4303,11 +4303,6 @@ void GCS_MAVLINK::handle_message(const mavlink_message_t &msg)
 #endif
 
 #if AP_GPS_ENABLED
-#if AP_MAVLINK_MSG_HIL_GPS_ENABLED
-    case MAVLINK_MSG_ID_HIL_GPS:
-        send_received_message_deprecation_warning("HIL_GPS");
-        FALLTHROUGH;
-#endif
     case MAVLINK_MSG_ID_GPS_RTCM_DATA:
     case MAVLINK_MSG_ID_GPS_INPUT:
     case MAVLINK_MSG_ID_GPS_INJECT_DATA:
diff --git a/libraries/GCS_MAVLink/GCS_config.h b/libraries/GCS_MAVLink/GCS_config.h
index 5f059cb9a1..2c8800a959 100644
--- a/libraries/GCS_MAVLink/GCS_config.h
+++ b/libraries/GCS_MAVLink/GCS_config.h
@@ -71,15 +71,6 @@
 #define AP_MAVLINK_RALLY_POINT_PROTOCOL_ENABLED HAL_GCS_ENABLED && HAL_RALLY_ENABLED
 #endif
 
-// CODE_REMOVAL
-// handling of HIL_GPS is slated to be removed in 4.7; GPS_INPUT can be used
-// in its place
-// ArduPilot 4.6 stops compiling support in
-// ArduPilot 4.7 removes the code entirely
-#ifndef AP_MAVLINK_MSG_HIL_GPS_ENABLED
-#define AP_MAVLINK_MSG_HIL_GPS_ENABLED 0
-#endif
-
 // CODE_REMOVAL
 // ArduPilot 4.5 sends deprecation warnings for MOUNT_CONTROL/MOUNT_CONFIGURE
 // ArduPilot 4.6 stops compiling them in