Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions radio/app/drone.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,24 @@ def __init__(
self.connectionError = str(e)
return

initial_heartbeat = self.master.wait_heartbeat(timeout=5)
if initial_heartbeat is None:
self.logger.error("Heartbeat timed out after 5 seconds")
self.master.close()
try:
initial_heartbeat = self.master.wait_heartbeat(timeout=5)
if initial_heartbeat is None:
self.logger.error("Heartbeat timed out after 5 seconds")
self.master.close()
self.master = None
self.connectionError = "Could not connect to the drone."
return
except Exception as e:
self.logger.error(
"Error while waiting for heartbeat: " + str(e), exc_info=True
)
if self.master is not None:
self.master.close()
self.master = None
self.connectionError = "Could not connect to the drone."
self.connectionError = (
"An error occured while waiting for a heartbeat from the drone."
)
return

self.sendConnectionStatusUpdate(1)
Expand Down