Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix exception handling in reporter.py #128

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix exception handling in reporter.py #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions flightgoggles_reporter/src/reporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,11 @@ def __init__(self):

# Read the events from the challenge params
name=rospy.get_param('/uav/challenge_name', '')
if (name == ''):
rospy.logerr("Challenge name could not be read")
rospy.signal_shutdown("Challenge parameter [name] could not be read")

rospy.loginfo("Running challenge %s", name)

# Set a timeout to check if challenge is taking longer than allowed
timeout = rospy.get_param('/uav/timeout', -1)
if (timeout == -1):
rospy.logerr("Timeout not specified!")
rospy.signal_shutdown("Challenge parameter [timeout] could not be read")

rospy.Subscriber("/uav/collision", Empty, self.collisionCallback)

Expand Down Expand Up @@ -154,6 +148,13 @@ def __init__(self):
rospy.loginfo("Completed the challenge")
rospy.signal_shutdown("Challenge complete")

if (name == ''):
rospy.logerr("Challenge name could not be read")
rospy.signal_shutdown("Challenge parameter [name] could not be read")
if (timeout == -1):
rospy.logerr("Timeout not specified!")
rospy.signal_shutdown("Challenge parameter [timeout] could not be read")

rospy.sleep(1./rate)

def imuCallback(self,data):
Expand Down