From 4027b32b078e35d4ac930efd989394e0d782b750 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Wed, 28 Feb 2024 15:46:24 +1100
Subject: [PATCH] Blimp: move serial_manager parameters up to base class

---
 Blimp/Parameters.cpp | 13 ++++++++++---
 Blimp/Parameters.h   |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Blimp/Parameters.cpp b/Blimp/Parameters.cpp
index f9f11e44f0..70d5e76e7e 100644
--- a/Blimp/Parameters.cpp
+++ b/Blimp/Parameters.cpp
@@ -62,9 +62,7 @@ const AP_Param::Info Blimp::var_info[] = {
     // @Bitmask: 0:Feedback from mid stick,1:High throttle cancels landing,2:Disarm on land detection
     GSCALAR(throttle_behavior, "PILOT_THR_BHV", 0),
 
-    // @Group: SERIAL
-    // @Path: ../libraries/AP_SerialManager/AP_SerialManager.cpp
-    GOBJECT(serial_manager, "SERIAL",   AP_SerialManager),
+    // SerialManager was here
 
     // @Param: TELEM_DELAY
     // @DisplayName: Telemetry startup delay
@@ -859,6 +857,15 @@ void Blimp::load_parameters(void)
     AP_Param::convert_class(g.k_param_logger, &logger, logger.var_info, 0, true);
 #endif
 
+    static const AP_Param::TopLevelObjectConversion toplevel_conversions[] {
+#if AP_SERIALMANAGER_ENABLED
+        // PARAMETER_CONVERSION - Added: Feb-2024
+        { &serial_manager, serial_manager.var_info, Parameters::k_param_serial_manager_old },
+#endif
+    };
+
+    AP_Param::convert_toplevel_objects(toplevel_conversions, ARRAY_SIZE(toplevel_conversions));
+
     // setup AP_Param frame type flags
     AP_Param::set_frame_type_flags(AP_PARAM_FRAME_BLIMP);
 }
diff --git a/Blimp/Parameters.h b/Blimp/Parameters.h
index 769e9d2df7..fd3f321064 100644
--- a/Blimp/Parameters.h
+++ b/Blimp/Parameters.h
@@ -134,7 +134,7 @@ public:
         k_param_sysid_my_gcs,
         k_param_telem_delay,
         k_param_gcs2,
-        k_param_serial_manager,
+        k_param_serial_manager_old,
         k_param_gcs3,
         k_param_gcs_pid_mask,
         k_param_gcs4,