useralerts: use request_message to get autopilot version

ArduPilot · Jan 3, 2024 · dec5234 · dec5234
1 parent a4d3415
commit dec5234
Showing 1 changed file with 18 additions and 25 deletions.
diff --git a/MAVProxy/modules/mavproxy_useralerts.py b/MAVProxy/modules/mavproxy_useralerts.py
@@ -142,31 +142,24 @@ def cmd_doCheck(self):
         the checks for applicable User Alerts'''
         self.board = None
         self.version = None
-        for messageID in [mavutil.mavlink.MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES, mavutil.mavlink.MAV_CMD_DO_SEND_BANNER]:
-            self.master.mav.command_long_send(
-                self.settings.target_system,  # target_system
-                self.settings.target_component, # target_component
-                messageID, # command
-                1, # confirmation
-                1, # param1
-                0, # param2
-                0, # param3
-                0, # param4
-                0, # param5
-                0, # param6
-                0) # param7
-        #self.master.mav.command_long_send(
-        #    self.settings.target_system,  # target_system
-        #    self.settings.target_component, # target_component
-        #    mavutil.mavlink.MAV_CMD_DO_SEND_BANNER, # command
-        #    1, # confirmation
-        #    0, # param1
-        #    0, # param2
-        #    0, # param3
-        #    0, # param4
-        #    0, # param5
-        #    0, # param6
-        #    0) # param7
+        self.master.mav.command_long_send(
+            self.settings.target_system,  # target_system
+            self.settings.target_component, # target_component
+            mavutil.mavlink.MAV_CMD_DO_SEND_BANNER, # command
+            1, # confirmation
+            1, # param1
+            0, # param2
+            0, # param3
+            0, # param4
+            0, # param5
+            0, # param6
+            0) # param7
+        self.master.mav.command_long_send(
+            self.settings.target_system,
+            self.settings.target_component,
+            mavutil.mavlink.MAV_CMD_REQUEST_MESSAGE,
+            0, # confirmation
+            mavutil.mavlink.MAVLINK_MSG_ID_AUTOPILOT_VERSION, 0, 0, 0, 0, 0, 0)
 
     def cmd_check(self, args):
         '''Useralert operations'''