Merge pull request #1256 from anarkiwi/inf3

Add inference output to sample write.

docker/Dockerfile.base

@@ -14,7 +14,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.95
+RUN git clone https://github.com/iqtlabs/gr-iqtlabs -b 1.0.96
 COPY --from=iqtlabs/gamutrf-vkfft:latest /root /root/gr-iqtlabs
 WORKDIR /root/gr-iqtlabs/build
 COPY --from=iqtlabs/gamutrf-sigmf:latest /usr/local /usr/local

gamutrf/grscan.py

@@ -183,6 +183,7 @@ def __init__(
         self.last_db_block = self.fft_blocks[-1]
         fft_dir = ""
         self.samples_blocks = []
+        self.write_samples_block = None
         if write_samples:
             fft_dir = sample_dir
             Path(sample_dir).mkdir(parents=True, exist_ok=True)
@@ -211,6 +212,8 @@ def __init__(
                     ),
                 ]
             )
+            self.write_samples_block = self.samples_blocks[-1]
+
         retune_fft = self.iqtlabs.retune_fft(
             tag="rx_freq",
             nfft=nfft,
@@ -314,6 +317,11 @@ def __init__(
                 power_inference=iq_power_inference,
             )
             self.inference_blocks.append(self.iq_inference_block)
+            if self.write_samples_block:
+                self.msg_connect(
+                    (self.iq_inference_block, "inference"),
+                    (self.write_samples_block, "inference"),
+                )
 
         # TODO: provide new block that receives JSON-over-PMT and outputs to MQTT/zmq.
         retune_fft_output_block = None