From 1cc4d2a0fe109e95277390bb116c66f606a97c1f Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Wed, 29 Mar 2017 16:10:53 +0200 Subject: [PATCH] Closedown --- script/RobotTCP.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/RobotTCP.py b/script/RobotTCP.py index 3b16571..84e881a 100644 --- a/script/RobotTCP.py +++ b/script/RobotTCP.py @@ -348,10 +348,10 @@ class RobotTCP(TcpDevice, Stoppable): #self.setState(State.Busy if self.status=="move" else State.Ready) if self.state==State.Offline: print "Communication resumed" - #if self.reset or (self.state==State.Offline): - # get_task() - # if self.current_task is not None: - # print "Ongoing task: " + task + if self.reset or (self.state==State.Offline): + 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) @@ -408,8 +408,8 @@ class RobotTCP(TcpDevice, Stoppable): self.task_kill(task) def get_task(self): - if (self.current_task is not None): - if self.get_task_status(task)[0]>=0: + if self.current_task is not None: + if self.get_task_status(self.current_task)[0]>=0: return self.current_task else: self.current_task = None