diff --git a/script/RobotTCP.py b/script/RobotTCP.py index e53f71f..787895f 100644 --- a/script/RobotTCP.py +++ b/script/RobotTCP.py @@ -349,11 +349,9 @@ class RobotTCP(TcpDevice, Stoppable): if self.state==State.Offline: print "Communication resumed" if self.reset or (self.state==State.Offline): - for task in self.high_level_tasks: - if self.get_task_status(task)[0]>=0: - print "Ongoing task: " + task - self.current_task = task - + get_task() + if self.current_task is not None: + print "Ongoing task: " + task if (not self.settled) or (self.current_task is not None): self.setState(State.Busy) if not self.empty: self.setState(State.Paused) @@ -409,6 +407,19 @@ class RobotTCP(TcpDevice, Stoppable): if self.get_task_status(task)[0]>=0: self.task_kill(task) + def get_task(self): + if (self.current_task is not None): + if self.get_task_status(task)[0]>=0: + return self.current_task + else: + self.current_task = None + for task in self.high_level_tasks: + if self.get_task_status(task)[0]>=0: + self.current_task = task + return task + return None + + def on_event(self,ev): pass