Merge pull request #1058 from anarkiwi/batch

Create more than one image per interval.

docker/Dockerfile.base

@@ -28,7 +28,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libvulkan-dev \
   python3-numpy
 WORKDIR /root
-RUN git clone https://github.com/iqtlabs/gr-iqtlabs -b 1.0.58
+RUN git clone https://github.com/iqtlabs/gr-iqtlabs -b 1.0.59
 COPY --from=iqtlabs/gamutrf-vkfft:latest /root /root/gr-iqtlabs
 WORKDIR /root/gr-iqtlabs/build
 COPY --from=sigmf-builder /usr/local /usr/local

gamutrf/grscan.py

@@ -78,8 +78,10 @@ def __init__(
         gr.top_block.__init__(self, "scan", catch_exceptions=True)
 
         tune_step_hz = int(samp_rate * tuneoverlap)
+        stare = False
 
         if freq_end == 0:
+            stare = True
             freq_end = freq_start + (tune_step_hz - 1)
             logging.info(
                 f"using stare mode, scan from {freq_start/1e6}MHz to {freq_end/1e6}MHz"
@@ -154,6 +156,8 @@ def __init__(
         logging.info(
             f"requested retuning across {freq_range/1e6}MHz every {tune_step_fft} FFTs, dwell time {tune_dwell_ms}ms"
         )
+        if stare and tune_dwell_ms > 1e3:
+            logging.warn(">1s dwell time in stare mode, updates will be slow!")
 
         self.fft_blocks = (
             self.get_dc_blocks(dc_block_len, dc_block_long)

gamutrf/grsource.py

@@ -37,13 +37,13 @@ def airt_workaround_start_hook(self):
         self.sources[0].set_bandwidth(0, rate)
 
 
-class file_source_tagger(gr.sync_block):
+class file_source_tagger(gr.basic_block):
     def __init__(
         self,
         input_file,
         cmd_port,
     ):
-        gr.sync_block.__init__(
+        gr.basic_block.__init__(
             self,
             name="file_source_tagger",
             in_sig=None,
@@ -71,17 +71,17 @@ def add_tags(self):
             pmt.from_double(self.center_freq),
         )
 
-    def work(self, input_items, output_items):
+    def general_work(self, input_items, output_items):
         if self.complete():
-            return 0
+            return -1
         if self.need_tags:
             self.add_tags()
             self.need_tags = False
         n = len(output_items[0])
         samples = self.samples[self.i : self.i + n]
         if len(samples) < n:
             self.i = self.n_samples
-            return 0
+            return -1
         self.i += len(samples)
         output_items[0][:] = samples
         return len(samples)

gamutrf/offline.py

@@ -38,14 +38,12 @@ def main():
                 "iqtlabs": iqtlabs,
                 "freq_end": 0,
                 "freq_start": freq_start,
-                "pretune": True,
                 "samp_rate": int(meta["sample_rate"]),
                 "sdr": "file:" + filename,
+                "pretune": True,
             }
         )
         tb = grscan(**scan_args)
         tb.start()
-        while not tb.sources[0].complete():
-            time.sleep(1)
-        tb.stop()
         tb.wait()
+        tb.stop()