From 8d4a6c112d8cde17580352aca9a0454bbf938d18 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Mon, 5 Feb 2024 11:46:28 -0700 Subject: [PATCH 01/26] load test actions if using tekrsa sigan, add test action configs, change scos-actions branch --- pyproject.toml | 2 +- .../test/test_SEA_CBRS_Measure_Baseline.yml | 41 +++++++++++++++++++ .../test/test_multi_frequency_iq_action.yml | 19 +++++++++ .../test/test_single_frequency_iq_action.yml | 9 ++++ .../test/test_single_frequency_m4s_action.yml | 10 +++++ .../configs/test/test_survey_iq_action.yml | 29 +++++++++++++ src/scos_tekrsa/discover/__init__.py | 9 +++- src/scos_tekrsa/settings.py | 2 + 8 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml create mode 100644 src/scos_tekrsa/configs/test/test_multi_frequency_iq_action.yml create mode 100644 src/scos_tekrsa/configs/test/test_single_frequency_iq_action.yml create mode 100644 src/scos_tekrsa/configs/test/test_single_frequency_m4s_action.yml create mode 100644 src/scos_tekrsa/configs/test/test_survey_iq_action.yml diff --git a/pyproject.toml b/pyproject.toml index fab5f10..d72b16b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ classifiers = [ dependencies = [ "environs>=9.5.0", "tekrsa-api-wrap>=1.3.2", - "scos_actions @ git+https://github.com/NTIA/scos-actions@8.0.0", + "scos_actions @ git+https://github.com/NTIA/scos-actions@SEA-178_test_actions_loading", ] [project.optional-dependencies] diff --git a/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml b/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml new file mode 100644 index 0000000..8533cf8 --- /dev/null +++ b/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml @@ -0,0 +1,41 @@ +nasctn_sea_data_product: + name: test_SEA_CBRS_Measure_Baseline +# IIR filter settings + iir_gpass_dB: 0.1 # Max passband ripple below unity gain + iir_gstop_dB: 40 # Minimum stopband attenuation + iir_pb_edge_Hz: 5e6 # Passband edge frequency + iir_sb_edge_Hz: 5.008e6 # Stopband edge frequency +# FFT settings + nffts: 320e3 +# PFP frame + pfp_frame_period_ms: 10 +# APD downsampling settings + apd_bin_size_dB: 1.0 # Set to 0 or negative for no downsampling + apd_max_bin_dBm: -30 + apd_min_bin_dBm: -180 +# Time domain power statistics settings + td_bin_size_ms: 10 +# Sigan Settings + preamp_enable: True + reference_level: -25 + attenuation: 0 + sample_rate: 14e6 +# Acquisition settings (3550-3700 MHz in 10 MHz steps, each 4s long) + duration_ms: 4000 + nskip: 0 + frequency: + - 3555e6 + - 3565e6 + - 3575e6 + - 3585e6 + - 3595e6 + - 3605e6 + - 3615e6 + - 3625e6 + - 3635e6 + - 3645e6 + - 3655e6 + - 3665e6 + - 3675e6 + - 3685e6 + - 3695e6 diff --git a/src/scos_tekrsa/configs/test/test_multi_frequency_iq_action.yml b/src/scos_tekrsa/configs/test/test_multi_frequency_iq_action.yml new file mode 100644 index 0000000..d4b24ab --- /dev/null +++ b/src/scos_tekrsa/configs/test/test_multi_frequency_iq_action.yml @@ -0,0 +1,19 @@ +stepped_frequency_time_domain_iq: + name: test_multi_frequency_iq_action + frequency: + - 700.5e6 + - 709e6 + - 731.5e6 + - 739e6 + - 751e6 + - 763e6 + - 772e6 + - 782e6 + - 793e6 + - 802e6 + reference_level: -10 + sample_rate: 56e6 + duration_ms: 80 + nskip: 0 + classification: UNCLASSIFIED + calibration_adjust: False diff --git a/src/scos_tekrsa/configs/test/test_single_frequency_iq_action.yml b/src/scos_tekrsa/configs/test/test_single_frequency_iq_action.yml new file mode 100644 index 0000000..b43f93a --- /dev/null +++ b/src/scos_tekrsa/configs/test/test_single_frequency_iq_action.yml @@ -0,0 +1,9 @@ +single_frequency_time_domain_iq: + name: test_single_frequency_iq_action + frequency: 739e6 + reference_level: -10 + sample_rate: 56e6 + duration_ms: 714 + nskip: 0 + classification: UNCLASSIFIED + calibration_adjust: False diff --git a/src/scos_tekrsa/configs/test/test_single_frequency_m4s_action.yml b/src/scos_tekrsa/configs/test/test_single_frequency_m4s_action.yml new file mode 100644 index 0000000..3fb64dd --- /dev/null +++ b/src/scos_tekrsa/configs/test/test_single_frequency_m4s_action.yml @@ -0,0 +1,10 @@ +single_frequency_fft: + name: test_single_frequency_m4s_action + frequency: 739e6 + reference_level: -10 + sample_rate: 56e6 + fft_size: 2048 + nffts: 300 + nskip: 0 + classification: UNCLASSIFIED + calibration_adjust: False \ No newline at end of file diff --git a/src/scos_tekrsa/configs/test/test_survey_iq_action.yml b/src/scos_tekrsa/configs/test/test_survey_iq_action.yml new file mode 100644 index 0000000..d6c19ba --- /dev/null +++ b/src/scos_tekrsa/configs/test/test_survey_iq_action.yml @@ -0,0 +1,29 @@ +stepped_frequency_time_domain_iq: + name: test_survey_iq_action + frequency: + - 700.5e6 + - 709e6 + - 731.5e6 + - 739e6 + - 751e6 + - 763e6 + - 772e6 + - 782e6 + - 793e6 + - 802e6 + reference_level: -10 + sample_rate: 56e6 + duration_ms: + - 714 + - 714 + - 714 + - 714 + - 714 + - 714 + - 7140 + - 714 + - 714 + - 7140 + nskip: 0 + classification: UNCLASSIFIED + calibration_adjust: False diff --git a/src/scos_tekrsa/discover/__init__.py b/src/scos_tekrsa/discover/__init__.py index b17a35a..5570ab4 100644 --- a/src/scos_tekrsa/discover/__init__.py +++ b/src/scos_tekrsa/discover/__init__.py @@ -3,11 +3,12 @@ from scos_actions.actions.monitor_sigan import MonitorSignalAnalyzer from scos_actions.discover import init -from scos_tekrsa.settings import CONFIG_DIR, DEVICE_MODEL +from scos_tekrsa.settings import CONFIG_DIR, DEVICE_MODEL, SIGAN_MODULE, SIGAN_CLASS logger = logging.getLogger(__name__) actions = {} +test_actions = {} logger.debug("scos-tekrsa: discovering actions") # Adjust ACTION_DEFINITIONS_DIR for specific Tektronix analyzer in use logger.debug(f"Device Model: {DEVICE_MODEL}") @@ -32,6 +33,10 @@ logger.debug("Created Monitor SIGAN action") # Pass new radio to existing action classes with new SDR specific yaml files logger.debug("Initializing yaml actions") -yaml_actions, yaml_test_actions = init(yaml_dir=ACTION_DEFINITIONS_DIR) +yaml_actions, _ = init(yaml_dir=ACTION_DEFINITIONS_DIR) logger.debug(f"Created {len(yaml_actions)} actions") actions.update(yaml_actions) +if SIGAN_MODULE == "scos_tekrsa.hardware.tekrsa_sigan" and SIGAN_CLASS == "TekRSASigan": + TEST_ACTION_DEFINITIONS_DIR = CONFIG_DIR / "test" + _, yaml_test_actions = init(yaml_dir=TEST_ACTION_DEFINITIONS_DIR) + test_actions.update(yaml_test_actions) diff --git a/src/scos_tekrsa/settings.py b/src/scos_tekrsa/settings.py index 5258c53..b4dd0b1 100644 --- a/src/scos_tekrsa/settings.py +++ b/src/scos_tekrsa/settings.py @@ -18,3 +18,5 @@ RUNNING_MIGRATIONS = env.bool("RUNNING_MIGRATIONS", default=False) if RUNNING_TESTS: logging.basicConfig(level=logging.DEBUG) +SIGAN_MODULE = env.str("SIGAN_MODULE", default="scos_tekrsa.hardware.tekrsa_sigan") +SIGAN_CLASS = env.str("SIGAN_CLASS", default="TekRSASigan") \ No newline at end of file From fdec377ead9954f2aab0504dd18dfefe106cd06c Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Mon, 5 Feb 2024 12:24:09 -0700 Subject: [PATCH 02/26] add debug logging --- src/scos_tekrsa/discover/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/scos_tekrsa/discover/__init__.py b/src/scos_tekrsa/discover/__init__.py index 5570ab4..dd3250c 100644 --- a/src/scos_tekrsa/discover/__init__.py +++ b/src/scos_tekrsa/discover/__init__.py @@ -36,7 +36,13 @@ yaml_actions, _ = init(yaml_dir=ACTION_DEFINITIONS_DIR) logger.debug(f"Created {len(yaml_actions)} actions") actions.update(yaml_actions) +logger.debug(f"scos-tekrsa: SIGAN_MODULE = {SIGAN_MODULE}") +logger.debug(f"scos-tekrsa: SIGAN_CLASS = {SIGAN_CLASS}") if SIGAN_MODULE == "scos_tekrsa.hardware.tekrsa_sigan" and SIGAN_CLASS == "TekRSASigan": + logger.debug("scos-tekrsa: loading test action configs") TEST_ACTION_DEFINITIONS_DIR = CONFIG_DIR / "test" + logger.debug(f"scos-tekrsa: TEST_ACTION_DEFINITIONS_DIR = {TEST_ACTION_DEFINITIONS_DIR}") _, yaml_test_actions = init(yaml_dir=TEST_ACTION_DEFINITIONS_DIR) + logger.debug(f"scos-tekrsa: Found {len(yaml_test_actions)} test action configs") test_actions.update(yaml_test_actions) +logger.debug(f"scos-tekrsa: len(test_actions) = {len(test_actions)}") From 51d2a91ec8a6515e54e378fb3f4659e61aa439e5 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Mon, 5 Feb 2024 12:44:55 -0700 Subject: [PATCH 03/26] fix action config --- src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml b/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml index 8533cf8..94aeede 100644 --- a/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml +++ b/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml @@ -1,5 +1,6 @@ nasctn_sea_data_product: name: test_SEA_CBRS_Measure_Baseline + rf_path: antenna # IIR filter settings iir_gpass_dB: 0.1 # Max passband ripple below unity gain iir_gstop_dB: 40 # Minimum stopband attenuation From d3b6eda7fea266011f4159d806e4200f3d0edaee Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Tue, 6 Feb 2024 10:08:28 -0700 Subject: [PATCH 04/26] fix cal_params bug when testing --- src/scos_tekrsa/hardware/tekrsa_sigan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scos_tekrsa/hardware/tekrsa_sigan.py b/src/scos_tekrsa/hardware/tekrsa_sigan.py index c2a8fb1..ccded98 100644 --- a/src/scos_tekrsa/hardware/tekrsa_sigan.py +++ b/src/scos_tekrsa/hardware/tekrsa_sigan.py @@ -296,7 +296,7 @@ def acquire_time_domain_samples( cal_params = self.sensor_calibration.calibration_parameters else: # Make it work for mock sigan/testing. Just match frequency. - cal_params = [vars(self)["_frequency"]] + cal_params = [vars(self)["frequency"]] try: cal_args = [vars(self)[f"_{p}"] for p in cal_params] except KeyError: From ab20d23301ef53d7cff1592eb57bde16a4bf5bcd Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Tue, 6 Feb 2024 10:12:41 -0700 Subject: [PATCH 05/26] add log debug messages --- src/scos_tekrsa/hardware/tekrsa_sigan.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/scos_tekrsa/hardware/tekrsa_sigan.py b/src/scos_tekrsa/hardware/tekrsa_sigan.py index ccded98..b102027 100644 --- a/src/scos_tekrsa/hardware/tekrsa_sigan.py +++ b/src/scos_tekrsa/hardware/tekrsa_sigan.py @@ -298,6 +298,8 @@ def acquire_time_domain_samples( # Make it work for mock sigan/testing. Just match frequency. cal_params = [vars(self)["frequency"]] try: + for param in cal_params: + logger.debug(f"scos-tekrsa: cal_param {param}") cal_args = [vars(self)[f"_{p}"] for p in cal_params] except KeyError: raise Exception( From b8eb3ed4f036b46212ae212c8157df3bc5629569 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Tue, 6 Feb 2024 10:25:02 -0700 Subject: [PATCH 06/26] fix bug when testing --- src/scos_tekrsa/hardware/tekrsa_sigan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scos_tekrsa/hardware/tekrsa_sigan.py b/src/scos_tekrsa/hardware/tekrsa_sigan.py index b102027..3d9aecd 100644 --- a/src/scos_tekrsa/hardware/tekrsa_sigan.py +++ b/src/scos_tekrsa/hardware/tekrsa_sigan.py @@ -296,7 +296,7 @@ def acquire_time_domain_samples( cal_params = self.sensor_calibration.calibration_parameters else: # Make it work for mock sigan/testing. Just match frequency. - cal_params = [vars(self)["frequency"]] + cal_params = ["_frequency"] try: for param in cal_params: logger.debug(f"scos-tekrsa: cal_param {param}") From fd66a07d96ca39c2e779337625052f91dc8fc8b1 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Tue, 6 Feb 2024 10:31:38 -0700 Subject: [PATCH 07/26] fix bug when testing --- src/scos_tekrsa/hardware/tekrsa_sigan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scos_tekrsa/hardware/tekrsa_sigan.py b/src/scos_tekrsa/hardware/tekrsa_sigan.py index 3d9aecd..284d887 100644 --- a/src/scos_tekrsa/hardware/tekrsa_sigan.py +++ b/src/scos_tekrsa/hardware/tekrsa_sigan.py @@ -296,7 +296,7 @@ def acquire_time_domain_samples( cal_params = self.sensor_calibration.calibration_parameters else: # Make it work for mock sigan/testing. Just match frequency. - cal_params = ["_frequency"] + cal_params = ["frequency"] try: for param in cal_params: logger.debug(f"scos-tekrsa: cal_param {param}") From ed8ee817222c893a62aff0498c1f90c1d690c2d5 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Tue, 6 Feb 2024 10:45:12 -0700 Subject: [PATCH 08/26] disable cal adjust in test data product --- src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml b/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml index 94aeede..8fc5d5c 100644 --- a/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml +++ b/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml @@ -1,6 +1,7 @@ nasctn_sea_data_product: name: test_SEA_CBRS_Measure_Baseline rf_path: antenna + calibration_adjust: False # IIR filter settings iir_gpass_dB: 0.1 # Max passband ripple below unity gain iir_gstop_dB: 40 # Minimum stopband attenuation From 73d2e97cec9bedfcb850e79c1ae08855a383cad0 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Fri, 9 Feb 2024 15:10:32 -0700 Subject: [PATCH 09/26] add debug log messages --- src/scos_tekrsa/hardware/tekrsa_sigan.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/scos_tekrsa/hardware/tekrsa_sigan.py b/src/scos_tekrsa/hardware/tekrsa_sigan.py index 284d887..1f6e997 100644 --- a/src/scos_tekrsa/hardware/tekrsa_sigan.py +++ b/src/scos_tekrsa/hardware/tekrsa_sigan.py @@ -377,7 +377,7 @@ def acquire_time_domain_samples( # Scale data to RF power and return logger.debug(f"Applying gain of {linear_gain}") data /= linear_gain - + logger.debug("Successfully applied linear gain") measurement_result = { "data": data, "overload": self.overload, @@ -389,4 +389,5 @@ def acquire_time_domain_samples( if self._model not in ["RSA306B", "RSA306"]: measurement_result["attenuation"] = self.attenuation measurement_result["preamp_enable"] = self.preamp_enable + logger.debug("returning measurement result") return measurement_result From c9597743b3316475297bbc5d43d134e4eccdd5e8 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Mon, 12 Feb 2024 09:07:57 -0700 Subject: [PATCH 10/26] adjust test survey action params --- .../configs/test/test_survey_iq_action.yml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/scos_tekrsa/configs/test/test_survey_iq_action.yml b/src/scos_tekrsa/configs/test/test_survey_iq_action.yml index d6c19ba..63688bf 100644 --- a/src/scos_tekrsa/configs/test/test_survey_iq_action.yml +++ b/src/scos_tekrsa/configs/test/test_survey_iq_action.yml @@ -12,18 +12,18 @@ stepped_frequency_time_domain_iq: - 793e6 - 802e6 reference_level: -10 - sample_rate: 56e6 + sample_rate: 14e6 duration_ms: - - 714 - - 714 - - 714 - - 714 - - 714 - - 714 - - 7140 - - 714 - - 714 - - 7140 + - 1000 + - 1000 + - 1000 + - 1000 + - 1000 + - 1000 + - 10000 + - 1000 + - 1000 + - 10000 nskip: 0 classification: UNCLASSIFIED calibration_adjust: False From e59edd80d775467d787ff96580d75c8c7ea34035 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Mon, 12 Feb 2024 09:53:03 -0700 Subject: [PATCH 11/26] test survey with different params --- ...ion.yml => test_survey_iq_action_sr14.yml} | 2 +- .../test/test_survey_iq_action_sr56.yml | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) rename src/scos_tekrsa/configs/test/{test_survey_iq_action.yml => test_survey_iq_action_sr14.yml} (92%) create mode 100644 src/scos_tekrsa/configs/test/test_survey_iq_action_sr56.yml diff --git a/src/scos_tekrsa/configs/test/test_survey_iq_action.yml b/src/scos_tekrsa/configs/test/test_survey_iq_action_sr14.yml similarity index 92% rename from src/scos_tekrsa/configs/test/test_survey_iq_action.yml rename to src/scos_tekrsa/configs/test/test_survey_iq_action_sr14.yml index 63688bf..5b2e9ff 100644 --- a/src/scos_tekrsa/configs/test/test_survey_iq_action.yml +++ b/src/scos_tekrsa/configs/test/test_survey_iq_action_sr14.yml @@ -1,5 +1,5 @@ stepped_frequency_time_domain_iq: - name: test_survey_iq_action + name: test_survey_iq_action_sr14 frequency: - 700.5e6 - 709e6 diff --git a/src/scos_tekrsa/configs/test/test_survey_iq_action_sr56.yml b/src/scos_tekrsa/configs/test/test_survey_iq_action_sr56.yml new file mode 100644 index 0000000..fc43ab3 --- /dev/null +++ b/src/scos_tekrsa/configs/test/test_survey_iq_action_sr56.yml @@ -0,0 +1,29 @@ +stepped_frequency_time_domain_iq: + name: test_survey_iq_action_sr56 + frequency: + - 700.5e6 + - 709e6 + - 731.5e6 + - 739e6 + - 751e6 + - 763e6 + - 772e6 + - 782e6 + - 793e6 + - 802e6 + reference_level: -10 + sample_rate: 56e6 + duration_ms: + - 714 + - 714 + - 714 + - 714 + - 714 + - 714 + - 7140 + - 714 + - 714 + - 7140 + nskip: 0 + classification: UNCLASSIFIED + calibration_adjust: False \ No newline at end of file From a38c88523900a60ae8fbbea8d7d1bf71b890f2db Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Tue, 20 Feb 2024 09:27:07 -0700 Subject: [PATCH 12/26] add cal adjust to measure baseline, add test monitor action, remove debug messages --- .../configs/actions-500-600/SEA_CBRS_Measure_Baseline.yml | 1 + src/scos_tekrsa/discover/__init__.py | 1 + src/scos_tekrsa/hardware/tekrsa_sigan.py | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scos_tekrsa/configs/actions-500-600/SEA_CBRS_Measure_Baseline.yml b/src/scos_tekrsa/configs/actions-500-600/SEA_CBRS_Measure_Baseline.yml index a19fe2f..4e3127d 100644 --- a/src/scos_tekrsa/configs/actions-500-600/SEA_CBRS_Measure_Baseline.yml +++ b/src/scos_tekrsa/configs/actions-500-600/SEA_CBRS_Measure_Baseline.yml @@ -43,3 +43,4 @@ nasctn_sea_data_product: - 3685e6 - 3695e6 - 3705e6 + calibration_adjust: True \ No newline at end of file diff --git a/src/scos_tekrsa/discover/__init__.py b/src/scos_tekrsa/discover/__init__.py index dd3250c..fbdec55 100644 --- a/src/scos_tekrsa/discover/__init__.py +++ b/src/scos_tekrsa/discover/__init__.py @@ -40,6 +40,7 @@ logger.debug(f"scos-tekrsa: SIGAN_CLASS = {SIGAN_CLASS}") if SIGAN_MODULE == "scos_tekrsa.hardware.tekrsa_sigan" and SIGAN_CLASS == "TekRSASigan": logger.debug("scos-tekrsa: loading test action configs") + test_actions["monitor_tekrsa"] = MonitorSignalAnalyzer(parameters={"name": "monitor_tekrsa"}) TEST_ACTION_DEFINITIONS_DIR = CONFIG_DIR / "test" logger.debug(f"scos-tekrsa: TEST_ACTION_DEFINITIONS_DIR = {TEST_ACTION_DEFINITIONS_DIR}") _, yaml_test_actions = init(yaml_dir=TEST_ACTION_DEFINITIONS_DIR) diff --git a/src/scos_tekrsa/hardware/tekrsa_sigan.py b/src/scos_tekrsa/hardware/tekrsa_sigan.py index 1f6e997..8948ad9 100644 --- a/src/scos_tekrsa/hardware/tekrsa_sigan.py +++ b/src/scos_tekrsa/hardware/tekrsa_sigan.py @@ -377,7 +377,6 @@ def acquire_time_domain_samples( # Scale data to RF power and return logger.debug(f"Applying gain of {linear_gain}") data /= linear_gain - logger.debug("Successfully applied linear gain") measurement_result = { "data": data, "overload": self.overload, @@ -389,5 +388,4 @@ def acquire_time_domain_samples( if self._model not in ["RSA306B", "RSA306"]: measurement_result["attenuation"] = self.attenuation measurement_result["preamp_enable"] = self.preamp_enable - logger.debug("returning measurement result") return measurement_result From c2210c8e1b7a2899244b0c4d9aa0a1754fb6b29a Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Tue, 20 Feb 2024 14:33:29 -0700 Subject: [PATCH 13/26] remove 56 msps survey, keep 14 msps survey --- ...ion_sr14.yml => test_survey_iq_action.yml} | 0 .../test/test_survey_iq_action_sr56.yml | 29 ------------------- 2 files changed, 29 deletions(-) rename src/scos_tekrsa/configs/test/{test_survey_iq_action_sr14.yml => test_survey_iq_action.yml} (100%) delete mode 100644 src/scos_tekrsa/configs/test/test_survey_iq_action_sr56.yml diff --git a/src/scos_tekrsa/configs/test/test_survey_iq_action_sr14.yml b/src/scos_tekrsa/configs/test/test_survey_iq_action.yml similarity index 100% rename from src/scos_tekrsa/configs/test/test_survey_iq_action_sr14.yml rename to src/scos_tekrsa/configs/test/test_survey_iq_action.yml diff --git a/src/scos_tekrsa/configs/test/test_survey_iq_action_sr56.yml b/src/scos_tekrsa/configs/test/test_survey_iq_action_sr56.yml deleted file mode 100644 index fc43ab3..0000000 --- a/src/scos_tekrsa/configs/test/test_survey_iq_action_sr56.yml +++ /dev/null @@ -1,29 +0,0 @@ -stepped_frequency_time_domain_iq: - name: test_survey_iq_action_sr56 - frequency: - - 700.5e6 - - 709e6 - - 731.5e6 - - 739e6 - - 751e6 - - 763e6 - - 772e6 - - 782e6 - - 793e6 - - 802e6 - reference_level: -10 - sample_rate: 56e6 - duration_ms: - - 714 - - 714 - - 714 - - 714 - - 714 - - 714 - - 7140 - - 714 - - 714 - - 7140 - nskip: 0 - classification: UNCLASSIFIED - calibration_adjust: False \ No newline at end of file From 1489e227790bf4910c3f2174382b75b379957ed6 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Tue, 20 Feb 2024 14:45:13 -0700 Subject: [PATCH 14/26] remove debug message --- src/scos_tekrsa/hardware/tekrsa_sigan.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/scos_tekrsa/hardware/tekrsa_sigan.py b/src/scos_tekrsa/hardware/tekrsa_sigan.py index 8948ad9..0134d0a 100644 --- a/src/scos_tekrsa/hardware/tekrsa_sigan.py +++ b/src/scos_tekrsa/hardware/tekrsa_sigan.py @@ -298,8 +298,6 @@ def acquire_time_domain_samples( # Make it work for mock sigan/testing. Just match frequency. cal_params = ["frequency"] try: - for param in cal_params: - logger.debug(f"scos-tekrsa: cal_param {param}") cal_args = [vars(self)[f"_{p}"] for p in cal_params] except KeyError: raise Exception( From 57ebd7a849a926d2ecf6a11e2c62b67bf506996e Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Tue, 27 Feb 2024 13:33:00 -0700 Subject: [PATCH 15/26] fix survey action name --- src/scos_tekrsa/configs/test/test_survey_iq_action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scos_tekrsa/configs/test/test_survey_iq_action.yml b/src/scos_tekrsa/configs/test/test_survey_iq_action.yml index 5b2e9ff..63688bf 100644 --- a/src/scos_tekrsa/configs/test/test_survey_iq_action.yml +++ b/src/scos_tekrsa/configs/test/test_survey_iq_action.yml @@ -1,5 +1,5 @@ stepped_frequency_time_domain_iq: - name: test_survey_iq_action_sr14 + name: test_survey_iq_action frequency: - 700.5e6 - 709e6 From 5fc96ae85967562226e06050aec8b26e53b9a91d Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Wed, 28 Feb 2024 09:03:45 -0700 Subject: [PATCH 16/26] add test to monitor action name in test actions --- src/scos_tekrsa/discover/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scos_tekrsa/discover/__init__.py b/src/scos_tekrsa/discover/__init__.py index fbdec55..efc6da2 100644 --- a/src/scos_tekrsa/discover/__init__.py +++ b/src/scos_tekrsa/discover/__init__.py @@ -40,7 +40,7 @@ logger.debug(f"scos-tekrsa: SIGAN_CLASS = {SIGAN_CLASS}") if SIGAN_MODULE == "scos_tekrsa.hardware.tekrsa_sigan" and SIGAN_CLASS == "TekRSASigan": logger.debug("scos-tekrsa: loading test action configs") - test_actions["monitor_tekrsa"] = MonitorSignalAnalyzer(parameters={"name": "monitor_tekrsa"}) + test_actions["test_monitor_tekrsa"] = MonitorSignalAnalyzer(parameters={"name": "monitor_tekrsa"}) TEST_ACTION_DEFINITIONS_DIR = CONFIG_DIR / "test" logger.debug(f"scos-tekrsa: TEST_ACTION_DEFINITIONS_DIR = {TEST_ACTION_DEFINITIONS_DIR}") _, yaml_test_actions = init(yaml_dir=TEST_ACTION_DEFINITIONS_DIR) From 8c1d680cac9268ad7ce380f5c627459842548ab2 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Wed, 28 Feb 2024 10:57:13 -0700 Subject: [PATCH 17/26] autoformat code --- .../actions-500-600/SEA_CBRS_Measure_Baseline.yml | 2 +- .../configs/test/test_single_frequency_m4s_action.yml | 2 +- src/scos_tekrsa/configs/test/test_survey_iq_action.yml | 2 +- src/scos_tekrsa/discover/__init__.py | 10 +++++++--- src/scos_tekrsa/settings.py | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/scos_tekrsa/configs/actions-500-600/SEA_CBRS_Measure_Baseline.yml b/src/scos_tekrsa/configs/actions-500-600/SEA_CBRS_Measure_Baseline.yml index 4e3127d..e9325c1 100644 --- a/src/scos_tekrsa/configs/actions-500-600/SEA_CBRS_Measure_Baseline.yml +++ b/src/scos_tekrsa/configs/actions-500-600/SEA_CBRS_Measure_Baseline.yml @@ -43,4 +43,4 @@ nasctn_sea_data_product: - 3685e6 - 3695e6 - 3705e6 - calibration_adjust: True \ No newline at end of file + calibration_adjust: True diff --git a/src/scos_tekrsa/configs/test/test_single_frequency_m4s_action.yml b/src/scos_tekrsa/configs/test/test_single_frequency_m4s_action.yml index 3fb64dd..57e3792 100644 --- a/src/scos_tekrsa/configs/test/test_single_frequency_m4s_action.yml +++ b/src/scos_tekrsa/configs/test/test_single_frequency_m4s_action.yml @@ -7,4 +7,4 @@ single_frequency_fft: nffts: 300 nskip: 0 classification: UNCLASSIFIED - calibration_adjust: False \ No newline at end of file + calibration_adjust: False diff --git a/src/scos_tekrsa/configs/test/test_survey_iq_action.yml b/src/scos_tekrsa/configs/test/test_survey_iq_action.yml index 63688bf..53b958e 100644 --- a/src/scos_tekrsa/configs/test/test_survey_iq_action.yml +++ b/src/scos_tekrsa/configs/test/test_survey_iq_action.yml @@ -12,7 +12,7 @@ stepped_frequency_time_domain_iq: - 793e6 - 802e6 reference_level: -10 - sample_rate: 14e6 + sample_rate: 14e6 duration_ms: - 1000 - 1000 diff --git a/src/scos_tekrsa/discover/__init__.py b/src/scos_tekrsa/discover/__init__.py index efc6da2..e7c66b4 100644 --- a/src/scos_tekrsa/discover/__init__.py +++ b/src/scos_tekrsa/discover/__init__.py @@ -3,7 +3,7 @@ from scos_actions.actions.monitor_sigan import MonitorSignalAnalyzer from scos_actions.discover import init -from scos_tekrsa.settings import CONFIG_DIR, DEVICE_MODEL, SIGAN_MODULE, SIGAN_CLASS +from scos_tekrsa.settings import CONFIG_DIR, DEVICE_MODEL, SIGAN_CLASS, SIGAN_MODULE logger = logging.getLogger(__name__) @@ -40,9 +40,13 @@ logger.debug(f"scos-tekrsa: SIGAN_CLASS = {SIGAN_CLASS}") if SIGAN_MODULE == "scos_tekrsa.hardware.tekrsa_sigan" and SIGAN_CLASS == "TekRSASigan": logger.debug("scos-tekrsa: loading test action configs") - test_actions["test_monitor_tekrsa"] = MonitorSignalAnalyzer(parameters={"name": "monitor_tekrsa"}) + test_actions["test_monitor_tekrsa"] = MonitorSignalAnalyzer( + parameters={"name": "monitor_tekrsa"} + ) TEST_ACTION_DEFINITIONS_DIR = CONFIG_DIR / "test" - logger.debug(f"scos-tekrsa: TEST_ACTION_DEFINITIONS_DIR = {TEST_ACTION_DEFINITIONS_DIR}") + logger.debug( + f"scos-tekrsa: TEST_ACTION_DEFINITIONS_DIR = {TEST_ACTION_DEFINITIONS_DIR}" + ) _, yaml_test_actions = init(yaml_dir=TEST_ACTION_DEFINITIONS_DIR) logger.debug(f"scos-tekrsa: Found {len(yaml_test_actions)} test action configs") test_actions.update(yaml_test_actions) diff --git a/src/scos_tekrsa/settings.py b/src/scos_tekrsa/settings.py index b4dd0b1..9362fc0 100644 --- a/src/scos_tekrsa/settings.py +++ b/src/scos_tekrsa/settings.py @@ -19,4 +19,4 @@ if RUNNING_TESTS: logging.basicConfig(level=logging.DEBUG) SIGAN_MODULE = env.str("SIGAN_MODULE", default="scos_tekrsa.hardware.tekrsa_sigan") -SIGAN_CLASS = env.str("SIGAN_CLASS", default="TekRSASigan") \ No newline at end of file +SIGAN_CLASS = env.str("SIGAN_CLASS", default="TekRSASigan") From f9171aec30fde5e7e183653fb4eb721642fbbd94 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Mon, 11 Mar 2024 09:56:32 -0600 Subject: [PATCH 18/26] add plugin_name property to tekrsa_sigan --- src/scos_tekrsa/hardware/tekrsa_sigan.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/scos_tekrsa/hardware/tekrsa_sigan.py b/src/scos_tekrsa/hardware/tekrsa_sigan.py index 0134d0a..56e4852 100644 --- a/src/scos_tekrsa/hardware/tekrsa_sigan.py +++ b/src/scos_tekrsa/hardware/tekrsa_sigan.py @@ -9,6 +9,7 @@ import scos_tekrsa.hardware.tekrsa_constants as rsa_constants from scos_tekrsa import __version__ as SCOS_TEKRSA_VERSION +from scos_tekrsa import __package__ as SCOS_TEKRSA_NAME from scos_tekrsa import settings from scos_tekrsa.hardware.mocks.rsa_block import MockRSA @@ -28,6 +29,7 @@ def __init__( super().__init__(sensor_cal, sigan_cal, switches) logger.debug("Initializing Tektronix RSA Signal Analyzer") self._plugin_version = SCOS_TEKRSA_VERSION + self._plugin_name = SCOS_TEKRSA_NAME self.rsa = None self._is_available = False # should not be set outside of connect method @@ -119,6 +121,11 @@ def is_available(self) -> bool: def plugin_version(self) -> str: """Returns the current version of scos-tekrsa.""" return self._plugin_version + + @property + def plugin_name(self) -> str: + """Returns the current package name of scos-tekrsa.""" + return self._plugin_name @property def firmware_version(self) -> str: From ce5a5c8936665389e0955e167c7bb96c3fa96f7c Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Fri, 15 Mar 2024 12:28:26 -0600 Subject: [PATCH 19/26] only load actions if sigan set to tekrsa sigan --- src/scos_tekrsa/discover/__init__.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/scos_tekrsa/discover/__init__.py b/src/scos_tekrsa/discover/__init__.py index e7c66b4..7108a53 100644 --- a/src/scos_tekrsa/discover/__init__.py +++ b/src/scos_tekrsa/discover/__init__.py @@ -29,16 +29,17 @@ ) ACTION_DEFINITIONS_DIR = CONFIG_DIR / "actions-500-600" logger.debug(f"Action configs directory: {ACTION_DEFINITIONS_DIR}") -actions["monitor_tekrsa"] = MonitorSignalAnalyzer(parameters={"name": "monitor_tekrsa"}) -logger.debug("Created Monitor SIGAN action") -# Pass new radio to existing action classes with new SDR specific yaml files -logger.debug("Initializing yaml actions") -yaml_actions, _ = init(yaml_dir=ACTION_DEFINITIONS_DIR) -logger.debug(f"Created {len(yaml_actions)} actions") -actions.update(yaml_actions) + logger.debug(f"scos-tekrsa: SIGAN_MODULE = {SIGAN_MODULE}") logger.debug(f"scos-tekrsa: SIGAN_CLASS = {SIGAN_CLASS}") if SIGAN_MODULE == "scos_tekrsa.hardware.tekrsa_sigan" and SIGAN_CLASS == "TekRSASigan": + actions["monitor_tekrsa"] = MonitorSignalAnalyzer(parameters={"name": "monitor_tekrsa"}) + logger.debug("Created Monitor SIGAN action") + # SDR specific yaml files + logger.debug("Initializing yaml actions") + yaml_actions, _ = init(yaml_dir=ACTION_DEFINITIONS_DIR) + logger.debug(f"Created {len(yaml_actions)} actions") + actions.update(yaml_actions) logger.debug("scos-tekrsa: loading test action configs") test_actions["test_monitor_tekrsa"] = MonitorSignalAnalyzer( parameters={"name": "monitor_tekrsa"} From b32eb3bcae2563c453f759096b39c3b65116b884 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Thu, 4 Apr 2024 13:29:13 -0600 Subject: [PATCH 20/26] autoformat --- src/scos_tekrsa/discover/__init__.py | 4 +++- src/scos_tekrsa/hardware/tekrsa_sigan.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/scos_tekrsa/discover/__init__.py b/src/scos_tekrsa/discover/__init__.py index 7108a53..356b257 100644 --- a/src/scos_tekrsa/discover/__init__.py +++ b/src/scos_tekrsa/discover/__init__.py @@ -33,7 +33,9 @@ logger.debug(f"scos-tekrsa: SIGAN_MODULE = {SIGAN_MODULE}") logger.debug(f"scos-tekrsa: SIGAN_CLASS = {SIGAN_CLASS}") if SIGAN_MODULE == "scos_tekrsa.hardware.tekrsa_sigan" and SIGAN_CLASS == "TekRSASigan": - actions["monitor_tekrsa"] = MonitorSignalAnalyzer(parameters={"name": "monitor_tekrsa"}) + actions["monitor_tekrsa"] = MonitorSignalAnalyzer( + parameters={"name": "monitor_tekrsa"} + ) logger.debug("Created Monitor SIGAN action") # SDR specific yaml files logger.debug("Initializing yaml actions") diff --git a/src/scos_tekrsa/hardware/tekrsa_sigan.py b/src/scos_tekrsa/hardware/tekrsa_sigan.py index 70c917e..56c4d9f 100644 --- a/src/scos_tekrsa/hardware/tekrsa_sigan.py +++ b/src/scos_tekrsa/hardware/tekrsa_sigan.py @@ -7,8 +7,8 @@ from scos_actions.hardware.sigan_iface import SignalAnalyzerInterface import scos_tekrsa.hardware.tekrsa_constants as rsa_constants -from scos_tekrsa import __version__ as SCOS_TEKRSA_VERSION from scos_tekrsa import __package__ as SCOS_TEKRSA_NAME +from scos_tekrsa import __version__ as SCOS_TEKRSA_VERSION from scos_tekrsa import settings from scos_tekrsa.hardware.mocks.rsa_block import MockRSA @@ -121,7 +121,7 @@ def is_available(self) -> bool: def plugin_version(self) -> str: """Returns the current version of scos-tekrsa.""" return self._plugin_version - + @property def plugin_name(self) -> str: """Returns the current package name of scos-tekrsa.""" From 87f81d4b905f0198aa918efb105a7fb0add9a247 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Fri, 26 Apr 2024 09:56:45 -0600 Subject: [PATCH 21/26] update scos-actions version to release tag --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d72b16b..e3313ce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ classifiers = [ dependencies = [ "environs>=9.5.0", "tekrsa-api-wrap>=1.3.2", - "scos_actions @ git+https://github.com/NTIA/scos-actions@SEA-178_test_actions_loading", + "scos_actions @ git+https://github.com/NTIA/scos-actions@10.0.0", ] [project.optional-dependencies] From 88cde1f6a53aa4e85a3b389daf5654c77803447a Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Fri, 26 Apr 2024 12:08:42 -0600 Subject: [PATCH 22/26] change scos-actions branch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e3313ce..3e7e6a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ classifiers = [ dependencies = [ "environs>=9.5.0", "tekrsa-api-wrap>=1.3.2", - "scos_actions @ git+https://github.com/NTIA/scos-actions@10.0.0", + "scos_actions @ git+https://github.com/NTIA/scos-actions@revert-117-revert-110-SEA-178_test_actions_loading", ] [project.optional-dependencies] From e90f7579c51a52db0007a6dfefe54d885df20148 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Mon, 29 Apr 2024 09:22:23 -0600 Subject: [PATCH 23/26] Change scos-actions version to 10.0.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3e7e6a0..e3313ce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ classifiers = [ dependencies = [ "environs>=9.5.0", "tekrsa-api-wrap>=1.3.2", - "scos_actions @ git+https://github.com/NTIA/scos-actions@revert-117-revert-110-SEA-178_test_actions_loading", + "scos_actions @ git+https://github.com/NTIA/scos-actions@10.0.0", ] [project.optional-dependencies] From 62565d7ae13c65b77f586beaf7abe752ad6e1dc1 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Mon, 29 Apr 2024 12:55:42 -0600 Subject: [PATCH 24/26] Change scos-actions branch, Only set SIGAN_MODULE and SIGAN_CLASS when running tests, remove cal adjust from cbrs measure yml files --- pyproject.toml | 2 +- .../actions-500-600/SEA_CBRS_Measure_Baseline.yml | 1 - .../configs/test/test_SEA_CBRS_Measure_Baseline.yml | 1 - src/scos_tekrsa/settings.py | 10 ++++++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e3313ce..61a7a82 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ classifiers = [ dependencies = [ "environs>=9.5.0", "tekrsa-api-wrap>=1.3.2", - "scos_actions @ git+https://github.com/NTIA/scos-actions@10.0.0", + "scos_actions @ git+https://github.com/NTIA/scos-actions@fix_test_cbrs_measure", ] [project.optional-dependencies] diff --git a/src/scos_tekrsa/configs/actions-500-600/SEA_CBRS_Measure_Baseline.yml b/src/scos_tekrsa/configs/actions-500-600/SEA_CBRS_Measure_Baseline.yml index e9325c1..a19fe2f 100644 --- a/src/scos_tekrsa/configs/actions-500-600/SEA_CBRS_Measure_Baseline.yml +++ b/src/scos_tekrsa/configs/actions-500-600/SEA_CBRS_Measure_Baseline.yml @@ -43,4 +43,3 @@ nasctn_sea_data_product: - 3685e6 - 3695e6 - 3705e6 - calibration_adjust: True diff --git a/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml b/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml index 8fc5d5c..94aeede 100644 --- a/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml +++ b/src/scos_tekrsa/configs/test/test_SEA_CBRS_Measure_Baseline.yml @@ -1,7 +1,6 @@ nasctn_sea_data_product: name: test_SEA_CBRS_Measure_Baseline rf_path: antenna - calibration_adjust: False # IIR filter settings iir_gpass_dB: 0.1 # Max passband ripple below unity gain iir_gstop_dB: 40 # Minimum stopband attenuation diff --git a/src/scos_tekrsa/settings.py b/src/scos_tekrsa/settings.py index 9362fc0..80b8694 100644 --- a/src/scos_tekrsa/settings.py +++ b/src/scos_tekrsa/settings.py @@ -5,6 +5,7 @@ from environs import Env from scos_actions.settings import * +logger = logging.getLogger(__name__) env = Env() CONFIG_DIR = Path(__file__).parent.resolve() / "configs" @@ -18,5 +19,10 @@ RUNNING_MIGRATIONS = env.bool("RUNNING_MIGRATIONS", default=False) if RUNNING_TESTS: logging.basicConfig(level=logging.DEBUG) -SIGAN_MODULE = env.str("SIGAN_MODULE", default="scos_tekrsa.hardware.tekrsa_sigan") -SIGAN_CLASS = env.str("SIGAN_CLASS", default="TekRSASigan") +SIGAN_MODULE = env.str("SIGAN_MODULE", default=None) +SIGAN_CLASS = env.str("SIGAN_CLASS", default=None) +if RUNNING_TESTS: + SIGAN_MODULE = "scos_tekrsa.hardware.tekrsa_sigan" + SIGAN_CLASS = "TekRSASigan" +logger.debug(f"scos-tekrsa: SIGAN_MODULE:{SIGAN_MODULE}") +logger.debug(f"scos-tekrsa: SIGAN_CLASS:{SIGAN_CLASS}") From caca013fe7134ee1be9e4716bfc3ef43b9717920 Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Tue, 30 Apr 2024 14:29:20 -0600 Subject: [PATCH 25/26] Update scos-actions version to 10.0.1 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 61a7a82..067b8f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,7 +41,7 @@ classifiers = [ dependencies = [ "environs>=9.5.0", "tekrsa-api-wrap>=1.3.2", - "scos_actions @ git+https://github.com/NTIA/scos-actions@fix_test_cbrs_measure", + "scos_actions @ git+https://github.com/NTIA/scos-actions@10.0.1", ] [project.optional-dependencies] From 186dfaa6b5933a1c11561c67af6a8fd2750ba3bc Mon Sep 17 00:00:00 2001 From: Justin Haze Date: Tue, 30 Apr 2024 14:39:58 -0600 Subject: [PATCH 26/26] Update version to 7.0.0 --- src/scos_tekrsa/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scos_tekrsa/__init__.py b/src/scos_tekrsa/__init__.py index 0f607a5..b378fc6 100644 --- a/src/scos_tekrsa/__init__.py +++ b/src/scos_tekrsa/__init__.py @@ -1 +1 @@ -__version__ = "6.0.0" +__version__ = "7.0.0"