Skip to content

Commit

Permalink
Minor fix to artifact deconfliction
Browse files Browse the repository at this point in the history
  • Loading branch information
dan-riley committed Aug 21, 2019
1 parent 8c12c13 commit 2415418
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/multi_agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -571,9 +571,8 @@ def deployBeacon(self, inplace, dropReason):
else:
# Wait to stop, send deploy message, then wait for deployment to finish
# rospy.sleep(3)
# self.deploy_pub.publish(True)
self.deploy_pub.publish(True)
# rospy.sleep(10)
pass

# Resume the mission
self.stop_pub.publish(False)
Expand Down Expand Up @@ -705,8 +704,9 @@ def artifactCheck(self, agent, artifacts):
if not ignore:
self.report = True

def artifactCheckReport(self):
# If we didn't add anything new, check if any still need reported
if not self.report and agent.id == self.id:
if not self.report:
for artifact in self.artifacts.values():
if not artifact.reported:
self.report = True
Expand Down Expand Up @@ -759,6 +759,7 @@ def start(self):

# Make sure our internal artifact list is up to date, and if we need to report
self.artifactCheck(self.agent, self.artifacts)
self.artifactCheckReport()

# Change the goal to go home to report
if self.report:
Expand Down

0 comments on commit 2415418

Please sign in to comment.