fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-23 04:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tools/HIL: explain cmd, use monotonic time

Browse Source
This commit is contained in:
Daniel Agar
2021-12-11 15:02:49 -05:00
parent 0f6e30599c
commit b71b908ac7
5 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/HIL/reboot.py
+6 -6
View File
@@ -47,14 +47,14 @@ def monitor_firmware_upload(port, baudrate):
timeout_reboot_cmd = 30
timeout = 300 # 5 minutes
timeout_start = time.time()
timeout_newline = time.time()
timeout_start = time.monotonic()
timeout_newline = time.monotonic()
time_success = 0
return_code = 0
while True:
if time.time() > timeout_start + timeout_reboot_cmd:
if time.monotonic() > timeout_start + timeout_reboot_cmd:
ser.write("reboot\n".encode("ascii"))
serial_line = ser.readline().decode("ascii", errors='ignore')
@@ -66,13 +66,13 @@ def monitor_firmware_upload(port, baudrate):
print_line(serial_line)
if "NuttShell (NSH)" in serial_line:
time_success = time.time()
time_success = time.monotonic()
# wait at least 2 seconds after seeing prompt to catch potential errors
if time_success > 0 and time.time() > time_success + 2:
if time_success > 0 and time.monotonic() > time_success + 2:
sys.exit(return_code)
if time.time() > timeout_start + timeout:
if time.monotonic() > timeout_start + timeout:
print("Error, timeout")
sys.exit(-1)