From fbac6cefbfd7b92b51d8182e3ef3682c7453ede4 Mon Sep 17 00:00:00 2001
From: Josh Bailey <josh@vandervecken.com>
Date: Wed, 24 Jul 2024 00:27:31 +0000
Subject: [PATCH 1/3] remove iq_inference_len.

---
 gamutrf/grscan.py |  3 +--
 gamutrf/scan.py   | 10 ----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/gamutrf/grscan.py b/gamutrf/grscan.py
index a159b814..5bd4555d 100644
--- a/gamutrf/grscan.py
+++ b/gamutrf/grscan.py
@@ -61,7 +61,6 @@ def __init__(
         inference_port=10001,
         inference_text_color="",
         iq_inference_background=True,
-        iq_inference_len=1024,
         iq_inference_model_name="",
         iq_inference_model_server="",
         iq_inference_squelch_db=None,
@@ -321,7 +320,7 @@ def __init__(
             self.iq_inference_block = iqtlabs.iq_inference(
                 tag="rx_freq",
                 vlen=nfft,
-                n_vlen=int(iq_inference_len / nfft),
+                n_vlen=1,
                 sample_buffer=tune_step_fft,
                 min_peak_points=inference_min_db,
                 model_server=iq_inference_model_server,
diff --git a/gamutrf/scan.py b/gamutrf/scan.py
index b6739b69..c92615da 100644
--- a/gamutrf/scan.py
+++ b/gamutrf/scan.py
@@ -322,13 +322,6 @@ def argument_parser():
         default=1e-4,
         help="I/Q inference power squelch alpha",
     )
-    parser.add_argument(
-        "--iq_inference_len",
-        dest="iq_inference_len",
-        type=int,
-        default=1024,
-        help="number of samples to send for I/Q inference",
-    )
     parser.add_argument(
         "--iq_inference_model_name",
         dest="iq_inference_model_name",
@@ -526,9 +519,6 @@ def check_options(options):
     if options.samp_rate % options.nfft:
         print("NFFT should be a factor of sample rate")
 
-    if options.iq_inference_len % options.nfft:
-        return "NFFT should be a factor of I/Q inference length"
-
     if options.freq_end:
         if options.freq_start > options.freq_end:
             return "freq_start must be less than freq_end"

From c789daa54985d66bbc59611154d428eaf53a5d26 Mon Sep 17 00:00:00 2001
From: Josh Bailey <josh@vandervecken.com>
Date: Wed, 24 Jul 2024 02:02:39 +0000
Subject: [PATCH 2/3] dep again.

---
 .github/workflows/ci-test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index bfcf1301..9aa74bc9 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -44,7 +44,9 @@ jobs:
       - name: install gnuradio
         run: |
           sudo add-apt-repository ppa:gnuradio/gnuradio-releases && sudo apt-get update && \
-            sudo apt-get install -y --no-install-recommends gnuradio-dev python3-packaging
+            sudo apt-get install -y --no-install-recommends gnuradio-dev python3-packaging && \
+            sudo pip3 install -U pyserial requests numpy scipy && \
+            sudo dpkg -r --force-depends python3-numpy python3-requests
       - name: Install dependencies
         run: |
           for repodir in flatbuffers json libsigmf gr-iqtlabs ; do \
@@ -56,9 +58,7 @@ jobs:
           poetry install --no-interaction -C gamutrflib && \
           poetry install --no-interaction -C gamutrfwaterfall && \
           poetry install --no-interaction -C utils/mavlink-api && \
-          poetry install --no-interaction && \
-          sudo pip3 install -U pyserial requests && \
-          sudo dpkg -r --force-depends python3-numpy python3-requests
+          poetry install --no-interaction
       - name: Code Quality - yamllint
         run: |
           yamllint -s *yml

From 61ef9508d221ce4af04b776ecd0be70460320c8f Mon Sep 17 00:00:00 2001
From: Josh Bailey <josh@vandervecken.com>
Date: Wed, 24 Jul 2024 05:50:08 +0000
Subject: [PATCH 3/3] Revert "dep again."

This reverts commit c789daa54985d66bbc59611154d428eaf53a5d26.
---
 .github/workflows/ci-test.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index 9aa74bc9..bfcf1301 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -44,9 +44,7 @@ jobs:
       - name: install gnuradio
         run: |
           sudo add-apt-repository ppa:gnuradio/gnuradio-releases && sudo apt-get update && \
-            sudo apt-get install -y --no-install-recommends gnuradio-dev python3-packaging && \
-            sudo pip3 install -U pyserial requests numpy scipy && \
-            sudo dpkg -r --force-depends python3-numpy python3-requests
+            sudo apt-get install -y --no-install-recommends gnuradio-dev python3-packaging
       - name: Install dependencies
         run: |
           for repodir in flatbuffers json libsigmf gr-iqtlabs ; do \
@@ -58,7 +56,9 @@ jobs:
           poetry install --no-interaction -C gamutrflib && \
           poetry install --no-interaction -C gamutrfwaterfall && \
           poetry install --no-interaction -C utils/mavlink-api && \
-          poetry install --no-interaction
+          poetry install --no-interaction && \
+          sudo pip3 install -U pyserial requests && \
+          sudo dpkg -r --force-depends python3-numpy python3-requests
       - name: Code Quality - yamllint
         run: |
           yamllint -s *yml