GCS_MAVLink: move sysid_my_gcs to be public

bugobliterator · Sep 14, 2023 · 2b53793 · 2b53793
1 parent 12ac07b
commit 2b53793
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libraries/GCS_MAVLink/GCS.h b/libraries/GCS_MAVLink/GCS.h
@@ -1144,9 +1144,10 @@ class GCS
     void enable_high_latency_connections(bool enabled);
 #endif // HAL_HIGH_LATENCY2_ENABLED
 
+    virtual uint8_t sysid_this_mav() const = 0;
+
 protected:
 
-    virtual uint8_t sysid_this_mav() const = 0;
 
     virtual GCS_MAVLINK *new_gcs_mavlink_backend(GCS_MAVLINK_Parameters &params,
                                                  AP_HAL::UARTDriver &uart) = 0;

diff --git a/libraries/GCS_MAVLink/GCS_Dummy.h b/libraries/GCS_MAVLink/GCS_Dummy.h
@@ -23,11 +23,10 @@ class GCS_MAVLINK_Dummy : public GCS_MAVLINK
     void handleMessage(const mavlink_message_t &msg) override {}
     bool try_send_message(enum ap_message id) override { return true; }
     bool handle_guided_request(AP_Mission::Mission_Command &cmd) override { return true; }
+    uint8_t sysid_my_gcs() const override { return 1; }
 
 protected:
 
-    uint8_t sysid_my_gcs() const override { return 1; }
-
     // dummy information:
     MAV_MODE base_mode() const override { return (MAV_MODE)MAV_MODE_FLAG_CUSTOM_MODE_ENABLED; }
     MAV_STATE vehicle_system_status() const override { return MAV_STATE_CALIBRATING; }