spectre-core 0.0.10__tar.gz → 0.0.11__tar.gz

{spectre_core-0.0.10 → spectre_core-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spectre-core
-Version: 0.0.10
+Version: 0.0.11
 Summary: The core Python package used by the spectre program. 
 Maintainer-email: Jimmy Fitzpatrick <jcfitzpatrick12@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{spectre_core-0.0.10 → spectre_core-0.0.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "spectre-core"
-version = "0.0.10"
+version = "0.0.11"
 maintainers = [
   { name="Jimmy Fitzpatrick", email="jcfitzpatrick12@gmail.com" },
 ]

{spectre_core-0.0.10 → spectre_core-0.0.11}/src/spectre_core/capture_configs/_pvalidators.py

@@ -131,10 +131,8 @@ def _validate_step_interval(
 
     step_interval = samples_per_step * 1/ sample_rate # [s]
     if step_interval < api_latency:
-        warning_message = (f"The computed step interval of {step_interval} [s] is of the order of empirically "
-                           f"derived api latency {api_latency} [s]; you may experience undefined behaviour!")
-        warn(warning_message)
-        _LOGGER.warning(warning_message)
+        raise ValueError(f"The computed step interval of {step_interval} [s] is of the order of empirically "
+                         f"derived api latency {api_latency} [s]; you may experience undefined behaviour!")
 
 
 def _validate_fixed_center_frequency_parameters(

{spectre_core-0.0.10 → spectre_core-0.0.11}/src/spectre_core/post_processing/_base.py

@@ -104,7 +104,7 @@ class BaseEventHandler(ABC, FileSystemEventHandler):
             self._cached_spectrogram = join_spectrograms([self._cached_spectrogram, spectrogram])
 
         # if the time range is not specified
-        time_range = self._capture_config.get_parameter_value(PNames.TIME_RANGE) or self._capture_config.get_parameter_value(PNames.BATCH_SIZE)
+        time_range = self._capture_config.get_parameter_value(PNames.TIME_RANGE) or 0.0
   
         if self._cached_spectrogram.time_range >= time_range:
             self._flush_cache()

{spectre_core-0.0.10 → spectre_core-0.0.11}/src/spectre_core/receivers/__init__.py

@@ -5,6 +5,7 @@
 # register decorators take effect on import
 from .library._test import _Receiver
 from .library._rsp1a import _Receiver
+from .library._rspduo import _Receiver
 
 from ._base import BaseReceiver
 from ._factory import get_receiver

spectre_core-0.0.11/src/spectre_core/receivers/_base.py

@@ -0,0 +1,180 @@
+# SPDX-FileCopyrightText: © 2024 Jimmy Fitzpatrick <jcfitzpatrick12@gmail.com>
+# This file is part of SPECTRE
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from abc import ABC, abstractmethod
+from typing import Callable, Optional
+from numbers import Number
+
+from spectre_core.exceptions import ModeNotFoundError
+from ._spec_names import SpecNames
+from spectre_core.capture_configs import (
+    CaptureTemplate, CaptureModes, Parameters, Bound, PValidators, PNames,
+    get_base_capture_template, get_base_ptemplate, OneOf, CaptureConfig
+)
+
+class BaseReceiver(ABC):
+    def __init__(self, 
+                 name: str, 
+                 mode: Optional[str] = None):
+        self._name = name
+
+        self._specs: dict[str, Number | list[Number]] = {}
+        self._add_specs()
+        
+        self._capture_methods: dict[str, Callable] = {}
+        self._add_capture_methods()
+    
+        self._pvalidators: dict[str, Callable] = {}
+        self._add_pvalidators()
+
+        self._capture_templates: dict[str, CaptureTemplate] = {}
+        self._add_capture_templates()
+
+        self.mode = mode
+
+
+    @abstractmethod
+    def _add_specs(self) -> None:
+        pass
+    
+
+    @abstractmethod
+    def _add_capture_methods(self) -> None:
+        pass
+
+
+    @abstractmethod
+    def _add_pvalidators(self) -> None:
+        pass
+
+
+    @abstractmethod
+    def _add_capture_templates(self) -> None:
+        pass
+
+    
+    @property
+    def name(self) -> str:
+        return self._name
+    
+
+    @property
+    def capture_methods(self) -> dict[str, Callable]:
+        return self._capture_methods
+    
+
+    @property
+    def pvalidators(self) -> dict[str, Callable]:
+        return self._pvalidators
+
+
+    @property
+    def capture_templates(self) -> dict[str, CaptureTemplate]:
+        return self._capture_templates
+
+
+    @property
+    def specs(self) -> dict[str, Number]:
+        return self._specs
+
+
+    @property
+    def modes(self) -> list[str]:
+        capture_method_modes    = list(self.capture_methods.keys())
+        pvalidator_modes        = list(self.pvalidators.keys())
+        capture_template_modes  = list(self.capture_templates.keys())
+
+        if capture_method_modes == pvalidator_modes == capture_template_modes:
+            return capture_method_modes
+        else:
+            raise ValueError(f"Mode mismatch for the receiver {self.name}.")
+
+
+    @property
+    def mode(self) -> str:
+        return self._mode
+    
+
+    @mode.setter
+    def mode(self, value: Optional[str]) -> None:
+        if (value is not None) and value not in self.modes:
+            raise ModeNotFoundError((f"{value} is not a defined mode for the receiver {self.name}. "
+                                     f"Expected one of {self.modes}"))
+        self._mode = value
+
+
+    @property
+    def capture_method(self) -> Callable:
+        return self.capture_methods[self.mode]
+
+
+    @property
+    def pvalidator(self) -> Callable:
+        return self.pvalidators[self.mode]
+
+
+    @property
+    def capture_template(self) -> CaptureTemplate:
+        return self._capture_templates[self.mode]
+
+
+    def add_capture_method(self,
+                           mode: str,
+                           capture_method: Callable) -> None:
+        self._capture_methods[mode] = capture_method
+
+
+    def add_pvalidator(self,
+                      mode: str,
+                      pvalidator: Callable) -> None:
+        self._pvalidators[mode] = pvalidator
+
+
+    def add_capture_template(self,
+                             mode: str,
+                             capture_template: CaptureTemplate) -> CaptureTemplate:
+        self._capture_templates[mode] = capture_template
+
+
+    def add_spec(self,
+                 name: str,
+                 value: Number) -> None:
+        self.specs[name] = value
+
+
+    def get_spec(self, 
+                 spec_name: str) -> Number | list[Number]:
+        if spec_name not in self.specs:
+            raise KeyError(f"Spec not found with name '{spec_name}' "
+                           f"for the receiver '{self.name}'")
+        return self.specs[spec_name]
+
+
+    def start_capture(self, 
+                      tag: str) -> None:
+        self.capture_method( tag, self.load_parameters(tag) )
+
+
+    def save_parameters(self,
+                        tag: str,
+                        parameters: Parameters,
+                        force: bool = False) -> None:
+        
+        parameters = self.capture_template.apply_template(parameters)
+        self.pvalidator(parameters)
+
+        capture_config = CaptureConfig(tag)
+        capture_config.save_parameters(self.name,
+                                       self.mode,
+                                       parameters,
+                                       force=force)
+
+    def load_parameters(self,
+                        tag: str) -> Parameters:
+        capture_config = CaptureConfig(tag)
+
+        parameters = self.capture_template.apply_template(capture_config.parameters)
+        self.pvalidator(parameters)
+        
+        return parameters

{spectre_core-0.0.10 → spectre_core-0.0.11}/src/spectre_core/receivers/gr/_rsp1a.py

@@ -13,7 +13,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 #
-# Test receiver top blocks
+# RSP1A receiver top blocks
 #
 
 from functools import partial
@@ -31,7 +31,7 @@ class _fixed_center_frequency(gr.top_block):
     def __init__(self, 
                  tag: str,
                  parameters: Parameters):
-        gr.top_block.__init__(self, "fixed-center-frequency", catch_exceptions=True)
+        gr.top_block.__init__(self, catch_exceptions=True)
 
         ##################################################
         # Unpack capture config
@@ -42,7 +42,7 @@ class _fixed_center_frequency(gr.top_block):
         bandwidth   = parameters.get_parameter_value(PNames.BANDWIDTH)
         if_gain     = parameters.get_parameter_value(PNames.IF_GAIN)
         rf_gain     = parameters.get_parameter_value(PNames.RF_GAIN)
-        is_sweeping = False
+        
 
         ##################################################
         # Blocks
@@ -86,7 +86,7 @@ class _swept_center_frequency(gr.top_block):
     def __init__(self, 
                  tag: str,
                  parameters: Parameters):
-        gr.top_block.__init__(self, "sweep", catch_exceptions=True)
+        gr.top_block.__init__(self, catch_exceptions=True)
 
         ##################################################
         # Unpack capture config
@@ -155,4 +155,4 @@ class _swept_center_frequency(gr.top_block):
 @dataclass(frozen=True)
 class CaptureMethods:
     fixed_center_frequency  = partial(capture, top_block_cls=_fixed_center_frequency)
-    _swept_center_frequency = partial(capture, top_block_cls=_swept_center_frequency)
+    swept_center_frequency  = partial(capture, top_block_cls=_swept_center_frequency)

spectre_core-0.0.11/src/spectre_core/receivers/gr/_rspduo.py

@@ -0,0 +1,227 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+#
+# SPDX-License-Identifier: GPL-3.0
+#
+# GNU Radio Python Flow Graph
+# Title: Test receiver
+# GNU Radio version: 3.10.1.1
+
+# SPDX-FileCopyrightText: © 2024 Jimmy Fitzpatrick <jcfitzpatrick12@gmail.com>
+# This file is part of SPECTRE
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+#
+# RSPduo receiver top blocks
+#
+
+from functools import partial
+from dataclasses import dataclass
+
+from gnuradio import gr
+from gnuradio import spectre
+from gnuradio import sdrplay3
+
+from spectre_core.capture_configs import Parameters, PNames
+from spectre_core.config import get_chunks_dir_path
+from ._base import capture
+
+
+class _tuner_1_fixed_center_frequency(gr.top_block):
+    def __init__(self, 
+                 tag: str,
+                 parameters: Parameters):
+        gr.top_block.__init__(self, catch_exceptions=True)
+        gr.top_block.__init__(self, "tuner_1_fixed", catch_exceptions=True)
+        
+        ##################################################
+        # Unpack capture config
+        ##################################################
+        sample_rate = parameters.get_parameter_value(PNames.SAMPLE_RATE)
+        batch_size  = parameters.get_parameter_value(PNames.BATCH_SIZE)
+        center_freq = parameters.get_parameter_value(PNames.CENTER_FREQUENCY)
+        bandwidth   = parameters.get_parameter_value(PNames.BANDWIDTH)
+        if_gain     = parameters.get_parameter_value(PNames.IF_GAIN)
+        rf_gain     = parameters.get_parameter_value(PNames.RF_GAIN)
+
+        ##################################################
+        # Blocks
+        ##################################################
+        self.spectre_batched_file_sink_0 = spectre.batched_file_sink(get_chunks_dir_path(), 
+                                                                     tag, 
+                                                                     batch_size, 
+                                                                     sample_rate)
+        self.sdrplay3_rspduo_0 = 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_0.set_sample_rate(sample_rate)
+        self.sdrplay3_rspduo_0.set_center_freq(center_freq)
+        self.sdrplay3_rspduo_0.set_bandwidth(bandwidth)
+        self.sdrplay3_rspduo_0.set_antenna("Tuner 1 50 ohm")
+        self.sdrplay3_rspduo_0.set_gain_mode(False)
+        self.sdrplay3_rspduo_0.set_gain(if_gain, 'IF')
+        self.sdrplay3_rspduo_0.set_gain(rf_gain, 'RF')
+        self.sdrplay3_rspduo_0.set_freq_corr(0)
+        self.sdrplay3_rspduo_0.set_dc_offset_mode(False)
+        self.sdrplay3_rspduo_0.set_iq_balance_mode(False)
+        self.sdrplay3_rspduo_0.set_agc_setpoint(-30)
+        self.sdrplay3_rspduo_0.set_rf_notch_filter(False)
+        self.sdrplay3_rspduo_0.set_dab_notch_filter(False)
+        self.sdrplay3_rspduo_0.set_am_notch_filter(False)
+        self.sdrplay3_rspduo_0.set_biasT(False)
+        self.sdrplay3_rspduo_0.set_debug_mode(False)
+        self.sdrplay3_rspduo_0.set_sample_sequence_gaps_check(False)
+        self.sdrplay3_rspduo_0.set_show_gain_changes(False)
+
+
+        ##################################################
+        # Connections
+        ##################################################
+        self.connect((self.sdrplay3_rspduo_0, 0), (self.spectre_batched_file_sink_0, 0))
+    
+        
+class _tuner_2_fixed_center_frequency(gr.top_block):
+    def __init__(self, 
+                 tag: str,
+                 parameters: Parameters):
+        gr.top_block.__init__(self, catch_exceptions=True)
+        gr.top_block.__init__(self, "tuner_1_fixed", catch_exceptions=True)
+        
+        ##################################################
+        # Unpack capture config
+        ##################################################
+        sample_rate = parameters.get_parameter_value(PNames.SAMPLE_RATE)
+        batch_size  = parameters.get_parameter_value(PNames.BATCH_SIZE)
+        center_freq = parameters.get_parameter_value(PNames.CENTER_FREQUENCY)
+        bandwidth   = parameters.get_parameter_value(PNames.BANDWIDTH)
+        if_gain     = parameters.get_parameter_value(PNames.IF_GAIN)
+        rf_gain     = parameters.get_parameter_value(PNames.RF_GAIN)
+
+        ##################################################
+        # Blocks
+        ##################################################
+        self.spectre_batched_file_sink_0 = spectre.batched_file_sink(get_chunks_dir_path(), 
+                                                                     tag, 
+                                                                     batch_size, 
+                                                                     sample_rate)
+        self.sdrplay3_rspduo_0 = 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_0.set_sample_rate(sample_rate)
+        self.sdrplay3_rspduo_0.set_center_freq(center_freq)
+        self.sdrplay3_rspduo_0.set_bandwidth(bandwidth)
+        self.sdrplay3_rspduo_0.set_antenna("Tuner 2 50 ohm")
+        self.sdrplay3_rspduo_0.set_gain_mode(False)
+        self.sdrplay3_rspduo_0.set_gain(if_gain, 'IF')
+        self.sdrplay3_rspduo_0.set_gain(rf_gain, 'RF', False)
+        self.sdrplay3_rspduo_0.set_freq_corr(0)
+        self.sdrplay3_rspduo_0.set_dc_offset_mode(False)
+        self.sdrplay3_rspduo_0.set_iq_balance_mode(False)
+        self.sdrplay3_rspduo_0.set_agc_setpoint(-30)
+        self.sdrplay3_rspduo_0.set_rf_notch_filter(False)
+        self.sdrplay3_rspduo_0.set_dab_notch_filter(False)
+        self.sdrplay3_rspduo_0.set_am_notch_filter(False)
+        self.sdrplay3_rspduo_0.set_biasT(False)
+        self.sdrplay3_rspduo_0.set_stream_tags(False)
+        self.sdrplay3_rspduo_0.set_debug_mode(False)
+        self.sdrplay3_rspduo_0.set_sample_sequence_gaps_check(False)
+        self.sdrplay3_rspduo_0.set_show_gain_changes(False)
+
+
+        ##################################################
+        # Connections
+        ##################################################
+        self.connect((self.sdrplay3_rspduo_0, 0), (self.spectre_batched_file_sink_0, 0))    
+
+
+class _tuner_1_swept_center_frequency(gr.top_block):
+    def __init__(self, 
+                 tag: str,
+                 parameters: Parameters):
+        gr.top_block.__init__(self, catch_exceptions=True)
+
+        ##################################################
+        # Unpack capture config
+        ##################################################
+        sample_rate      = parameters.get_parameter_value(PNames.SAMPLE_RATE)
+        bandwidth        = parameters.get_parameter_value(PNames.BANDWIDTH)
+        min_frequency    = parameters.get_parameter_value(PNames.MIN_FREQUENCY)
+        max_frequency    = parameters.get_parameter_value(PNames.MAX_FREQUENCY)
+        frequency_step   = parameters.get_parameter_value(PNames.FREQUENCY_STEP)
+        samples_per_step = parameters.get_parameter_value(PNames.SAMPLES_PER_STEP)
+        if_gain          = parameters.get_parameter_value(PNames.IF_GAIN)
+        rf_gain          = parameters.get_parameter_value(PNames.RF_GAIN)
+        batch_size       = parameters.get_parameter_value(PNames.BATCH_SIZE)
+
+        ##################################################
+        # Blocks
+        ##################################################
+        self.spectre_sweep_driver_0 = spectre.sweep_driver(min_frequency, 
+                                                           max_frequency, 
+                                                           frequency_step, 
+                                                           sample_rate, 
+                                                           samples_per_step,
+                                                           'freq')
+        self.spectre_batched_file_sink_0 = spectre.batched_file_sink(get_chunks_dir_path(), 
+                                                                     tag, 
+                                                                     batch_size, 
+                                                                     sample_rate, 
+                                                                     True, 
+                                                                     'freq', 
+                                                                     min_frequency)
+        self.sdrplay3_rspduo_0 = 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_0.set_sample_rate(sample_rate, True)
+        self.sdrplay3_rspduo_0.set_center_freq(min_frequency, True)
+        self.sdrplay3_rspduo_0.set_bandwidth(bandwidth)
+        self.sdrplay3_rspduo_0.set_antenna("Tuner 1 50 ohm")
+        self.sdrplay3_rspduo_0.set_gain_mode(False)
+        self.sdrplay3_rspduo_0.set_gain(if_gain, 'IF', True)
+        self.sdrplay3_rspduo_0.set_gain(rf_gain, 'RF', True)
+        self.sdrplay3_rspduo_0.set_freq_corr(0)
+        self.sdrplay3_rspduo_0.set_dc_offset_mode(False)
+        self.sdrplay3_rspduo_0.set_iq_balance_mode(False)
+        self.sdrplay3_rspduo_0.set_agc_setpoint(-30)
+        self.sdrplay3_rspduo_0.set_rf_notch_filter(False)
+        self.sdrplay3_rspduo_0.set_dab_notch_filter(True)
+        self.sdrplay3_rspduo_0.set_am_notch_filter(False)
+        self.sdrplay3_rspduo_0.set_biasT(False)
+        self.sdrplay3_rspduo_0.set_stream_tags(True)
+        self.sdrplay3_rspduo_0.set_debug_mode(False)
+        self.sdrplay3_rspduo_0.set_sample_sequence_gaps_check(False)
+        self.sdrplay3_rspduo_0.set_show_gain_changes(False)
+
+
+        ##################################################
+        # Connections
+        ##################################################
+        self.msg_connect((self.spectre_sweep_driver_0, 'freq'), (self.sdrplay3_rspduo_0, 'freq'))
+        self.connect((self.sdrplay3_rspduo_0, 0), (self.spectre_batched_file_sink_0, 0))
+        self.connect((self.sdrplay3_rspduo_0, 0), (self.spectre_sweep_driver_0, 0))
+        
+        
+@dataclass(frozen=True)
+class CaptureMethods:
+    tuner_1_fixed_center_frequency  = partial(capture, top_block_cls=_tuner_1_fixed_center_frequency)
+    tuner_2_fixed_center_frequency  = partial(capture, top_block_cls=_tuner_2_fixed_center_frequency)
+    tuner_1_swept_center_frequency  = partial(capture, top_block_cls=_tuner_1_swept_center_frequency)

{spectre_core-0.0.10 → spectre_core-0.0.11}/src/spectre_core/receivers/gr/_test.py

@@ -33,7 +33,7 @@ class _cosine_signal_1(gr.top_block):
     def __init__(self, 
                  tag: str,
                  parameters: Parameters):
-        gr.top_block.__init__(self, "cosine-signal-1", catch_exceptions=True)
+        gr.top_block.__init__(self, catch_exceptions=True)
 
         ##################################################
         # Unpack capture config
@@ -80,7 +80,7 @@ class _tagged_staircase(gr.top_block):
     def __init__(self, 
                  tag: str,
                  parameters: Parameters):
-        gr.top_block.__init__(self, "tagged-staircase", catch_exceptions=True)
+        gr.top_block.__init__(self, catch_exceptions=True)
 
         ##################################################
         # Unpack capture config

{spectre_core-0.0.10 → spectre_core-0.0.11}/src/spectre_core/receivers/library/_rsp1a.py

@@ -11,7 +11,7 @@ from spectre_core.capture_configs import (
 )
 from ..gr._rsp1a import CaptureMethods
 from .._spec_names import SpecNames
-from .._base import SDRPlayReceiver
+from ._sdrplay_receiver import SDRPlayReceiver
 from .._register import register_receiver
 
 @dataclass
@@ -44,7 +44,7 @@ class _Receiver(SDRPlayReceiver):
         self.add_capture_method(Modes.FIXED_CENTER_FREQUENCY, 
                                 CaptureMethods.fixed_center_frequency)
         self.add_capture_method(Modes.SWEPT_CENTER_FREQUENCY,
-                                CaptureMethods._swept_center_frequency)
+                                CaptureMethods.swept_center_frequency)
     
 
     def _add_capture_templates(self):
@@ -55,7 +55,7 @@ class _Receiver(SDRPlayReceiver):
         
     
     def _add_pvalidators(self):
-        self.add_pvalidator(CaptureModes.FIXED_CENTER_FREQUENCY,
+        self.add_pvalidator(Modes.FIXED_CENTER_FREQUENCY,
                             self._get_pvalidator_fixed_center_frequency())
-        self.add_pvalidator(CaptureModes.SWEPT_CENTER_FREQUENCY,
+        self.add_pvalidator(Modes.SWEPT_CENTER_FREQUENCY,
                             self._get_pvalidator_swept_center_frequency())

spectre_core-0.0.11/src/spectre_core/receivers/library/_rspduo.py

@@ -0,0 +1,69 @@
+# SPDX-FileCopyrightText: © 2024 Jimmy Fitzpatrick <jcfitzpatrick12@gmail.com>
+# This file is part of SPECTRE
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from typing import Optional
+from dataclasses import dataclass
+from functools import partial
+
+from spectre_core.capture_configs import (
+    CaptureModes
+)
+from ..gr._rspduo import CaptureMethods
+from .._spec_names import SpecNames
+from ._sdrplay_receiver import SDRPlayReceiver
+from .._register import register_receiver
+
+@dataclass
+class Modes:
+    TUNER_1_FIXED_CENTER_FREQUENCY  = f"tuner-1-{CaptureModes.FIXED_CENTER_FREQUENCY}"
+    TUNER_2_FIXED_CENTER_FREQUENCY  = f"tuner-2-{CaptureModes.FIXED_CENTER_FREQUENCY}"
+    TUNER_1_SWEPT_CENTER_FREQUENCY  = f"tuner-1-{CaptureModes.SWEPT_CENTER_FREQUENCY}"
+
+
+@register_receiver("rspduo")
+class _Receiver(SDRPlayReceiver):
+    def __init__(self, 
+                 name: str,
+                 mode: Optional[str]):
+        super().__init__(name,
+                         mode)
+        
+
+    def _add_specs(self) -> None:
+        self.add_spec( SpecNames.SAMPLE_RATE_LOWER_BOUND, 200e3     ) # Hz
+        self.add_spec( SpecNames.SAMPLE_RATE_UPPER_BOUND, 10e6      ) # Hz
+        self.add_spec( SpecNames.FREQUENCY_LOWER_BOUND  , 1e3       ) # Hz
+        self.add_spec( SpecNames.FREQUENCY_UPPER_BOUND  , 2e9       ) # Hz
+        self.add_spec( SpecNames.IF_GAIN_UPPER_BOUND    , -20       ) # dB
+        self.add_spec( SpecNames.RF_GAIN_UPPER_BOUND    , 0         ) # dB
+        self.add_spec( SpecNames.API_RETUNING_LATENCY   , 50 * 1e-3 ) # s
+        self.add_spec( SpecNames.BANDWIDTH_OPTIONS, 
+                      [200000, 300000, 600000, 1536000, 5000000, 6000000, 7000000, 8000000])
+
+
+    def _add_capture_methods(self) -> None:
+        self.add_capture_method(Modes.TUNER_1_FIXED_CENTER_FREQUENCY, 
+                                CaptureMethods.tuner_1_fixed_center_frequency)
+        self.add_capture_method(Modes.TUNER_2_FIXED_CENTER_FREQUENCY, 
+                                CaptureMethods.tuner_2_fixed_center_frequency)
+        self.add_capture_method(Modes.TUNER_1_SWEPT_CENTER_FREQUENCY, 
+                                CaptureMethods.tuner_1_swept_center_frequency)
+    
+
+    def _add_capture_templates(self):
+        self.add_capture_template(Modes.TUNER_1_FIXED_CENTER_FREQUENCY,
+                                  self._get_capture_template_fixed_center_frequency())
+        self.add_capture_template(Modes.TUNER_2_FIXED_CENTER_FREQUENCY,
+                                  self._get_capture_template_fixed_center_frequency())
+        self.add_capture_template(Modes.TUNER_1_SWEPT_CENTER_FREQUENCY,
+                                  self._get_capture_template_swept_center_frequency())
+        
+    
+    def _add_pvalidators(self):
+        self.add_pvalidator(Modes.TUNER_1_FIXED_CENTER_FREQUENCY,
+                            self._get_pvalidator_fixed_center_frequency())
+        self.add_pvalidator(Modes.TUNER_2_FIXED_CENTER_FREQUENCY,
+                            self._get_pvalidator_fixed_center_frequency())
+        self.add_pvalidator(Modes.TUNER_1_SWEPT_CENTER_FREQUENCY,
+                            self._get_pvalidator_swept_center_frequency())

spectre_core-0.0.10/src/spectre_core/receivers/_base.py → spectre_core-0.0.11/src/spectre_core/receivers/library/_sdrplay_receiver.py

@@ -6,179 +6,12 @@ from abc import ABC, abstractmethod
 from typing import Callable, Optional
 from numbers import Number
 
-from spectre_core.exceptions import ModeNotFoundError
-from ._spec_names import SpecNames
 from spectre_core.capture_configs import (
     CaptureTemplate, CaptureModes, Parameters, Bound, PValidators, PNames,
     get_base_capture_template, get_base_ptemplate, OneOf, CaptureConfig
 )
-
-class BaseReceiver(ABC):
-    def __init__(self, 
-                 name: str, 
-                 mode: Optional[str] = None):
-        self._name = name
-
-        self._specs: dict[str, Number | list[Number]] = {}
-        self._add_specs()
-        
-        self._capture_methods: dict[str, Callable] = {}
-        self._add_capture_methods()
-    
-        self._pvalidators: dict[str, Callable] = {}
-        self._add_pvalidators()
-
-        self._capture_templates: dict[str, CaptureTemplate] = {}
-        self._add_capture_templates()
-
-        self.mode = mode
-
-
-    @abstractmethod
-    def _add_specs(self) -> None:
-        pass
-    
-
-    @abstractmethod
-    def _add_capture_methods(self) -> None:
-        pass
-
-
-    @abstractmethod
-    def _add_pvalidators(self) -> None:
-        pass
-
-
-    @abstractmethod
-    def _add_capture_templates(self) -> None:
-        pass
-
-    
-    @property
-    def name(self) -> str:
-        return self._name
-    
-
-    @property
-    def capture_methods(self) -> dict[str, Callable]:
-        return self._capture_methods
-    
-
-    @property
-    def pvalidators(self) -> dict[str, Callable]:
-        return self._pvalidators
-
-
-    @property
-    def capture_templates(self) -> dict[str, CaptureTemplate]:
-        return self._capture_templates
-
-
-    @property
-    def specs(self) -> dict[str, Number]:
-        return self._specs
-
-
-    @property
-    def modes(self) -> list[str]:
-        capture_method_modes    = list(self.capture_methods.keys())
-        pvalidator_modes        = list(self.pvalidators.keys())
-        capture_template_modes  = list(self.capture_templates.keys())
-
-        if capture_method_modes == pvalidator_modes == capture_template_modes:
-            return capture_method_modes
-        else:
-            raise ValueError(f"Mode mismatch for the receiver {self.name}.")
-
-
-    @property
-    def mode(self) -> str:
-        return self._mode
-    
-
-    @mode.setter
-    def mode(self, value: Optional[str]) -> None:
-        if (value is not None) and value not in self.modes:
-            raise ModeNotFoundError((f"{value} is not a defined mode for the receiver {self.name}. "
-                                     f"Expected one of {self.modes}"))
-        self._mode = value
-
-
-    @property
-    def capture_method(self) -> Callable:
-        return self.capture_methods[self.mode]
-
-
-    @property
-    def pvalidator(self) -> Callable:
-        return self.pvalidators[self.mode]
-
-
-    @property
-    def capture_template(self) -> CaptureTemplate:
-        return self._capture_templates[self.mode]
-
-
-    def add_capture_method(self,
-                           mode: str,
-                           capture_method: Callable) -> None:
-        self._capture_methods[mode] = capture_method
-
-
-    def add_pvalidator(self,
-                      mode: str,
-                      pvalidator: Callable) -> None:
-        self._pvalidators[mode] = pvalidator
-
-
-    def add_capture_template(self,
-                             mode: str,
-                             capture_template: CaptureTemplate) -> CaptureTemplate:
-        self._capture_templates[mode] = capture_template
-
-
-    def add_spec(self,
-                 name: str,
-                 value: Number) -> None:
-        self.specs[name] = value
-
-
-    def get_spec(self, 
-                 spec_name: str) -> Number | list[Number]:
-        if spec_name not in self.specs:
-            raise KeyError(f"Spec not found with name '{spec_name}' "
-                           f"for the receiver '{self.name}'")
-        return self.specs[spec_name]
-
-
-    def start_capture(self, 
-                      tag: str) -> None:
-        self.capture_method( tag, self.load_parameters(tag) )
-
-
-    def save_parameters(self,
-                        tag: str,
-                        parameters: Parameters,
-                        force: bool = False) -> None:
-        
-        parameters = self.capture_template.apply_template(parameters)
-        self.pvalidator(parameters)
-
-        capture_config = CaptureConfig(tag)
-        capture_config.save_parameters(self.name,
-                                       self.mode,
-                                       parameters,
-                                       force=force)
-
-    def load_parameters(self,
-                        tag: str) -> Parameters:
-        capture_config = CaptureConfig(tag)
-
-        parameters = self.capture_template.apply_template(capture_config.parameters)
-        self.pvalidator(parameters)
-        
-        return parameters
-    
+from .._base import BaseReceiver
+from .._spec_names import SpecNames
 
 class SDRPlayReceiver(BaseReceiver):
     def _get_pvalidator_fixed_center_frequency(self) -> Callable:
@@ -280,10 +113,10 @@ class SDRPlayReceiver(BaseReceiver):
         # Update the defaults
         #
         capture_template.set_defaults(
-            (PNames.BATCH_SIZE,            3.0),
-            (PNames.MIN_FREQUENCY,         90000000),
-            (PNames.MAX_FREQUENCY,         110000000),
-            (PNames.SAMPLES_PER_STEP,      300000),
+            (PNames.BATCH_SIZE,            4.0),
+            (PNames.MIN_FREQUENCY,         95000000),
+            (PNames.MAX_FREQUENCY,         100000000),
+            (PNames.SAMPLES_PER_STEP,      80000),
             (PNames.FREQUENCY_STEP,        1536000),
             (PNames.SAMPLE_RATE,           1536000),
             (PNames.BANDWIDTH,             1536000),

{spectre_core-0.0.10 → spectre_core-0.0.11}/src/spectre_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spectre-core
-Version: 0.0.10
+Version: 0.0.11
 Summary: The core Python package used by the spectre program. 
 Maintainer-email: Jimmy Fitzpatrick <jcfitzpatrick12@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{spectre_core-0.0.10 → spectre_core-0.0.11}/src/spectre_core.egg-info/SOURCES.txt

@@ -56,6 +56,7 @@ src/spectre_core/receivers/gr/_rspduo.py
 src/spectre_core/receivers/gr/_test.py
 src/spectre_core/receivers/library/_rsp1a.py
 src/spectre_core/receivers/library/_rspduo.py
+src/spectre_core/receivers/library/_sdrplay_receiver.py
 src/spectre_core/receivers/library/_test.py
 src/spectre_core/spectrograms/__init__.py
 src/spectre_core/spectrograms/_analytical.py