From 0bddf0a5cb4ca2b7083b7d62fc9d599036e4d5c3 Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Wed, 29 Mar 2017 15:31:52 +0200 Subject: [PATCH] Closedown --- script/RobotSC.py | 2 +- script/RobotTCP.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/script/RobotSC.py b/script/RobotSC.py index dcdb408..d734d5b 100644 --- a/script/RobotSC.py +++ b/script/RobotSC.py @@ -32,7 +32,7 @@ class RobotSC(RobotTCP): #TODO: Check safe position RobotTCP.start_task(self, program, *args, **kwargs) - def stop_task(self, program, *args, **kwargs): + def stop_task(self): RobotTCP.stop_task() #TODO: Restore safe position diff --git a/script/RobotTCP.py b/script/RobotTCP.py index 2492fda..809c84f 100644 --- a/script/RobotTCP.py +++ b/script/RobotTCP.py @@ -381,11 +381,11 @@ class RobotTCP(TcpDevice, Stoppable): def start_task(self, program, *args, **kwargs): for task in (self.high_level_tasks + [program]): if self.get_task_status(task)[0]>=0: - raise Exception("Cannot start program - ongoing high-level task: " + task) + raise Exception("Ongoing high-level task: " + task) self.current_task = program self.task_create(program, *args, **kwargs) - def stop_task(self, program, *args, **kwargs): + def stop_task(self): for task in (self.high_level_tasks + [program]): if self.get_task_status(task)[0]>=0: self.task_kill(task)