From babe562a9d61f18bd35e7d9479a6799532857682 Mon Sep 17 00:00:00 2001 From: Doug Boulware Date: Tue, 9 Aug 2022 14:51:54 -0600 Subject: [PATCH 01/12] Use MultiSwitchStatus branch of scos-actions. --- requirements-dev.txt | 2 +- requirements.in | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 71e3718..edddb33 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -117,7 +117,7 @@ scipy==1.7.3 # via # -r requirements.txt # scos-actions -scos_actions @ git+https://github.com/NTIA/scos-actions@2.0.0 +scos_actions @ git+https://github.com/NTIA/scos-actions@MultiSwitchStatus # via -r requirements.txt sigmf @ git+https://github.com/NTIA/SigMF.git@multi-recording-archive # via diff --git a/requirements.in b/requirements.in index 5d73826..0871293 100644 --- a/requirements.in +++ b/requirements.in @@ -1,4 +1,4 @@ django>=3.1.13, <4.0 environs>=9.0, <10.0 numpy>=1.0, <2.0 -scos_actions @ git+https://github.com/NTIA/scos-actions@2.0.0 +scos_actions @ git+https://github.com/NTIA/scos-actions@MultiSwitchStatus diff --git a/requirements.txt b/requirements.txt index 4b5803c..c67e2b4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -46,7 +46,7 @@ ruamel-yaml-clib==0.2.6 # via ruamel-yaml scipy==1.7.3 # via scos-actions -scos_actions @ git+https://github.com/NTIA/scos-actions@2.0.0 +scos_actions @ git+https://github.com/NTIA/scos-actions@MultiSwitchStatus # via -r requirements.in sigmf @ git+https://github.com/NTIA/SigMF.git@multi-recording-archive # via scos-actions From fa616ced51f5c257d0eb79ae9b83ca769bdd480e Mon Sep 17 00:00:00 2001 From: Doug Boulware Date: Wed, 10 Aug 2022 16:12:55 -0600 Subject: [PATCH 02/12] Register sigan for status. --- scos_usrp/hardware/usrp_sigan.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scos_usrp/hardware/usrp_sigan.py b/scos_usrp/hardware/usrp_sigan.py index 287985b..7f185e4 100644 --- a/scos_usrp/hardware/usrp_sigan.py +++ b/scos_usrp/hardware/usrp_sigan.py @@ -15,7 +15,9 @@ from datetime import datetime import numpy as np + from scos_actions import utils +from scos_actions.actions.interfaces.signals import register_component_with_status from scos_actions.hardware.sigan_iface import SignalAnalyzerInterface from scos_actions.settings import sensor_calibration from scos_actions.settings import sigan_calibration @@ -23,7 +25,6 @@ from scos_usrp import settings from scos_usrp.hardware.mocks.usrp_block import MockUsrp - logger = logging.getLogger(__name__) logger.debug(f"USRP_CONNECTION_ARGS = {settings.USRP_CONNECTION_ARGS}") @@ -38,10 +39,9 @@ class USRPSignalAnalyzer(SignalAnalyzerInterface): def last_calibration_time(self): """Returns the last calibration time from calibration data.""" return utils.convert_string_to_millisecond_iso_format( - sensor_calibration.calibration_datetime + sensor_calibration.calibration_datetime ) - @property def overload(self): """Returns True if overload occurred, otherwise returns False.""" @@ -65,7 +65,7 @@ def __init__(self): self._capture_time = None self.requested_sample_rate = 0 self.connect() - + register_component_with_status(self.__class__, component=self) def connect(self): if self._is_available: @@ -218,17 +218,17 @@ def check_sensor_overload(self, data): time_domain_avg_power = 10 * np.log10(np.mean(np.abs(measured_data) ** 2)) time_domain_avg_power += ( - 10 * np.log10(1 / (2 * 50)) + 30 + 10 * np.log10(1 / (2 * 50)) + 30 ) # Convert log(V^2) to dBm self._sensor_overload = False # explicitly check is not None since 1db compression could be 0 if self.sensor_calibration_data["1db_compression_sensor"] is not None: self._sensor_overload = ( - time_domain_avg_power - > self.sensor_calibration_data["1db_compression_sensor"] + time_domain_avg_power + > self.sensor_calibration_data["1db_compression_sensor"] ) - def acquire_time_domain_samples(self, num_samples, num_samples_skip=0, retries=5,gain_adjust=True): + def acquire_time_domain_samples(self, num_samples, num_samples_skip=0, retries=5, gain_adjust=True): """Acquire num_samples_skip+num_samples samples and return the last num_samples :type num_samples: int From 547cf6532c01936db4fb2f7f5b9b4bf5223495d1 Mon Sep 17 00:00:00 2001 From: Doug Boulware Date: Wed, 10 Aug 2022 16:24:26 -0600 Subject: [PATCH 03/12] Remove status signal sending in usrp sigan. --- scos_usrp/hardware/usrp_sigan.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scos_usrp/hardware/usrp_sigan.py b/scos_usrp/hardware/usrp_sigan.py index 7f185e4..6c8c6a0 100644 --- a/scos_usrp/hardware/usrp_sigan.py +++ b/scos_usrp/hardware/usrp_sigan.py @@ -65,7 +65,6 @@ def __init__(self): self._capture_time = None self.requested_sample_rate = 0 self.connect() - register_component_with_status(self.__class__, component=self) def connect(self): if self._is_available: From 32ab7c8c973d19d2ea1f74bb389a11527f111ae0 Mon Sep 17 00:00:00 2001 From: Doug Boulware Date: Fri, 12 Aug 2022 15:16:06 -0600 Subject: [PATCH 04/12] Don't acquire data to check health of usrp. --- scos_usrp/hardware/usrp_sigan.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/scos_usrp/hardware/usrp_sigan.py b/scos_usrp/hardware/usrp_sigan.py index 6c8c6a0..eecebc6 100644 --- a/scos_usrp/hardware/usrp_sigan.py +++ b/scos_usrp/hardware/usrp_sigan.py @@ -333,20 +333,12 @@ def healthy(self): if not self.is_available: return False - # arbitrary number of samples to acquire to check health of usrp - # keep above ~70k to catch previous errors seen at ~70k - requested_samples = 100_000 - try: - measurement_result = self.acquire_time_domain_samples(requested_samples) - data = measurement_result["data"] + radio_config = self.usrp.get_pp_string() + logger.debug('Radio config: ' + radio_config) except Exception as e: - logger.error("Unable to acquire samples from the USRP") + logger.error("Unable to obtain radio configuration") logger.error(e) return False - if not len(data) == requested_samples: - logger.error("USRP data doesn't match request") - return False - return True From a79c8a75e049f87ae37dfb59e0314a74a33015a9 Mon Sep 17 00:00:00 2001 From: dboulware Date: Thu, 8 Sep 2022 08:50:57 -0600 Subject: [PATCH 05/12] register sigan to provide status. Move pre-commit config to python3.8 --- .pre-commit-config.yaml | 8 ++++---- scos_usrp/hardware/__init__.py | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8c4bb51..fd3f4ec 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,17 +11,17 @@ repos: rev: v2.2.0 hooks: - id: seed-isort-config - language_version: python3.7 + language_version: python3.8 - repo: https://github.com/pre-commit/mirrors-isort rev: v5.10.1 hooks: - id: isort - language_version: python3.7 + language_version: python3.8 - repo: https://github.com/ambv/black - rev: 22.1.0 + rev: 22.6.0 hooks: - id: black - language_version: python3.7 + language_version: python3.8 # TODO markdownlint broken # - repo: https://github.com/markdownlint/markdownlint # rev: v0.9.0 diff --git a/scos_usrp/hardware/__init__.py b/scos_usrp/hardware/__init__.py index faa1dd0..1f11702 100644 --- a/scos_usrp/hardware/__init__.py +++ b/scos_usrp/hardware/__init__.py @@ -1,5 +1,8 @@ +from scos_actions.actions.interfaces.signals import register_component_with_status + from scos_usrp.hardware.gps_iface import USRPLocation from scos_usrp.hardware.usrp_sigan import USRPSignalAnalyzer sigan = USRPSignalAnalyzer() +register_component_with_status.send(sigan, component=sigan) gps = USRPLocation(sigan) From 14016b9f472785876c3046cb6026d623bf4a2e52 Mon Sep 17 00:00:00 2001 From: dboulware Date: Fri, 9 Sep 2022 12:33:11 -0600 Subject: [PATCH 06/12] requirements update. --- requirements-dev.txt | 51 ++++++++++++++++++++++---------------------- requirements.in | 2 +- requirements.txt | 29 +++++++++++++++---------- 3 files changed, 45 insertions(+), 37 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index edddb33..7e58415 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.7 +# This file is autogenerated by pip-compile with python 3.8 # To update, run: # # pip-compile requirements-dev.in @@ -24,14 +24,20 @@ charset-normalizer==2.0.12 # requests click==8.1.2 # via black +defusedxml==0.7.1 + # via + # -r requirements.txt + # its-preselector distlib==0.3.4 # via virtualenv -django==3.2.12 +django==3.2.15 # via # -r requirements.txt # scos-actions environs==9.5.0 - # via -r requirements.txt + # via + # -r requirements.txt + # scos-actions filelock==3.6.0 # via virtualenv identify==2.4.12 @@ -40,16 +46,9 @@ idna==3.3 # via # -r requirements.txt # requests -importlib-metadata==4.11.3 - # via - # click - # pluggy - # pre-commit - # pytest - # virtualenv iniconfig==1.1.1 # via pytest -its-preselector @ git+https://github.com/NTIA/Preselector@1.0.0 +its-preselector @ git+https://github.com/NTIA/Preselector@2.1.0 # via # -r requirements.txt # scos-actions @@ -61,15 +60,22 @@ mypy-extensions==0.4.3 # via black nodeenv==1.6.0 # via pre-commit -numpy==1.21.5 +numexpr==2.8.3 + # via + # -r requirements.txt + # scos-actions +numpy==1.23.2 # via # -r requirements.txt + # numexpr # scipy # scos-actions + # sigmf packaging==21.3 # via # -r requirements.txt # marshmallow + # numexpr # pytest pathspec==0.9.0 # via black @@ -104,7 +110,9 @@ pytz==2022.1 pyyaml==6.0 # via pre-commit requests==2.27.1 - # via -r requirements.txt + # via + # -r requirements.txt + # its-preselector ruamel-yaml==0.17.21 # via # -r requirements.txt @@ -113,13 +121,13 @@ ruamel-yaml-clib==0.2.6 # via # -r requirements.txt # ruamel-yaml -scipy==1.7.3 +scipy==1.9.1 # via # -r requirements.txt # scos-actions -scos_actions @ git+https://github.com/NTIA/scos-actions@MultiSwitchStatus +scos_actions @ git+https://github.com/NTIA/scos-actions@4.0.1 # via -r requirements.txt -sigmf @ git+https://github.com/NTIA/SigMF.git@multi-recording-archive +sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive # via # -r requirements.txt # scos-actions @@ -127,6 +135,7 @@ six==1.16.0 # via # -r requirements.txt # python-dateutil + # sigmf # virtualenv sqlparse==0.4.2 # via @@ -138,19 +147,11 @@ tomli==2.0.1 # via # black # pytest -typed-ast==1.5.2 - # via black typing-extensions==4.1.1 - # via - # -r requirements.txt - # asgiref - # black - # importlib-metadata + # via black urllib3==1.26.9 # via # -r requirements.txt # requests virtualenv==20.14.0 # via pre-commit -zipp==3.8.0 - # via importlib-metadata diff --git a/requirements.in b/requirements.in index 0871293..eaf6cbf 100644 --- a/requirements.in +++ b/requirements.in @@ -1,4 +1,4 @@ django>=3.1.13, <4.0 environs>=9.0, <10.0 numpy>=1.0, <2.0 -scos_actions @ git+https://github.com/NTIA/scos-actions@MultiSwitchStatus +scos_actions @ git+https://github.com/NTIA/scos-actions@4.0.1 diff --git a/requirements.txt b/requirements.txt index c67e2b4..5e79a98 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.7 +# This file is autogenerated by pip-compile with python 3.8 # To update, run: # # pip-compile requirements.in @@ -10,26 +10,35 @@ certifi==2021.10.8 # via requests charset-normalizer==2.0.12 # via requests -django==3.2.12 +defusedxml==0.7.1 + # via its-preselector +django==3.2.15 # via # -r requirements.in # scos-actions environs==9.5.0 - # via -r requirements.in + # via + # -r requirements.in + # scos-actions idna==3.3 # via requests -its-preselector @ git+https://github.com/NTIA/Preselector@1.0.0 +its-preselector @ git+https://github.com/NTIA/Preselector@2.1.0 # via scos-actions marshmallow==3.15.0 # via environs -numpy==1.21.5 +numexpr==2.8.3 + # via scos-actions +numpy==1.23.2 # via # -r requirements.in + # numexpr # scipy # scos-actions # sigmf packaging==21.3 - # via marshmallow + # via + # marshmallow + # numexpr pyparsing==3.0.7 # via packaging python-dateutil==2.8.2 @@ -44,11 +53,11 @@ ruamel-yaml==0.17.21 # via scos-actions ruamel-yaml-clib==0.2.6 # via ruamel-yaml -scipy==1.7.3 +scipy==1.9.1 # via scos-actions -scos_actions @ git+https://github.com/NTIA/scos-actions@MultiSwitchStatus +scos_actions @ git+https://github.com/NTIA/scos-actions@4.0.1 # via -r requirements.in -sigmf @ git+https://github.com/NTIA/SigMF.git@multi-recording-archive +sigmf @ git+https://github.com/NTIA/SigMF@multi-recording-archive # via scos-actions six==1.16.0 # via @@ -56,7 +65,5 @@ six==1.16.0 # sigmf sqlparse==0.4.2 # via django -typing-extensions==4.1.1 - # via asgiref urllib3==1.26.9 # via requests From 7ab02b6c3c0845d62342736904e4e1a5dd52f40a Mon Sep 17 00:00:00 2001 From: dboulware Date: Fri, 9 Sep 2022 12:34:59 -0600 Subject: [PATCH 07/12] run pre-commit --- scos_usrp/hardware/tests/test_usrp.py | 5 ----- scos_usrp/hardware/usrp_sigan.py | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/scos_usrp/hardware/tests/test_usrp.py b/scos_usrp/hardware/tests/test_usrp.py index c105ede..df2db6b 100644 --- a/scos_usrp/hardware/tests/test_usrp.py +++ b/scos_usrp/hardware/tests/test_usrp.py @@ -94,7 +94,6 @@ def test_tune_result(self): self.rx.tune_frequency(f_lo, f_dsp) assert f_lo == self.rx.lo_freq and f_dsp == self.rx.dsp_freq - def test_set_sample_rate_also_sets_clock_rate(self): """Setting sample_rate should adjust clock_rate""" @@ -108,7 +107,3 @@ def test_set_sample_rate_also_sets_clock_rate(self): observed_clock_rate = self.rx.clock_rate assert expected_clock_rate == observed_clock_rate - - - - diff --git a/scos_usrp/hardware/usrp_sigan.py b/scos_usrp/hardware/usrp_sigan.py index eecebc6..a624eb1 100644 --- a/scos_usrp/hardware/usrp_sigan.py +++ b/scos_usrp/hardware/usrp_sigan.py @@ -15,12 +15,10 @@ from datetime import datetime import numpy as np - from scos_actions import utils from scos_actions.actions.interfaces.signals import register_component_with_status from scos_actions.hardware.sigan_iface import SignalAnalyzerInterface -from scos_actions.settings import sensor_calibration -from scos_actions.settings import sigan_calibration +from scos_actions.settings import sensor_calibration, sigan_calibration from scos_usrp import settings from scos_usrp.hardware.mocks.usrp_block import MockUsrp @@ -34,7 +32,6 @@ class USRPSignalAnalyzer(SignalAnalyzerInterface): - @property def last_calibration_time(self): """Returns the last calibration time from calibration data.""" @@ -217,17 +214,19 @@ def check_sensor_overload(self, data): time_domain_avg_power = 10 * np.log10(np.mean(np.abs(measured_data) ** 2)) time_domain_avg_power += ( - 10 * np.log10(1 / (2 * 50)) + 30 + 10 * np.log10(1 / (2 * 50)) + 30 ) # Convert log(V^2) to dBm self._sensor_overload = False # explicitly check is not None since 1db compression could be 0 if self.sensor_calibration_data["1db_compression_sensor"] is not None: self._sensor_overload = ( - time_domain_avg_power - > self.sensor_calibration_data["1db_compression_sensor"] + time_domain_avg_power + > self.sensor_calibration_data["1db_compression_sensor"] ) - def acquire_time_domain_samples(self, num_samples, num_samples_skip=0, retries=5, gain_adjust=True): + def acquire_time_domain_samples( + self, num_samples, num_samples_skip=0, retries=5, gain_adjust=True + ): """Acquire num_samples_skip+num_samples samples and return the last num_samples :type num_samples: int @@ -251,7 +250,9 @@ def acquire_time_domain_samples(self, num_samples, num_samples_skip=0, retries=5 self._sigan_overload = False self._capture_time = None # Get the calibration data for the acquisition - logger.debug('Using requested sample rate of ' + str(self.requested_sample_rate)) + logger.debug( + "Using requested sample rate of " + str(self.requested_sample_rate) + ) calibration_args = [self.requested_sample_rate, self.frequency, self.gain] self.recompute_calibration_data(calibration_args) nsamps = int(num_samples) @@ -335,7 +336,7 @@ def healthy(self): try: radio_config = self.usrp.get_pp_string() - logger.debug('Radio config: ' + radio_config) + logger.debug("Radio config: " + radio_config) except Exception as e: logger.error("Unable to obtain radio configuration") logger.error(e) From d39b01be13f5056e55aa88261fedaa8f035ea0e5 Mon Sep 17 00:00:00 2001 From: dboulware Date: Fri, 9 Sep 2022 13:29:35 -0600 Subject: [PATCH 08/12] updated action yamls. --- .../actions/acquire_iq_700MHz_ATT_DL.yml | 1 + .../actions/acquire_iq_700MHz_ATT_UL.yml | 1 + .../actions/acquire_iq_700MHz_FirstNet_DL.yml | 1 + .../actions/acquire_iq_700MHz_FirstNet_UL.yml | 1 + .../acquire_iq_700MHz_P-SafetyNB_DL.yml | 1 + .../acquire_iq_700MHz_P-SafetyNB_UL.yml | 1 + .../actions/acquire_iq_700MHz_T-Mobile_DL.yml | 1 + .../actions/acquire_iq_700MHz_T-Mobile_UL.yml | 1 + .../actions/acquire_iq_700MHz_Verizon_DL.yml | 1 + .../actions/acquire_iq_700MHz_Verizon_UL.yml | 1 + .../actions/acquire_m4s_700MHz_ATT_DL.yml | 1 + .../actions/acquire_m4s_700MHz_ATT_UL.yml | 1 + .../acquire_m4s_700MHz_FirstNet_DL.yml | 1 + .../acquire_m4s_700MHz_FirstNet_UL.yml | 1 + .../acquire_m4s_700MHz_P-SafetyNB_DL.yml | 1 + .../acquire_m4s_700MHz_P-SafetyNB_UL.yml | 1 + .../acquire_m4s_700MHz_T-Mobile_DL.yml | 1 + .../acquire_m4s_700MHz_T-Mobile_UL.yml | 1 + .../actions/acquire_m4s_700MHz_Verizon_DL.yml | 1 + .../actions/acquire_m4s_700MHz_Verizon_UL.yml | 1 + .../survey_700MHz_band_10dB_1000ms_iq.yml | 49 ++----------------- .../survey_700MHz_band_10dB_80ms_iq.yml | 49 ++----------------- .../survey_700MHz_band_20dB_1000ms_iq.yml | 49 ++----------------- .../survey_700MHz_band_20dB_80ms_iq.yml | 49 ++----------------- .../survey_700MHz_band_40dB_1000ms_iq.yml | 49 ++----------------- .../survey_700MHz_band_40dB_80ms_iq.yml | 49 ++----------------- .../configs/actions/survey_700MHz_band_iq.yml | 37 ++------------ 27 files changed, 54 insertions(+), 297 deletions(-) diff --git a/scos_usrp/configs/actions/acquire_iq_700MHz_ATT_DL.yml b/scos_usrp/configs/actions/acquire_iq_700MHz_ATT_DL.yml index 52c51d3..c283e2c 100644 --- a/scos_usrp/configs/actions/acquire_iq_700MHz_ATT_DL.yml +++ b/scos_usrp/configs/actions/acquire_iq_700MHz_ATT_DL.yml @@ -5,3 +5,4 @@ single_frequency_time_domain_iq: sample_rate: 15.36e6 duration_ms: 1000 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_iq_700MHz_ATT_UL.yml b/scos_usrp/configs/actions/acquire_iq_700MHz_ATT_UL.yml index 2948070..5bd300e 100644 --- a/scos_usrp/configs/actions/acquire_iq_700MHz_ATT_UL.yml +++ b/scos_usrp/configs/actions/acquire_iq_700MHz_ATT_UL.yml @@ -5,3 +5,4 @@ single_frequency_time_domain_iq: sample_rate: 15.36e6 duration_ms: 1000 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_iq_700MHz_FirstNet_DL.yml b/scos_usrp/configs/actions/acquire_iq_700MHz_FirstNet_DL.yml index 9c3a760..09fb078 100644 --- a/scos_usrp/configs/actions/acquire_iq_700MHz_FirstNet_DL.yml +++ b/scos_usrp/configs/actions/acquire_iq_700MHz_FirstNet_DL.yml @@ -5,3 +5,4 @@ single_frequency_time_domain_iq: sample_rate: 15.36e6 duration_ms: 1000 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_iq_700MHz_FirstNet_UL.yml b/scos_usrp/configs/actions/acquire_iq_700MHz_FirstNet_UL.yml index 9ae683b..7adc3cf 100644 --- a/scos_usrp/configs/actions/acquire_iq_700MHz_FirstNet_UL.yml +++ b/scos_usrp/configs/actions/acquire_iq_700MHz_FirstNet_UL.yml @@ -5,3 +5,4 @@ single_frequency_time_domain_iq: sample_rate: 15.36e6 duration_ms: 1000 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_iq_700MHz_P-SafetyNB_DL.yml b/scos_usrp/configs/actions/acquire_iq_700MHz_P-SafetyNB_DL.yml index 68bd52b..90d77a1 100644 --- a/scos_usrp/configs/actions/acquire_iq_700MHz_P-SafetyNB_DL.yml +++ b/scos_usrp/configs/actions/acquire_iq_700MHz_P-SafetyNB_DL.yml @@ -5,3 +5,4 @@ single_frequency_time_domain_iq: sample_rate: 15.36e6 duration_ms: 10000 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_iq_700MHz_P-SafetyNB_UL.yml b/scos_usrp/configs/actions/acquire_iq_700MHz_P-SafetyNB_UL.yml index 43aeb37..1036019 100644 --- a/scos_usrp/configs/actions/acquire_iq_700MHz_P-SafetyNB_UL.yml +++ b/scos_usrp/configs/actions/acquire_iq_700MHz_P-SafetyNB_UL.yml @@ -5,3 +5,4 @@ single_frequency_time_domain_iq: sample_rate: 15.36e6 duration_ms: 10000 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_iq_700MHz_T-Mobile_DL.yml b/scos_usrp/configs/actions/acquire_iq_700MHz_T-Mobile_DL.yml index 6efbeee..1e701fa 100644 --- a/scos_usrp/configs/actions/acquire_iq_700MHz_T-Mobile_DL.yml +++ b/scos_usrp/configs/actions/acquire_iq_700MHz_T-Mobile_DL.yml @@ -5,3 +5,4 @@ single_frequency_time_domain_iq: sample_rate: 15.36e6 duration_ms: 1000 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_iq_700MHz_T-Mobile_UL.yml b/scos_usrp/configs/actions/acquire_iq_700MHz_T-Mobile_UL.yml index 2b4fccd..376388a 100644 --- a/scos_usrp/configs/actions/acquire_iq_700MHz_T-Mobile_UL.yml +++ b/scos_usrp/configs/actions/acquire_iq_700MHz_T-Mobile_UL.yml @@ -5,3 +5,4 @@ single_frequency_time_domain_iq: sample_rate: 15.36e6 duration_ms: 1000 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_iq_700MHz_Verizon_DL.yml b/scos_usrp/configs/actions/acquire_iq_700MHz_Verizon_DL.yml index f56ef8d..f2ae8e1 100644 --- a/scos_usrp/configs/actions/acquire_iq_700MHz_Verizon_DL.yml +++ b/scos_usrp/configs/actions/acquire_iq_700MHz_Verizon_DL.yml @@ -5,3 +5,4 @@ single_frequency_time_domain_iq: sample_rate: 15.36e6 duration_ms: 1000 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_iq_700MHz_Verizon_UL.yml b/scos_usrp/configs/actions/acquire_iq_700MHz_Verizon_UL.yml index 95a2e1b..9837f23 100644 --- a/scos_usrp/configs/actions/acquire_iq_700MHz_Verizon_UL.yml +++ b/scos_usrp/configs/actions/acquire_iq_700MHz_Verizon_UL.yml @@ -5,3 +5,4 @@ single_frequency_time_domain_iq: sample_rate: 15.36e6 duration_ms: 1000 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_m4s_700MHz_ATT_DL.yml b/scos_usrp/configs/actions/acquire_m4s_700MHz_ATT_DL.yml index 30a1f74..4c4a999 100644 --- a/scos_usrp/configs/actions/acquire_m4s_700MHz_ATT_DL.yml +++ b/scos_usrp/configs/actions/acquire_m4s_700MHz_ATT_DL.yml @@ -6,3 +6,4 @@ single_frequency_fft: fft_size: 1024 nffts: 300 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_m4s_700MHz_ATT_UL.yml b/scos_usrp/configs/actions/acquire_m4s_700MHz_ATT_UL.yml index 84ea107..02305e8 100644 --- a/scos_usrp/configs/actions/acquire_m4s_700MHz_ATT_UL.yml +++ b/scos_usrp/configs/actions/acquire_m4s_700MHz_ATT_UL.yml @@ -6,3 +6,4 @@ single_frequency_fft: fft_size: 1024 nffts: 300 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_m4s_700MHz_FirstNet_DL.yml b/scos_usrp/configs/actions/acquire_m4s_700MHz_FirstNet_DL.yml index 4e157dc..5ff1529 100644 --- a/scos_usrp/configs/actions/acquire_m4s_700MHz_FirstNet_DL.yml +++ b/scos_usrp/configs/actions/acquire_m4s_700MHz_FirstNet_DL.yml @@ -6,3 +6,4 @@ single_frequency_fft: fft_size: 1024 nffts: 300 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_m4s_700MHz_FirstNet_UL.yml b/scos_usrp/configs/actions/acquire_m4s_700MHz_FirstNet_UL.yml index 5378692..ba4af38 100644 --- a/scos_usrp/configs/actions/acquire_m4s_700MHz_FirstNet_UL.yml +++ b/scos_usrp/configs/actions/acquire_m4s_700MHz_FirstNet_UL.yml @@ -6,3 +6,4 @@ single_frequency_fft: fft_size: 1024 nffts: 300 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_m4s_700MHz_P-SafetyNB_DL.yml b/scos_usrp/configs/actions/acquire_m4s_700MHz_P-SafetyNB_DL.yml index a477827..8f0bd12 100644 --- a/scos_usrp/configs/actions/acquire_m4s_700MHz_P-SafetyNB_DL.yml +++ b/scos_usrp/configs/actions/acquire_m4s_700MHz_P-SafetyNB_DL.yml @@ -6,3 +6,4 @@ single_frequency_fft: fft_size: 1024 nffts: 300 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_m4s_700MHz_P-SafetyNB_UL.yml b/scos_usrp/configs/actions/acquire_m4s_700MHz_P-SafetyNB_UL.yml index 86c109d..9fdf993 100644 --- a/scos_usrp/configs/actions/acquire_m4s_700MHz_P-SafetyNB_UL.yml +++ b/scos_usrp/configs/actions/acquire_m4s_700MHz_P-SafetyNB_UL.yml @@ -6,3 +6,4 @@ single_frequency_fft: fft_size: 1024 nffts: 300 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_m4s_700MHz_T-Mobile_DL.yml b/scos_usrp/configs/actions/acquire_m4s_700MHz_T-Mobile_DL.yml index 07a2503..688ffd2 100644 --- a/scos_usrp/configs/actions/acquire_m4s_700MHz_T-Mobile_DL.yml +++ b/scos_usrp/configs/actions/acquire_m4s_700MHz_T-Mobile_DL.yml @@ -6,3 +6,4 @@ single_frequency_fft: fft_size: 1024 nffts: 300 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_m4s_700MHz_T-Mobile_UL.yml b/scos_usrp/configs/actions/acquire_m4s_700MHz_T-Mobile_UL.yml index 482eeec..389fdd3 100644 --- a/scos_usrp/configs/actions/acquire_m4s_700MHz_T-Mobile_UL.yml +++ b/scos_usrp/configs/actions/acquire_m4s_700MHz_T-Mobile_UL.yml @@ -6,3 +6,4 @@ single_frequency_fft: fft_size: 1024 nffts: 300 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_m4s_700MHz_Verizon_DL.yml b/scos_usrp/configs/actions/acquire_m4s_700MHz_Verizon_DL.yml index 67184ec..38c2d0b 100644 --- a/scos_usrp/configs/actions/acquire_m4s_700MHz_Verizon_DL.yml +++ b/scos_usrp/configs/actions/acquire_m4s_700MHz_Verizon_DL.yml @@ -6,3 +6,4 @@ single_frequency_fft: fft_size: 1024 nffts: 300 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/acquire_m4s_700MHz_Verizon_UL.yml b/scos_usrp/configs/actions/acquire_m4s_700MHz_Verizon_UL.yml index 7f4a47a..0f0016a 100644 --- a/scos_usrp/configs/actions/acquire_m4s_700MHz_Verizon_UL.yml +++ b/scos_usrp/configs/actions/acquire_m4s_700MHz_Verizon_UL.yml @@ -6,3 +6,4 @@ single_frequency_fft: fft_size: 1024 nffts: 300 nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/survey_700MHz_band_10dB_1000ms_iq.yml b/scos_usrp/configs/actions/survey_700MHz_band_10dB_1000ms_iq.yml index bbc1d92..51e93fa 100644 --- a/scos_usrp/configs/actions/survey_700MHz_band_10dB_1000ms_iq.yml +++ b/scos_usrp/configs/actions/survey_700MHz_band_10dB_1000ms_iq.yml @@ -11,47 +11,8 @@ stepped_frequency_time_domain_iq: - 782e6 - 793e6 - 802e6 - gain: - - 10 - - 10 - - 10 - - 10 - - 10 - - 10 - - 10 - - 10 - - 10 - - 10 - sample_rate: - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - duration_ms: - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - nskip: - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 + gain: 10 + sample_rate: 15.36e6 + duration_ms: 1000 + nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/survey_700MHz_band_10dB_80ms_iq.yml b/scos_usrp/configs/actions/survey_700MHz_band_10dB_80ms_iq.yml index d3671de..d0dea58 100644 --- a/scos_usrp/configs/actions/survey_700MHz_band_10dB_80ms_iq.yml +++ b/scos_usrp/configs/actions/survey_700MHz_band_10dB_80ms_iq.yml @@ -11,47 +11,8 @@ stepped_frequency_time_domain_iq: - 782e6 - 793e6 - 802e6 - gain: - - 10 - - 10 - - 10 - - 10 - - 10 - - 10 - - 10 - - 10 - - 10 - - 10 - sample_rate: - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - duration_ms: - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - nskip: - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 + gain: 10 + sample_rate: 15.36e6 + duration_ms: 80 + nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/survey_700MHz_band_20dB_1000ms_iq.yml b/scos_usrp/configs/actions/survey_700MHz_band_20dB_1000ms_iq.yml index 5eb118c..4c858e1 100644 --- a/scos_usrp/configs/actions/survey_700MHz_band_20dB_1000ms_iq.yml +++ b/scos_usrp/configs/actions/survey_700MHz_band_20dB_1000ms_iq.yml @@ -11,47 +11,8 @@ stepped_frequency_time_domain_iq: - 782e6 - 793e6 - 802e6 - gain: - - 20 - - 20 - - 20 - - 20 - - 20 - - 20 - - 20 - - 20 - - 20 - - 20 - sample_rate: - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - duration_ms: - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - nskip: - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 + gain: 20 + sample_rate: 15.36e6 + duration_ms: 1000 + nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/survey_700MHz_band_20dB_80ms_iq.yml b/scos_usrp/configs/actions/survey_700MHz_band_20dB_80ms_iq.yml index 1c85ade..3aa9523 100644 --- a/scos_usrp/configs/actions/survey_700MHz_band_20dB_80ms_iq.yml +++ b/scos_usrp/configs/actions/survey_700MHz_band_20dB_80ms_iq.yml @@ -11,47 +11,8 @@ stepped_frequency_time_domain_iq: - 782e6 - 793e6 - 802e6 - gain: - - 20 - - 20 - - 20 - - 20 - - 20 - - 20 - - 20 - - 20 - - 20 - - 20 - sample_rate: - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - duration_ms: - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - nskip: - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 + gain: 20 + sample_rate: 15.36e6 + duration_ms: 80 + nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/survey_700MHz_band_40dB_1000ms_iq.yml b/scos_usrp/configs/actions/survey_700MHz_band_40dB_1000ms_iq.yml index 7e13dab..c0caa8b 100644 --- a/scos_usrp/configs/actions/survey_700MHz_band_40dB_1000ms_iq.yml +++ b/scos_usrp/configs/actions/survey_700MHz_band_40dB_1000ms_iq.yml @@ -11,47 +11,8 @@ stepped_frequency_time_domain_iq: - 782e6 - 793e6 - 802e6 - gain: - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - sample_rate: - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - duration_ms: - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - - 1000 - nskip: - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 + gain: 40 + sample_rate: 15.36e6 + duration_ms: 1000 + nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/survey_700MHz_band_40dB_80ms_iq.yml b/scos_usrp/configs/actions/survey_700MHz_band_40dB_80ms_iq.yml index 2775def..3799fec 100644 --- a/scos_usrp/configs/actions/survey_700MHz_band_40dB_80ms_iq.yml +++ b/scos_usrp/configs/actions/survey_700MHz_band_40dB_80ms_iq.yml @@ -11,47 +11,8 @@ stepped_frequency_time_domain_iq: - 782e6 - 793e6 - 802e6 - gain: - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - sample_rate: - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - duration_ms: - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - - 80 - nskip: - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 + gain: 40 + sample_rate: 15.36e6 + duration_ms: 80 + nskip: 15.36e4 + classification: UNCLASSIFIED diff --git a/scos_usrp/configs/actions/survey_700MHz_band_iq.yml b/scos_usrp/configs/actions/survey_700MHz_band_iq.yml index de8e776..f28f329 100644 --- a/scos_usrp/configs/actions/survey_700MHz_band_iq.yml +++ b/scos_usrp/configs/actions/survey_700MHz_band_iq.yml @@ -11,28 +11,8 @@ stepped_frequency_time_domain_iq: - 782e6 - 793e6 - 802e6 - gain: - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - - 40 - sample_rate: - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 - - 15.36e6 + gain: 40 + sample_rate: 15.36e6 duration_ms: - 1000 - 1000 @@ -44,14 +24,5 @@ stepped_frequency_time_domain_iq: - 1000 - 1000 - 10000 - nskip: - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 - - 15.36e4 + nskip: 15.36e4 + classification: UNCLASSIFIED From ae261a85016f9c7f247ffaa49da53bf6fbca78a4 Mon Sep 17 00:00:00 2001 From: dboulware Date: Tue, 20 Sep 2022 10:19:20 -0600 Subject: [PATCH 09/12] updated docker files --- docker/Dockerfile-test | 18 +++++++---------- docker/Dockerfile-uhd | 44 +++++++----------------------------------- 2 files changed, 14 insertions(+), 48 deletions(-) diff --git a/docker/Dockerfile-test b/docker/Dockerfile-test index 97a9009..46b7ff2 100644 --- a/docker/Dockerfile-test +++ b/docker/Dockerfile-test @@ -1,15 +1,11 @@ -FROM smsntia/uhd_b2xx_py3 +FROM ubuntu:20.04 + RUN apt-get update -q && \ DEBIAN_FRONTEND=noninteractive \ - apt-get install -qy --no-install-recommends \ - libboost-date-time1.65.1 libboost-filesystem1.65.1 \ - libboost-python1.65.1 libboost-regex1.65.1 \ - libboost-serialization1.65.1 libboost-system1.65.1 \ - libboost-thread1.65.1 libusb-1.0-0 libpython3.7 \ - libboost-program-options1.65.1 \ - git python3.7 \ - swig gcc python3.7-dev && \ + apt-get install -qy --no-install-recommends \ + git python3 python3-pip \ + python3-dev python3-uhd && \ apt-get clean && rm -rf /var/lib/apt/lists/* ENV PYTHONUNBUFFERED 1 @@ -18,7 +14,7 @@ WORKDIR /src COPY ./ /src ARG DOCKER_GIT_CREDENTIALS -RUN python3.7 -m pip install --upgrade pip -RUN python3.7 -m pip install --no-cache-dir -r requirements-dev.txt +RUN python3 -m pip install --upgrade pip +RUN python3 -m pip install -r requirements-dev.txt ENTRYPOINT ["pytest"] diff --git a/docker/Dockerfile-uhd b/docker/Dockerfile-uhd index b941bb1..7acd55b 100644 --- a/docker/Dockerfile-uhd +++ b/docker/Dockerfile-uhd @@ -1,45 +1,15 @@ -FROM ubuntu as build +FROM ubuntu:20.04 -# Everything AFTER the "v" in the GitHub tag -ARG UHD_TAG=3.13.1.0-rc1 +RUN apt-get update -q && apt-get upgrade -yq RUN apt-get update -q && \ DEBIAN_FRONTEND=noninteractive \ apt-get install -qy --no-install-recommends \ - wget libboost-all-dev libusb-1.0-0-dev python3-setuptools \ - python3-pip python3-setuptools python3-numpy \ - python3-mako python3-requests \ - cmake build-essential ca-certificates - -RUN wget https://github.com/EttusResearch/uhd/archive/v${UHD_TAG}.tar.gz \ - -O uhd.tar.gz && tar -xvzf uhd.tar.gz - -RUN mkdir uhd-${UHD_TAG}/host/build -WORKDIR uhd-${UHD_TAG}/host/build -RUN cmake -DENABLE_PYTHON_API=ON -DENABLE_PYTHON3=ON ../ -RUN make && make test && make install -RUN python3 /usr/local/lib/uhd/utils/uhd_images_downloader.py - -FROM ubuntu - -# Copy just the necessities to run B2xx with python3 -COPY --from=build /usr/local/lib/libuhd.so* /usr/local/lib/ -COPY --from=build /usr/local/lib/uhd/ /usr/local/lib/uhd/ -COPY --from=build /usr/local/lib/python3/dist-packages/uhd/ /usr/lib/python3/dist-packages/uhd/ -COPY --from=build /usr/local/include/uhd.h /usr/local/include/ -COPY --from=build /usr/local/include/uhd/ /usr/local/include/uhd/ -COPY --from=build /usr/local/bin/uhd_* /usr/local/bin/ -COPY --from=build /usr/local/share/uhd/images/usrp_b2* /usr/local/share/uhd/images/ - -RUN apt-get update -q && \ - DEBIAN_FRONTEND=noninteractive \ - apt-get install -qy --no-install-recommends \ - libboost-date-time1.65.1 libboost-filesystem1.65.1 \ - libboost-python1.65.1 libboost-regex1.65.1 \ - libboost-serialization1.65.1 libboost-system1.65.1 \ - libboost-thread1.65.1 libboost-program-options1.65.1 \ - libusb-1.0-0 libpython3.7 \ + python3 python3-pip \ + python3-dev python3-uhd uhd-host \ && \ apt-get clean && rm -rf /var/lib/apt/lists/* -CMD /usr/bin/python3.7 +RUN uhd_images_downloader + +CMD /usr/bin/python3 From 6dba33fad874dfdfe7f8944c3b8ddf15c50fb418 Mon Sep 17 00:00:00 2001 From: dboulware Date: Wed, 21 Sep 2022 12:46:23 -0600 Subject: [PATCH 10/12] correct arguments monitor and sync gps action constructors --- scos_usrp/discover/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scos_usrp/discover/__init__.py b/scos_usrp/discover/__init__.py index 53bc3f6..da283da 100644 --- a/scos_usrp/discover/__init__.py +++ b/scos_usrp/discover/__init__.py @@ -9,7 +9,12 @@ logger = logging.getLogger(__name__) -actions = {"monitor_usrp": MonitorSignalAnalyzer(sigan), "sync_gps": SyncGps(gps)} +actions = { + "monitor_usrp": MonitorSignalAnalyzer( + parameters={"name": "monitor_usrp"}, sigan=sigan + ), + "sync_gps": SyncGps(gps, {"name": "sync_gps"}, sigan), +} logger.debug("scos_usrp: ACTION_DEFINITIONS_DIR = " + ACTION_DEFINITIONS_DIR) yaml_actions, yaml_test_actions = init( From 460382cdf5ade05439c0ddb48d3727d228e6fd0f Mon Sep 17 00:00:00 2001 From: dboulware Date: Thu, 22 Sep 2022 11:02:37 -0600 Subject: [PATCH 11/12] Update calibration import. --- scos_usrp/hardware/usrp_sigan.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scos_usrp/hardware/usrp_sigan.py b/scos_usrp/hardware/usrp_sigan.py index a624eb1..4870daf 100644 --- a/scos_usrp/hardware/usrp_sigan.py +++ b/scos_usrp/hardware/usrp_sigan.py @@ -12,13 +12,11 @@ """ import logging -from datetime import datetime import numpy as np from scos_actions import utils -from scos_actions.actions.interfaces.signals import register_component_with_status +from scos_actions.calibration import sensor_calibration, sigan_calibration from scos_actions.hardware.sigan_iface import SignalAnalyzerInterface -from scos_actions.settings import sensor_calibration, sigan_calibration from scos_usrp import settings from scos_usrp.hardware.mocks.usrp_block import MockUsrp From d12db791697f2172d1793a1f44d55f528b40b363 Mon Sep 17 00:00:00 2001 From: dboulware Date: Thu, 22 Sep 2022 11:30:10 -0600 Subject: [PATCH 12/12] Remove old comment. --- scos_usrp/hardware/usrp_sigan.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scos_usrp/hardware/usrp_sigan.py b/scos_usrp/hardware/usrp_sigan.py index 4870daf..a0c112e 100644 --- a/scos_usrp/hardware/usrp_sigan.py +++ b/scos_usrp/hardware/usrp_sigan.py @@ -326,7 +326,6 @@ def acquire_time_domain_samples( @property def healthy(self): - """Check for ability to acquire samples from the signal analyzer.""" logger.debug("Performing USRP health check") if not self.is_available: