spectre-core 0.0.24__py3-none-any.whl → 0.0.26__py3-none-any.whl

spectre_core/receivers/plugins/_rsp1a_gr.py

@@ -0,0 +1,112 @@
+# SPDX-FileCopyrightText: © 2024-2025 Jimmy Fitzpatrick <jcfitzpatrick12@gmail.com>
+# This file is part of SPECTRE
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+
+from spectre_core.capture_configs import Parameters, PName
+from spectre_core.config import get_batches_dir_path
+from ._gr import spectre_top_block
+
+from gnuradio import spectre
+from gnuradio import sdrplay3
+
+
+class fixed_center_frequency(spectre_top_block):
+    def flowgraph(self, tag: str, parameters: Parameters) -> None:
+        # Unpack the capture config parameters
+        sample_rate = parameters.get_parameter_value(PName.SAMPLE_RATE)
+        batch_size = parameters.get_parameter_value(PName.BATCH_SIZE)
+        center_freq = parameters.get_parameter_value(PName.CENTER_FREQUENCY)
+        bandwidth = parameters.get_parameter_value(PName.BANDWIDTH)
+        if_gain = parameters.get_parameter_value(PName.IF_GAIN)
+        rf_gain = parameters.get_parameter_value(PName.RF_GAIN)
+
+        # Blocks
+        self.spectre_batched_file_sink = spectre.batched_file_sink(
+            get_batches_dir_path(), tag, batch_size, sample_rate
+        )
+        self.sdrplay3_rsp1a = sdrplay3.rsp1a(
+            "",
+            stream_args=sdrplay3.stream_args(output_type="fc32", channels_size=1),
+        )
+        self.sdrplay3_rsp1a.set_sample_rate(sample_rate)
+        self.sdrplay3_rsp1a.set_center_freq(center_freq)
+        self.sdrplay3_rsp1a.set_bandwidth(bandwidth)
+        self.sdrplay3_rsp1a.set_gain_mode(False)
+        self.sdrplay3_rsp1a.set_gain(if_gain, "IF")
+        self.sdrplay3_rsp1a.set_gain(rf_gain, "RF")
+        self.sdrplay3_rsp1a.set_freq_corr(0)
+        self.sdrplay3_rsp1a.set_dc_offset_mode(False)
+        self.sdrplay3_rsp1a.set_iq_balance_mode(False)
+        self.sdrplay3_rsp1a.set_agc_setpoint(-30)
+        self.sdrplay3_rsp1a.set_rf_notch_filter(False)
+        self.sdrplay3_rsp1a.set_dab_notch_filter(False)
+        self.sdrplay3_rsp1a.set_biasT(False)
+        self.sdrplay3_rsp1a.set_debug_mode(False)
+        self.sdrplay3_rsp1a.set_sample_sequence_gaps_check(False)
+        self.sdrplay3_rsp1a.set_show_gain_changes(False)
+
+        # Connections
+        self.connect((self.sdrplay3_rsp1a, 0), (self.spectre_batched_file_sink, 0))
+
+
+class swept_center_frequency(spectre_top_block):
+    def flowgraph(self, tag: str, parameters: Parameters) -> None:
+        # Unpack the capture config parameters
+        sample_rate = parameters.get_parameter_value(PName.SAMPLE_RATE)
+        bandwidth = parameters.get_parameter_value(PName.BANDWIDTH)
+        min_frequency = parameters.get_parameter_value(PName.MIN_FREQUENCY)
+        max_frequency = parameters.get_parameter_value(PName.MAX_FREQUENCY)
+        frequency_step = parameters.get_parameter_value(PName.FREQUENCY_STEP)
+        samples_per_step = parameters.get_parameter_value(PName.SAMPLES_PER_STEP)
+        if_gain = parameters.get_parameter_value(PName.IF_GAIN)
+        rf_gain = parameters.get_parameter_value(PName.RF_GAIN)
+        batch_size = parameters.get_parameter_value(PName.BATCH_SIZE)
+
+        # Blocks
+        self.spectre_sweep_driver = spectre.sweep_driver(
+            min_frequency,
+            max_frequency,
+            frequency_step,
+            sample_rate,
+            samples_per_step,
+            "freq",
+        )
+        self.spectre_batched_file_sink = spectre.batched_file_sink(
+            get_batches_dir_path(),
+            tag,
+            batch_size,
+            sample_rate,
+            True,
+            "freq",
+            min_frequency,
+        )
+        self.sdrplay3_rsp1a = sdrplay3.rsp1a(
+            "",
+            stream_args=sdrplay3.stream_args(output_type="fc32", channels_size=1),
+        )
+        self.sdrplay3_rsp1a.set_sample_rate(sample_rate, True)
+        self.sdrplay3_rsp1a.set_center_freq(min_frequency, True)
+        self.sdrplay3_rsp1a.set_bandwidth(bandwidth)
+        self.sdrplay3_rsp1a.set_gain_mode(False)
+        self.sdrplay3_rsp1a.set_gain(if_gain, "IF", True)
+        self.sdrplay3_rsp1a.set_gain(rf_gain, "RF", True)
+        self.sdrplay3_rsp1a.set_freq_corr(0)
+        self.sdrplay3_rsp1a.set_dc_offset_mode(False)
+        self.sdrplay3_rsp1a.set_iq_balance_mode(False)
+        self.sdrplay3_rsp1a.set_agc_setpoint(-30)
+        self.sdrplay3_rsp1a.set_rf_notch_filter(False)
+        self.sdrplay3_rsp1a.set_dab_notch_filter(False)
+        self.sdrplay3_rsp1a.set_biasT(False)
+        self.sdrplay3_rsp1a.set_stream_tags(True)
+        self.sdrplay3_rsp1a.set_debug_mode(False)
+        self.sdrplay3_rsp1a.set_sample_sequence_gaps_check(False)
+        self.sdrplay3_rsp1a.set_show_gain_changes(False)
+
+        # Connections
+        self.msg_connect(
+            (self.spectre_sweep_driver, "retune_command"),
+            (self.sdrplay3_rsp1a, "command"),
+        )
+        self.connect((self.sdrplay3_rsp1a, 0), (self.spectre_batched_file_sink, 0))
+        self.connect((self.sdrplay3_rsp1a, 0), (self.spectre_sweep_driver, 0))

