Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sea 178 test actions loading #29

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open

Sea 178 test actions loading #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
4b88423
update scos-actions, cleanup settings, add sigan settings, add test a…
jhazentia Feb 12, 2024
073f331
capitalize yaml boolean for consistency with python
jhazentia Feb 12, 2024
2b8552b
remove sigan/gps instantiation, make compatible with latest scos-acti…
jhazentia Feb 14, 2024
1944aa5
change scos-actions branch
jhazentia Feb 15, 2024
2acb7b9
fix bug in settings, make settings consistent with scos-tekrsa
jhazentia Feb 15, 2024
e11f7ae
fix log message bug
jhazentia Feb 15, 2024
c1df7ad
add get_pp_string() to mock usrp block
jhazentia Feb 15, 2024
085a071
fix bug in mock get_pp_string()
jhazentia Feb 15, 2024
53e51dc
add test action
jhazentia Feb 15, 2024
734e278
load test monitor and gps actions, fix get_clock_rate() call, check o…
jhazentia Feb 20, 2024
5b6803a
remove extra test survey actions
jhazentia Feb 20, 2024
ad7134b
fix survey action name
jhazentia Feb 27, 2024
22b8dac
add test to monitor and gps action names in test actions
jhazentia Feb 28, 2024
b44743b
autoformat code
jhazentia Feb 28, 2024
b6e2a42
remove test gps action
jhazentia Feb 29, 2024
07d4625
add check for 1db compression
jhazentia Mar 1, 2024
09345ed
remove outdated method (already in base class)
jhazentia Mar 4, 2024
8e62990
add plugin_name property to usrp_sigan
jhazentia Mar 11, 2024
f1729b1
only load actions if sigan set to USRP sigan
jhazentia Mar 15, 2024
528ac13
formatting, update to latest scos-actions changes, pass sensor to gps…
jhazentia Apr 8, 2024
4743441
rename gps_iface.py to usrp_gps.py, USRPLocation to UsrpGps
jhazentia Apr 8, 2024
950b636
simplify sigan overload, move sensor overload to sensor class in scos…
jhazentia Apr 9, 2024
891b7b6
remove tests no longer applicable
jhazentia Apr 9, 2024
9c15744
Update readme testing instructions
jhazentia Apr 11, 2024
a809ee0
disable cal adjust on most actions except a couple for testing
jhazentia Apr 11, 2024
ddc6cd5
Change gain check behavior
jhazentia Apr 11, 2024
d495ff0
change scos-actions branch
jhazentia Apr 26, 2024
710c311
Change scos-actions version to 10.0.0
jhazentia Apr 29, 2024
dd83ec4
Change scos-usrp version to 5.0.0
jhazentia Apr 29, 2024
f8326ca
README lint, only set default SIGAN_MODULE and SIGAN_CLASS when runni…
jhazentia Apr 29, 2024
27816fb
change scos-actions version
jhazentia Apr 29, 2024
94db391
update scos-actions version to 10.0.1
jhazentia Apr 30, 2024
f9629f1
set clock rate before sample rate, raise exceptions
jhazentia May 6, 2024
1077fd2
autoformat, change scos-actions branch
jhazentia May 6, 2024
8c52a8e
round for sample rate and clock rate check
jhazentia May 6, 2024
ab1127a
remove unneeded log message
jhazentia May 7, 2024
d23d3a6
change scos-actions version back to 10.0.1
jhazentia May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions README.md
View file
Open in desktop
Expand Up @@ -107,14 +107,22 @@ hatchling build

### Running Tests

Since the UHD drivers are required, a docker container is used for testing. [Install
Docker](https://docs.docker.com/get-docker/).
Without the python3-uhd package installed, a docker container can be used for
testing. [Install Docker](https://docs.docker.com/get-docker/).

```bash
docker build -f docker/Dockerfile-test -t usrp_test .
docker run usrp_test
```

With the python3-uhd package installed (`sudo apt install python3-uhd` on Ubuntu),
pytest can be run directly when using a compatible version of Python
(3.8 on Ubuntu 20.04):

```bash
pytest
```

### Committing

Besides running the test suite and ensuring that all tests are passing, we also expect
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Expand Up @@ -43,7 +43,7 @@ dependencies = [
"django>=3.2.15,<4.0",
"environs>=9.0, <10.0",
"numpy>=1.22.0",
"scos_actions @ git+https://github.com/NTIA/scos-actions@7.0.1",
"scos_actions @ git+https://github.com/NTIA/scos-actions@10.0.1",
]

[project.optional-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion scos_usrp/__init__.py
View file
Open in desktop
@@ -1 +1 @@
__version__ = "4.0.0"
__version__ = "5.0.0"
4 changes: 2 additions & 2 deletions ...figs/actions/acquire_iq_700MHz_ATT_DL.yml → ...tions/acquire_iq_700MHz_ATT_DL_no_cal.yml
View file
Open in desktop
@@ -1,9 +1,9 @@
single_frequency_time_domain_iq:
name: acquire_iq_700MHz_ATT_DL
name: acquire_iq_700MHz_ATT_DL_no_cal
frequency: 739e6
gain: 40
sample_rate: 15.36e6
duration_ms: 1000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...figs/actions/acquire_iq_700MHz_ATT_UL.yml → ...tions/acquire_iq_700MHz_ATT_UL_no_cal.yml
View file
Open in desktop
@@ -1,9 +1,9 @@
single_frequency_time_domain_iq:
name: acquire_iq_700MHz_ATT_UL
name: acquire_iq_700MHz_ATT_UL_no_cal
frequency: 709e6
gain: 40
sample_rate: 15.36e6
duration_ms: 1000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...actions/acquire_iq_700MHz_FirstNet_DL.yml → .../acquire_iq_700MHz_FirstNet_DL_no_cal.yml
View file
Open in desktop
@@ -1,9 +1,9 @@
single_frequency_time_domain_iq:
name: acquire_iq_700MHz_FirstNet_DL
name: acquire_iq_700MHz_FirstNet_DL_no_cal
frequency: 763e6
gain: 40
sample_rate: 15.36e6
duration_ms: 1000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...actions/acquire_iq_700MHz_FirstNet_UL.yml → .../acquire_iq_700MHz_FirstNet_UL_no_cal.yml
View file
Open in desktop
@@ -1,9 +1,9 @@
single_frequency_time_domain_iq:
name: acquire_iq_700MHz_FirstNet_UL
name: acquire_iq_700MHz_FirstNet_UL_no_cal
frequency: 793e6
gain: 40
sample_rate: 15.36e6
duration_ms: 1000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...tions/acquire_iq_700MHz_P-SafetyNB_DL.yml → ...cquire_iq_700MHz_P-SafetyNB_DL_no_cal.yml
View file
Open in desktop
@@ -1,9 +1,9 @@
single_frequency_time_domain_iq:
name: acquire_iq_700MHz_P-SafetyNB_DL
name: acquire_iq_700MHz_P-SafetyNB_DL_no_cal
frequency: 772e6
gain: 40
sample_rate: 15.36e6
duration_ms: 10000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...tions/acquire_iq_700MHz_P-SafetyNB_UL.yml → ...cquire_iq_700MHz_P-SafetyNB_UL_no_cal.yml
View file
Open in desktop
@@ -1,9 +1,9 @@
single_frequency_time_domain_iq:
name: acquire_iq_700MHz_P-SafetyNB_UL
name: acquire_iq_700MHz_P-SafetyNB_UL_no_cal
frequency: 802e6
gain: 40
sample_rate: 15.36e6
duration_ms: 10000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...actions/acquire_iq_700MHz_T-Mobile_DL.yml → .../acquire_iq_700MHz_T-Mobile_DL_no_cal.yml
View file
Open in desktop
@@ -1,9 +1,9 @@
single_frequency_time_domain_iq:
name: acquire_iq_700MHz_T-Mobile_DL
name: acquire_iq_700MHz_T-Mobile_DL_no_cal
frequency: 731.5e6
gain: 40
sample_rate: 15.36e6
duration_ms: 1000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
9 changes: 9 additions & 0 deletions scos_usrp/configs/actions/acquire_iq_700MHz_T-Mobile_UL_cal.yml
View file
Open in desktop
@@ -0,0 +1,9 @@
single_frequency_time_domain_iq:
name: acquire_iq_700MHz_T-Mobile_UL_cal
frequency: 700e6
gain: 40
sample_rate: 15.36e6
duration_ms: 1000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: True
4 changes: 2 additions & 2 deletions ...actions/acquire_iq_700MHz_T-Mobile_UL.yml → .../acquire_iq_700MHz_T-Mobile_UL_no_cal.yml
View file
Open in desktop
@@ -1,9 +1,9 @@
single_frequency_time_domain_iq:
name: acquire_iq_700MHz_T-Mobile_UL
name: acquire_iq_700MHz_T-Mobile_UL_no_cal
frequency: 700.5e6
gain: 40
sample_rate: 15.36e6
duration_ms: 1000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions .../actions/acquire_iq_700MHz_Verizon_DL.yml → ...s/acquire_iq_700MHz_Verizon_DL_no_cal.yml
View file
Open in desktop
@@ -1,9 +1,9 @@
single_frequency_time_domain_iq:
name: acquire_iq_700MHz_Verizon_DL
name: acquire_iq_700MHz_Verizon_DL_no_cal
frequency: 751e6
gain: 40
sample_rate: 15.36e6
duration_ms: 1000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions .../actions/acquire_iq_700MHz_Verizon_UL.yml → ...s/acquire_iq_700MHz_Verizon_UL_no_cal.yml
View file
Open in desktop
@@ -1,9 +1,9 @@
single_frequency_time_domain_iq:
name: acquire_iq_700MHz_Verizon_UL
name: acquire_iq_700MHz_Verizon_UL_no_cal
frequency: 782e6
gain: 40
sample_rate: 15.36e6
duration_ms: 1000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...igs/actions/acquire_m4s_700MHz_ATT_DL.yml → ...ions/acquire_m4s_700MHz_ATT_DL_no_cal.yml
View file
Open in desktop
@@ -1,10 +1,10 @@
single_frequency_fft:
name: acquire_m4s_700MHz_ATT_DL
name: acquire_m4s_700MHz_ATT_DL_no_cal
frequency: 739e6
gain: 40
sample_rate: 15.36e6
fft_size: 1024
nffts: 300
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...igs/actions/acquire_m4s_700MHz_ATT_UL.yml → ...ions/acquire_m4s_700MHz_ATT_UL_no_cal.yml
View file
Open in desktop
@@ -1,10 +1,10 @@
single_frequency_fft:
name: acquire_m4s_700MHz_ATT_UL
name: acquire_m4s_700MHz_ATT_UL_no_cal
frequency: 709e6
gain: 40
sample_rate: 15.36e6
fft_size: 1024
nffts: 300
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...ctions/acquire_m4s_700MHz_FirstNet_DL.yml → ...acquire_m4s_700MHz_FirstNet_DL_no_cal.yml
View file
Open in desktop
@@ -1,10 +1,10 @@
single_frequency_fft:
name: acquire_m4s_700MHz_FirstNet_DL
name: acquire_m4s_700MHz_FirstNet_DL_no_cal
frequency: 763e6
gain: 40
sample_rate: 15.36e6
fft_size: 1024
nffts: 300
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...ctions/acquire_m4s_700MHz_FirstNet_UL.yml → ...acquire_m4s_700MHz_FirstNet_UL_no_cal.yml
View file
Open in desktop
@@ -1,10 +1,10 @@
single_frequency_fft:
name: acquire_m4s_700MHz_FirstNet_UL
name: acquire_m4s_700MHz_FirstNet_UL_no_cal
frequency: 793e6
gain: 40
sample_rate: 15.36e6
fft_size: 1024
nffts: 300
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...ions/acquire_m4s_700MHz_P-SafetyNB_DL.yml → ...quire_m4s_700MHz_P-SafetyNB_DL_no_cal.yml
View file
Open in desktop
@@ -1,10 +1,10 @@
single_frequency_fft:
name: acquire_m4s_700MHz_P-SafetyNB_DL
name: acquire_m4s_700MHz_P-SafetyNB_DL_no_cal
frequency: 772e6
gain: 40
sample_rate: 15.36e6
fft_size: 1024
nffts: 300
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...ions/acquire_m4s_700MHz_P-SafetyNB_UL.yml → ...quire_m4s_700MHz_P-SafetyNB_UL_no_cal.yml
View file
Open in desktop
@@ -1,10 +1,10 @@
single_frequency_fft:
name: acquire_m4s_700MHz_P-SafetyNB_UL
name: acquire_m4s_700MHz_P-SafetyNB_UL_no_cal
frequency: 802e6
gain: 40
sample_rate: 15.36e6
fft_size: 1024
nffts: 300
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...ctions/acquire_m4s_700MHz_T-Mobile_DL.yml → ...acquire_m4s_700MHz_T-Mobile_DL_no_cal.yml
View file
Open in desktop
@@ -1,10 +1,10 @@
single_frequency_fft:
name: acquire_m4s_700MHz_T-Mobile_DL
name: acquire_m4s_700MHz_T-Mobile_DL_no_cal
frequency: 731.5e6
gain: 40
sample_rate: 15.36e6
fft_size: 1024
nffts: 300
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
10 changes: 10 additions & 0 deletions scos_usrp/configs/actions/acquire_m4s_700MHz_T-Mobile_UL_cal.yml
View file
Open in desktop
@@ -0,0 +1,10 @@
single_frequency_fft:
name: acquire_m4s_700MHz_T-Mobile_UL_cal
frequency: 700e6
gain: 40
sample_rate: 15.36e6
fft_size: 1024
nffts: 300
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: True
4 changes: 2 additions & 2 deletions ...ctions/acquire_m4s_700MHz_T-Mobile_UL.yml → ...acquire_m4s_700MHz_T-Mobile_UL_no_cal.yml
View file
Open in desktop
@@ -1,10 +1,10 @@
single_frequency_fft:
name: acquire_m4s_700MHz_T-Mobile_UL
name: acquire_m4s_700MHz_T-Mobile_UL_no_cal
frequency: 700.5e6
gain: 40
sample_rate: 15.36e6
fft_size: 1024
nffts: 300
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...actions/acquire_m4s_700MHz_Verizon_DL.yml → .../acquire_m4s_700MHz_Verizon_DL_no_cal.yml
View file
Open in desktop
@@ -1,10 +1,10 @@
single_frequency_fft:
name: acquire_m4s_700MHz_Verizon_DL
name: acquire_m4s_700MHz_Verizon_DL_no_cal
frequency: 751e6
gain: 40
sample_rate: 15.36e6
fft_size: 1024
nffts: 300
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...actions/acquire_m4s_700MHz_Verizon_UL.yml → .../acquire_m4s_700MHz_Verizon_UL_no_cal.yml
View file
Open in desktop
@@ -1,10 +1,10 @@
single_frequency_fft:
name: acquire_m4s_700MHz_Verizon_UL
name: acquire_m4s_700MHz_Verizon_UL_no_cal
frequency: 782e6
gain: 40
sample_rate: 15.36e6
fft_size: 1024
nffts: 300
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...ons/survey_700MHz_band_10dB_1000ms_iq.yml → ...vey_700MHz_band_10dB_1000ms_iq_no_cal.yml
View file
Open in desktop
@@ -1,5 +1,5 @@
stepped_frequency_time_domain_iq:
name: survey_700MHz_band_10dB_1000ms_iq
name: survey_700MHz_band_10dB_1000ms_iq_no_cal
frequency:
- 700.5e6
- 709e6
Expand All @@ -16,4 +16,4 @@ stepped_frequency_time_domain_iq:
duration_ms: 1000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...tions/survey_700MHz_band_10dB_80ms_iq.yml → ...rvey_700MHz_band_10dB_80ms_iq__no_cal.yml
View file
Open in desktop
@@ -1,5 +1,5 @@
stepped_frequency_time_domain_iq:
name: survey_700MHz_band_10dB_80ms_iq
name: survey_700MHz_band_10dB_80ms_iq_no_cal
frequency:
- 700.5e6
- 709e6
Expand All @@ -16,4 +16,4 @@ stepped_frequency_time_domain_iq:
duration_ms: 80
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...ons/survey_700MHz_band_20dB_1000ms_iq.yml → ...vey_700MHz_band_20dB_1000ms_iq_no_cal.yml
View file
Open in desktop
@@ -1,5 +1,5 @@
stepped_frequency_time_domain_iq:
name: survey_700MHz_band_20dB_1000ms_iq
name: survey_700MHz_band_20dB_1000ms_iq_no_cal
frequency:
- 700.5e6
- 709e6
Expand All @@ -16,4 +16,4 @@ stepped_frequency_time_domain_iq:
duration_ms: 1000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...tions/survey_700MHz_band_20dB_80ms_iq.yml → ...urvey_700MHz_band_20dB_80ms_iq_no_cal.yml
View file
Open in desktop
@@ -1,5 +1,5 @@
stepped_frequency_time_domain_iq:
name: survey_700MHz_band_20dB_80ms_iq
name: survey_700MHz_band_20dB_80ms_iq_no_cal
frequency:
- 700.5e6
- 709e6
Expand All @@ -16,4 +16,4 @@ stepped_frequency_time_domain_iq:
duration_ms: 80
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
4 changes: 2 additions & 2 deletions ...ons/survey_700MHz_band_40dB_1000ms_iq.yml → ...vey_700MHz_band_40dB_1000ms_iq_no_cal.yml
View file
Open in desktop
@@ -1,5 +1,5 @@
stepped_frequency_time_domain_iq:
name: survey_700MHz_band_40dB_1000ms_iq
name: survey_700MHz_band_40dB_1000ms_iq_no_cal
frequency:
- 700.5e6
- 709e6
Expand All @@ -16,4 +16,4 @@ stepped_frequency_time_domain_iq:
duration_ms: 1000
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: true
calibration_adjust: False
19 changes: 19 additions & 0 deletions scos_usrp/configs/actions/survey_700MHz_band_40dB_80ms_iq_no_cal.yml
View file
Open in desktop
@@ -0,0 +1,19 @@
stepped_frequency_time_domain_iq:
name: survey_700MHz_band_40dB_80ms_iq_no_cal
frequency:
- 700.5e6
- 709e6
- 731.5e6
- 739e6
- 751e6
- 763e6
- 772e6
- 782e6
- 793e6
- 802e6
gain: 40
sample_rate: 15.36e6
duration_ms: 80
nskip: 15.36e4
classification: UNCLASSIFIED
calibration_adjust: False