diff --git a/script/RobotTCP.py b/script/RobotTCP.py index 782e8aa..037ae78 100644 --- a/script/RobotTCP.py +++ b/script/RobotTCP.py @@ -362,17 +362,19 @@ class RobotTCP(TcpDevice, Stoppable): try: start = time.time() #sts = self._sendReceive("EVT").strip().split(self.array_separator) - sts = self.execute("get_status") + sts = self.execute("get_status", self.current_task) self._update_working_mode(int(sts[0]), int(sts[1])) self.powered = sts[2] == "1" self.speed = int(sts[3]) self.empty = sts[4] == "1" self.settled = sts[5] == "1" - ev = sts[6] if len(sts)>6 else "" + task_running = sts[6] >=0 + ev = sts[7] if len(sts)>7 else "" if len(ev.strip()) >0: self.getLogger().info(ev) self.on_event(ev) - if (self.current_task is not None) and (self.get_task_status(self.current_task)[0]<0): + #if (self.current_task is not None) and (self.get_task_status(self.current_task)[0]<0): + if not sts[6]: self.current_task = None self._update_state() self.reset = False