spectre_core/receivers/plugins/_rspduo.py

@@ -3,22 +3,30 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from dataclasses import dataclass
+from typing import Optional
+from functools import partial
 
 from ._receiver_names import ReceiverName
-from .gr._rspduo import CaptureMethod
-from .._spec_names import SpecName
+from ._rspduo_gr import (
+    tuner_1_fixed_center_frequency,
+    tuner_2_fixed_center_frequency,
+    tuner_1_swept_center_frequency,
+)
+from ._receiver_names import ReceiverName
+from ._gr import capture
 from ._sdrplay_receiver import (
-    get_pvalidator_fixed_center_frequency,
-    get_pvalidator_swept_center_frequency,
-    get_capture_template_fixed_center_frequency,
-    get_capture_template_swept_center_frequency,
+    SDRplayReceiver,
+    make_capture_template_fixed_center_frequency,
+    make_capture_template_swept_center_frequency,
+    make_pvalidator_fixed_center_frequency,
+    make_pvalidator_swept_center_frequency,
 )
-from .._base import BaseReceiver
+
 from .._register import register_receiver
 
 
 @dataclass
-class Mode:
+class _Mode:
     """An operating mode for the `RSPduo` receiver."""
 
     TUNER_1_FIXED_CENTER_FREQUENCY = f"tuner_1_fixed_center_frequency"
@@ -27,60 +35,42 @@ class Mode:
 
 
 @register_receiver(ReceiverName.RSPDUO)
-class RSPduo(BaseReceiver):
+class RSPduo(SDRplayReceiver):
     """Receiver implementation for the SDRPlay RSPduo (https://www.sdrplay.com/rspduo/)"""
 
-    def _add_specs(self) -> None:
-        self.add_spec(SpecName.SAMPLE_RATE_LOWER_BOUND, 200e3)
-        self.add_spec(SpecName.SAMPLE_RATE_UPPER_BOUND, 10e6)
-        self.add_spec(SpecName.FREQUENCY_LOWER_BOUND, 1e3)
-        self.add_spec(SpecName.FREQUENCY_UPPER_BOUND, 2e9)
-        self.add_spec(SpecName.IF_GAIN_UPPER_BOUND, -20)
-        self.add_spec(SpecName.RF_GAIN_UPPER_BOUND, 0)
-        self.add_spec(SpecName.API_RETUNING_LATENCY, 50 * 1e-3)
-        self.add_spec(
-            SpecName.BANDWIDTH_OPTIONS,
-            [200000, 300000, 600000, 1536000, 5000000, 6000000, 7000000, 8000000],
-        )
+    def __init__(self, name: ReceiverName, mode: Optional[str] = None) -> None:
+        """Initialise an instance of an `RSPduo`."""
+        super().__init__(name, mode)
 
