fixes

spf/grbl_sdr_collect_v2.py

@@ -137,18 +137,22 @@ def read_forever(self):
 
 
 def grbl_thread_runner(gm, routine):
-    direction = None
     global run_collection
     while run_collection:
         logging.info("GRBL thread runner")
-        try:
-            if routine in gm.routines:
-                logging.info(f"RUNNING ROUTINE {routine}")
-                gm.routines[routine]()
-            else:
-                raise ValueError(f"Unknown grbl routine f{routine}")
-        except Exception as e:
-            logging.error(e)
+        if routine is None:
+            logging.info("No routine to run, just spining")
+            while run_collection:
+                time.sleep(0.5)
+        else:
+            try:
+                if routine in gm.routines:
+                    logging.info(f"RUNNING ROUTINE {routine}")
+                    gm.routines[routine]()
+                else:
+                    raise ValueError(f"Unknown grbl routine f{routine}")
+            except Exception as e:
+                logging.error(e)
         if not run_collection:
             break
         logging.info("GRBL thread runner loop")
@@ -174,11 +178,7 @@ def grbl_thread_runner(gm, routine):
         required=False,
     )
     parser.add_argument(
-        "-r",
-        "--routine",
-        type=str,
-        help="GRBL routine",
-        required=True,
+        "-r", "--routine", type=str, help="GRBL routine", required=False, default=None
     )
     parser.add_argument(
         "-s",
@@ -198,14 +198,14 @@ def grbl_thread_runner(gm, routine):
     )
     args = parser.parse_args()
 
-
     run_started_at = datetime.now().strftime("%Y_%m_%d_%H_%M_%S")
     # read YAML
     with open(args.yaml_config, "r") as stream:
         yaml_config = yaml.safe_load(stream)
 
     # add in our current config
-    yaml_config['routine']=args.routine
+    if args.routine is not None:
+        yaml_config["routine"] = args.routine
 
     output_files_prefix = f"wallarrayv2_{run_started_at}_nRX{len(yaml_config['receivers'])}_{yaml_config['routine']}"
 
@@ -218,7 +218,7 @@ def grbl_thread_runner(gm, routine):
         format="%(asctime)s:%(levelname)s:%(message)s",
         level=getattr(logging, args.logging_level.upper(), None),
     )
-    if args.grbl_serial==None:
+    if args.grbl_serial is None:
         logging.info("Running without GRBL SERIAL!!")
         for x in range(50):
             if not run_collection:
@@ -292,7 +292,7 @@ def grbl_thread_runner(gm, routine):
             )
             if pplus_rx is None or pplus_tx is None:
                 logging.info("Failed to bring RXTX online, shuttingdown")
-                run_collection=False
+                run_collection = False
                 break
             else:
                 logging.debug("RX online!")
@@ -349,7 +349,7 @@ def grbl_thread_runner(gm, routine):
     time_offset = time.time()
     if run_collection:
         for pplus_rx in receiver_pplus:
-            if pplus_rx == None:
+            if pplus_rx is None:
                 continue
             read_thread = ThreadedRX(
                 pplus_rx, time_offset, nthetas=yaml_config["n-thetas"]

spf/v2_configs/wall_array_v2.yaml

@@ -57,3 +57,4 @@ n-thetas: 65
 n-records-per-receiver: 300000
 width: 4000
 calibration-frames: 800
+routine: null

spf/v2_configs/wall_array_v2_noserial.yaml

@@ -57,5 +57,5 @@ output-file: wallarrayv2___DATE__.npy
 n-thetas: 65
 n-records-per-receiver: 300000
 width: 4000
-routine: v1_calibrate
+routine: null