Closedown

This commit is contained in:
gac-S_Changer
2017-03-29 16:10:53 +02:00
parent 371cd3cd77
commit 1cc4d2a0fe

View File

@@ -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