From 8870805d3c3055a8e8948eecbda13cb6c03bde4a Mon Sep 17 00:00:00 2001 From: srrizviii Date: Tue, 7 Oct 2025 17:42:00 -0600 Subject: [PATCH 1/2] Created a timeout for wait_vehicle_armed() in navigator.py --- mavctl/messages/Navigator.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/mavctl/messages/Navigator.py b/mavctl/messages/Navigator.py index ebd6b36..c19fc14 100644 --- a/mavctl/messages/Navigator.py +++ b/mavctl/messages/Navigator.py @@ -40,13 +40,28 @@ def arm(self): self.mav.motors_armed_wait() print("MAVCTL: Armed!") - def wait_vehicle_armed(self): + def wait_vehicle_armed(self, timeout = None) -> bool: """ Waits for the vehicle to be armed. See samples directory for examples """ + start_time = time.time() print("MAVCTL: Waiting for vehicle to arm") - self.mav.motors_armed_wait() - print("Armed!") + + if timeout is None: + self.mav.motors_armed_wait() + print("MAVCTL: Armed!") + return True + + else: + while True: + if time.time() - start_time >= timeout: + print("MAVCTL: Waiting for vehicle to arm") + return False + + if self.mav.motors_armed_wait: + print("MAVCTL: Armed!") + return True + def disarm(self): """ From cf68ee39c61aed8aac3e3f00eb251e30ee82e917 Mon Sep 17 00:00:00 2001 From: srrizviii Date: Thu, 9 Oct 2025 12:46:14 -0600 Subject: [PATCH 2/2] Fixed syntax from self.motors_armed_wait (object) to self.motors_armed_wait() (function) --- mavctl/messages/Navigator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mavctl/messages/Navigator.py b/mavctl/messages/Navigator.py index c19fc14..6a84586 100644 --- a/mavctl/messages/Navigator.py +++ b/mavctl/messages/Navigator.py @@ -58,7 +58,7 @@ def wait_vehicle_armed(self, timeout = None) -> bool: print("MAVCTL: Waiting for vehicle to arm") return False - if self.mav.motors_armed_wait: + if self.mav.motors_armed_wait(): print("MAVCTL: Armed!") return True