From d340ad044d68914d6930ddc621c6b4f064d629a4 Mon Sep 17 00:00:00 2001 From: bmy <2583236812@qq.com> Date: Sun, 16 Jun 2024 17:52:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8A=A8=E4=BD=9C?= =?UTF-8?q?=E9=98=9F=E5=88=97=E7=BA=BF=E7=A8=8B=E5=AE=89=E5=85=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- action.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/action.py b/action.py index 19c71b5..8b987dd 100644 --- a/action.py +++ b/action.py @@ -187,27 +187,40 @@ class cmd_cls(): class axis_cls(): def __init__(self) -> None: self.axis_queue = queue.Queue() + self.busy = False pass def axis_z(self, _distance, _time_via = -1): + while self.busy is True: + pass self.axis_queue.put(lambda: cmd.z(20, _distance, _time_via)) pass def axis_z2(self, _position, _time_via = -1): + while self.busy is True: + pass self.axis_queue.put(lambda: cmd.z2(20, _position, _time_via)) pass def axis_x(self, _distance, _time_via = -1): + while self.busy is True: + pass self.axis_queue.put(lambda: cmd.x(1, _distance, _time_via)) pass def axis_x2(self, _position, _time_via = -1): + while self.busy is True: + pass self.axis_queue.put(lambda: cmd.x2(1, _position, _time_via)) pass def pop(self): + self.busy = True while self.axis_queue.qsize() > 0: logger.info(f"axis cmd {self.axis_queue.qsize()}") self.axis_queue.get()() self.axis_queue.task_done() time.sleep(0.005) + self.busy = False pass def exec(self, _block:bool = True): + while self.busy is True: + pass if _block is True: self.pop() else: