-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
Sea 178 test actions loading #56
Changes from 19 commits
8d4a6c1
fdec377
51d2a91
d3b6eda
ab20d23
b8eb3ed
fd66a07
ed8ee81
73d2e97
c959774
e59edd8
08b6488
a38c885
c2210c8
1489e22
57ebd7a
5fc96ae
8c1d680
f9171ae
ce5a5c8
6bef0b5
84d2972
b32eb3b
87f81d4
88cde1f
e90f757
62565d7
caca013
186dfaa
fe07f3d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,3 +43,4 @@ nasctn_sea_data_product: | |
- 3685e6 | ||
- 3695e6 | ||
- 3705e6 | ||
calibration_adjust: True |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
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 | ||
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 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add rf_path param as in IQ action comment. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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: 14e6 | ||
duration_ms: | ||
- 1000 | ||
- 1000 | ||
- 1000 | ||
- 1000 | ||
- 1000 | ||
- 1000 | ||
- 10000 | ||
- 1000 | ||
- 1000 | ||
- 10000 | ||
nskip: 0 | ||
classification: UNCLASSIFIED | ||
calibration_adjust: False | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add rf_path param. See single action IQ yml comment. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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_CLASS, SIGAN_MODULE | ||
|
||
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,21 @@ | |
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) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this needs a similar check as done below to only load these actions if the SIGAN_MODULE and SIGAN_CLASS are tekrsa. |
||
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_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) | ||
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)}") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think if you add an rf_path: antenna parameter it will allow this action to work on sensors that have a configurable preselector and sensors that have no preselector. Currently, it errors when the sensor has a configurable preselector.