-    def _add_capture_methods(self) -> None:
-        self.add_capture_method(
-            Mode.TUNER_1_FIXED_CENTER_FREQUENCY,
-            CaptureMethod.tuner_1_fixed_center_frequency,
-        )
-        self.add_capture_method(
-            Mode.TUNER_2_FIXED_CENTER_FREQUENCY,
-            CaptureMethod.tuner_2_fixed_center_frequency,
-        )
-        self.add_capture_method(
-            Mode.TUNER_1_SWEPT_CENTER_FREQUENCY,
-            CaptureMethod.tuner_1_swept_center_frequency,
+        self.add_mode(
+            _Mode.TUNER_1_FIXED_CENTER_FREQUENCY,
+            partial(capture, top_block_cls=tuner_1_fixed_center_frequency),
+            make_capture_template_fixed_center_frequency(self),
+            make_pvalidator_fixed_center_frequency(self),
         )
 
-    def _add_capture_templates(self) -> None:
-        self.add_capture_template(
-            Mode.TUNER_1_FIXED_CENTER_FREQUENCY,
-            get_capture_template_fixed_center_frequency(self),
-        )
-        self.add_capture_template(
-            Mode.TUNER_2_FIXED_CENTER_FREQUENCY,
-            get_capture_template_fixed_center_frequency(self),
-        )
-        self.add_capture_template(
-            Mode.TUNER_1_SWEPT_CENTER_FREQUENCY,
-            get_capture_template_swept_center_frequency(self),
+        self.add_mode(
+            _Mode.TUNER_2_FIXED_CENTER_FREQUENCY,
+            partial(capture, top_block_cls=tuner_2_fixed_center_frequency),
+            make_capture_template_fixed_center_frequency(self),
+            make_pvalidator_fixed_center_frequency(self),
         )
 
-    def _add_pvalidators(self) -> None:
-        self.add_pvalidator(
-            Mode.TUNER_1_FIXED_CENTER_FREQUENCY,
-            get_pvalidator_fixed_center_frequency(self),
-        )
-        self.add_pvalidator(
-            Mode.TUNER_2_FIXED_CENTER_FREQUENCY,
-            get_pvalidator_fixed_center_frequency(self),
-        )
-        self.add_pvalidator(
-            Mode.TUNER_1_SWEPT_CENTER_FREQUENCY,
-            get_pvalidator_swept_center_frequency(self),
+        self.add_mode(
+            _Mode.TUNER_1_SWEPT_CENTER_FREQUENCY,
+            partial(capture, top_block_cls=tuner_1_swept_center_frequency),
+            make_capture_template_swept_center_frequency(self),
+            make_pvalidator_swept_center_frequency(self),
         )
+
+    def get_rf_gains(self, center_frequency: float) -> list[int]:
+        if center_frequency <= 60e6:
+            return [0, -6, -12, -18, -37, -42, -61]
+        elif center_frequency <= 420e6:
+            return [0, -6, -12, -18, -20, -26, -32, -38, -57, -62]
+        elif center_frequency <= 1e9:
+            return [0, -7, -13, -19, -20, -27, -33, -39, -45, -64]
+        elif center_frequency <= 2e9:
+            return [0, -6, -12, -20, -26, -32, -38, -43, -62]
+        else:
+            return []

spectre_core/receivers/plugins/_rspduo_gr.py

@@ -0,0 +1,165 @@
+# SPDX-FileCopyrightText: © 2024-2025 Jimmy Fitzpatrick <jcfitzpatrick12@gmail.com>
+# This file is part of SPECTRE
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from spectre_core.capture_configs import Parameters, PName
+from spectre_core.config import get_batches_dir_path
+from ._gr import spectre_top_block
+
+from gnuradio import spectre
+from gnuradio import sdrplay3
+
+
+class tuner_1_fixed_center_frequency(spectre_top_block):
+    def flowgraph(self, tag: str, parameters: Parameters) -> None:
+        # Unpack the capture config parameters
+        sample_rate = parameters.get_parameter_value(PName.SAMPLE_RATE)
+        batch_size = parameters.get_parameter_value(PName.BATCH_SIZE)
+        center_freq = parameters.get_parameter_value(PName.CENTER_FREQUENCY)
+        bandwidth = parameters.get_parameter_value(PName.BANDWIDTH)
+        if_gain = parameters.get_parameter_value(PName.IF_GAIN)
+        rf_gain = parameters.get_parameter_value(PName.RF_GAIN)
+
+        # Blocks
+        self.spectre_batched_file_sink = spectre.batched_file_sink(
+            get_batches_dir_path(), tag, batch_size, sample_rate
+        )
+        self.sdrplay3_rspduo = sdrplay3.rspduo(
+            "",
+            rspduo_mode="Single Tuner",
+            antenna="Tuner 1 50 ohm",
+            stream_args=sdrplay3.stream_args(output_type="fc32", channels_size=1),
+        )
+        self.sdrplay3_rspduo.set_sample_rate(sample_rate)
+        self.sdrplay3_rspduo.set_center_freq(center_freq)
+        self.sdrplay3_rspduo.set_bandwidth(bandwidth)
+        self.sdrplay3_rspduo.set_antenna("Tuner 1 50 ohm")
+        self.sdrplay3_rspduo.set_gain_mode(False)
+        self.sdrplay3_rspduo.set_gain(if_gain, "IF")
+        self.sdrplay3_rspduo.set_gain(rf_gain, "RF")
+        self.sdrplay3_rspduo.set_freq_corr(0)
+        self.sdrplay3_rspduo.set_dc_offset_mode(False)
+        self.sdrplay3_rspduo.set_iq_balance_mode(False)
+        self.sdrplay3_rspduo.set_agc_setpoint(-30)
+        self.sdrplay3_rspduo.set_rf_notch_filter(False)
+        self.sdrplay3_rspduo.set_dab_notch_filter(False)
+        self.sdrplay3_rspduo.set_am_notch_filter(False)
+        self.sdrplay3_rspduo.set_biasT(False)
+        self.sdrplay3_rspduo.set_debug_mode(False)
+        self.sdrplay3_rspduo.set_sample_sequence_gaps_check(False)
+        self.sdrplay3_rspduo.set_show_gain_changes(False)
+
+        # Connections
+        self.connect((self.sdrplay3_rspduo, 0), (self.spectre_batched_file_sink, 0))
+
+
+class tuner_2_fixed_center_frequency(spectre_top_block):
+    def flowgraph(self, tag: str, parameters: Parameters) -> None:
+
+        # Unpack the capture config parameters
+        sample_rate = parameters.get_parameter_value(PName.SAMPLE_RATE)
+        batch_size = parameters.get_parameter_value(PName.BATCH_SIZE)
+        center_freq = parameters.get_parameter_value(PName.CENTER_FREQUENCY)
+        bandwidth = parameters.get_parameter_value(PName.BANDWIDTH)
+        if_gain = parameters.get_parameter_value(PName.IF_GAIN)
+        rf_gain = parameters.get_parameter_value(PName.RF_GAIN)
+
+        # Blocks
+        self.spectre_batched_file_sink = spectre.batched_file_sink(
+            get_batches_dir_path(), tag, batch_size, sample_rate
+        )
+        self.sdrplay3_rspduo = sdrplay3.rspduo(
+            "",
+            rspduo_mode="Single Tuner",
+            antenna="Tuner 2 50 ohm",
+            stream_args=sdrplay3.stream_args(output_type="fc32", channels_size=1),
+        )
+        self.sdrplay3_rspduo.set_sample_rate(sample_rate)
+        self.sdrplay3_rspduo.set_center_freq(center_freq)
+        self.sdrplay3_rspduo.set_bandwidth(bandwidth)
+        self.sdrplay3_rspduo.set_antenna("Tuner 2 50 ohm")
+        self.sdrplay3_rspduo.set_gain_mode(False)
+        self.sdrplay3_rspduo.set_gain(if_gain, "IF")
+        self.sdrplay3_rspduo.set_gain(rf_gain, "RF", False)
+        self.sdrplay3_rspduo.set_freq_corr(0)
+        self.sdrplay3_rspduo.set_dc_offset_mode(False)
+        self.sdrplay3_rspduo.set_iq_balance_mode(False)
+        self.sdrplay3_rspduo.set_agc_setpoint(-30)
+        self.sdrplay3_rspduo.set_rf_notch_filter(False)
+        self.sdrplay3_rspduo.set_dab_notch_filter(False)
+        self.sdrplay3_rspduo.set_am_notch_filter(False)
+        self.sdrplay3_rspduo.set_biasT(False)
+        self.sdrplay3_rspduo.set_stream_tags(False)
+        self.sdrplay3_rspduo.set_debug_mode(False)
+        self.sdrplay3_rspduo.set_sample_sequence_gaps_check(False)
+        self.sdrplay3_rspduo.set_show_gain_changes(False)
+
+        # Connections
+        self.connect((self.sdrplay3_rspduo, 0), (self.spectre_batched_file_sink, 0))
+
+
+class tuner_1_swept_center_frequency(spectre_top_block):
+    def flowgraph(self, tag: str, parameters: Parameters) -> None:
+
+        # Unpack the capture config parameters
+        sample_rate = parameters.get_parameter_value(PName.SAMPLE_RATE)
+        bandwidth = parameters.get_parameter_value(PName.BANDWIDTH)
+        min_frequency = parameters.get_parameter_value(PName.MIN_FREQUENCY)
+        max_frequency = parameters.get_parameter_value(PName.MAX_FREQUENCY)
+        frequency_step = parameters.get_parameter_value(PName.FREQUENCY_STEP)
+        samples_per_step = parameters.get_parameter_value(PName.SAMPLES_PER_STEP)
+        if_gain = parameters.get_parameter_value(PName.IF_GAIN)
+        rf_gain = parameters.get_parameter_value(PName.RF_GAIN)
+        batch_size = parameters.get_parameter_value(PName.BATCH_SIZE)
+
+        # Blocks
+        self.spectre_sweep_driver = spectre.sweep_driver(
+            min_frequency,
+            max_frequency,
+            frequency_step,
+            sample_rate,
+            samples_per_step,
+            "freq",
+        )
+        self.spectre_batched_file_sink = spectre.batched_file_sink(
+            get_batches_dir_path(),
+            tag,
+            batch_size,
+            sample_rate,
+            True,
+            "freq",
+            min_frequency,
+        )
+        self.sdrplay3_rspduo = sdrplay3.rspduo(
+            "",
+            rspduo_mode="Single Tuner",
+            antenna="Tuner 1 50 ohm",
+            stream_args=sdrplay3.stream_args(output_type="fc32", channels_size=1),
+        )
+        self.sdrplay3_rspduo.set_sample_rate(sample_rate, True)
+        self.sdrplay3_rspduo.set_center_freq(min_frequency, True)
+        self.sdrplay3_rspduo.set_bandwidth(bandwidth)
+        self.sdrplay3_rspduo.set_antenna("Tuner 1 50 ohm")
+        self.sdrplay3_rspduo.set_gain_mode(False)
+        self.sdrplay3_rspduo.set_gain(if_gain, "IF", True)
+        self.sdrplay3_rspduo.set_gain(rf_gain, "RF", True)
+        self.sdrplay3_rspduo.set_freq_corr(0)
+        self.sdrplay3_rspduo.set_dc_offset_mode(False)
+        self.sdrplay3_rspduo.set_iq_balance_mode(False)
+        self.sdrplay3_rspduo.set_agc_setpoint(-30)
+        self.sdrplay3_rspduo.set_rf_notch_filter(False)
+        self.sdrplay3_rspduo.set_dab_notch_filter(True)
+        self.sdrplay3_rspduo.set_am_notch_filter(False)
+        self.sdrplay3_rspduo.set_biasT(False)
+        self.sdrplay3_rspduo.set_stream_tags(True)
+        self.sdrplay3_rspduo.set_debug_mode(False)
+        self.sdrplay3_rspduo.set_sample_sequence_gaps_check(False)
+        self.sdrplay3_rspduo.set_show_gain_changes(False)
+
+        # Connections
+        self.msg_connect(
+            (self.spectre_sweep_driver, "retune_command"),
+            (self.sdrplay3_rspduo, "command"),
+        )
+        self.connect((self.sdrplay3_rspduo, 0), (self.spectre_batched_file_sink, 0))
+        self.connect((self.sdrplay3_rspduo, 0), (self.spectre_sweep_driver, 0))