Merge branch 'main' of github.com:misko/spf

misko · Mar 23, 2024 · 7a28dc1 · 7a28dc1
2 parents 1176272 + 6f0532b
commit 7a28dc1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/spf/grbl/grbl_interactive.py b/spf/grbl/grbl_interactive.py
@@ -628,10 +628,10 @@ def __init__(self, controller, routine):
         }
         self.ready = threading.Lock()
         self.ready.acquire()
-        assert routine is not None
         self.routine = routine
         self.planner_started_moving = False
-        self.planner_thread = threading.Thread(target=self.run_planner, daemon=True)
+        if self.routine is not None:
+            self.planner_thread = threading.Thread(target=self.run_planner, daemon=True)
 
     def has_planner_started_moving(self):
         return self.planner_started_moving
@@ -784,7 +784,7 @@ def get_default_gm(serial_fn, routine, unsafe=False):
         level=logging.DEBUG,
     )
 
-    gm = get_default_gm(args.serial, unsafe=args.unsafe)
+    gm = get_default_gm(args.serial, unsafe=args.unsafe, routine=None)
 
     if gm.controller.position["is_moving"]:
         print("Waiting for grbl to stop moving before starting...")