spectre-core 0.0.7__tar.gz → 0.0.8__tar.gz

{spectre_core-0.0.7 → spectre_core-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spectre-core
-Version: 0.0.7
+Version: 0.0.8
 Summary: The core Python package used by the spectre program. 
 Maintainer-email: Jimmy Fitzpatrick <jcfitzpatrick12@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -698,7 +698,7 @@ Requires-Dist: watchdog==4.0.0
   
 :loudspeaker: **This project is under active development. Contributors welcome.** :loudspeaker:  
 
-```spectre-core``` provides a SDR receiver-agnostic digital signal processing framework. It is the core Python package used by the [`spectre`](https://github.com/jcfitzpatrick12/spectre.git) program. 
+```spectre-core``` provides a SDR receiver-agnostic digital signal processing framework. It is the core Python package used by the [`spectre`](https://github.com/jcfitzpatrick12/spectre.git) program.  
 
 
 ## Installation

{spectre_core-0.0.7 → spectre_core-0.0.8}/README.md

@@ -4,7 +4,7 @@
   
 :loudspeaker: **This project is under active development. Contributors welcome.** :loudspeaker:  
 
-```spectre-core``` provides a SDR receiver-agnostic digital signal processing framework. It is the core Python package used by the [`spectre`](https://github.com/jcfitzpatrick12/spectre.git) program. 
+```spectre-core``` provides a SDR receiver-agnostic digital signal processing framework. It is the core Python package used by the [`spectre`](https://github.com/jcfitzpatrick12/spectre.git) program.  
 
 
 ## Installation

{spectre_core-0.0.7 → spectre_core-0.0.8}/pyproject.toml

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

{spectre_core-0.0.7 → spectre_core-0.0.8}/src/spectre_core/receivers/library/rspduo/gr/tuner_1_fixed.py

@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: GPL-3.0
 #
 # GNU Radio Python Flow Graph
-# Title: Options 0
+# Title: tuner_1_fixed
 # GNU Radio version: 3.10.1.1
 
 # SPDX-FileCopyrightText: © 2024 Jimmy Fitzpatrick <jcfitzpatrick12@gmail.com>
@@ -50,7 +50,11 @@ class tuner_1_fixed(gr.top_block):
         ##################################################
         # Blocks
         ##################################################
-        self.spectre_batched_file_sink_0 = spectre.batched_file_sink(CHUNKS_DIR_PATH, tag, chunk_size, samp_rate, is_sweeping)
+        self.spectre_batched_file_sink_0 = spectre.batched_file_sink(CHUNKS_DIR_PATH, 
+                                                                     tag, 
+                                                                     chunk_size, 
+                                                                     samp_rate, 
+                                                                     is_sweeping)
         self.sdrplay3_rspduo_0 = sdrplay3.rspduo(
             '',
             rspduo_mode="Single Tuner",

{spectre_core-0.0.7 → spectre_core-0.0.8}/src/spectre_core/receivers/library/rspduo/gr/tuner_1_sweep.py

@@ -5,9 +5,13 @@
 # SPDX-License-Identifier: GPL-3.0
 #
 # GNU Radio Python Flow Graph
-# Title: Not titled yet
+# Title: tuner_1_sweep
 # 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
+
 import sys
 import signal
 from argparse import ArgumentParser
@@ -31,7 +35,7 @@ from spectre_core.file_handlers.configs import CaptureConfig
 class tuner_1_sweep(gr.top_block):
     def __init__(self, 
                  capture_config: CaptureConfig):
-        gr.top_block.__init__(self, "tuner-1-sweep", catch_exceptions=True)
+        gr.top_block.__init__(self, "tuner_1_sweep", catch_exceptions=True)
 
         ##################################################
         # Unpack capture config
@@ -93,8 +97,8 @@ class tuner_1_sweep(gr.top_block):
         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)
-        self.blocks_tag_debug_0 = blocks.tag_debug(gr.sizeof_gr_complex*1, 'freq', "freq")
-        self.blocks_tag_debug_0.set_display(True)
+        # self.blocks_tag_debug_0 = blocks.tag_debug(gr.sizeof_gr_complex*1, 'freq', "freq")
+        # self.blocks_tag_debug_0.set_display(True)
 
 
         ##################################################
@@ -105,14 +109,6 @@ class tuner_1_sweep(gr.top_block):
         self.connect((self.sdrplay3_rspduo_0, 0), (self.spectre_sweep_driver_0, 0))
 
 
-    def get_samp_rate(self):
-        return self.samp_rate
-
-    def set_samp_rate(self, samp_rate):
-        self.samp_rate = samp_rate
-        self.sdrplay3_rspduo_0.set_sample_rate(self.samp_rate, True)
-
-
 
 
 def main(capture_config: CaptureConfig, 

spectre_core-0.0.8/src/spectre_core/receivers/library/rspduo/gr/tuner_2_fixed.py

@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+#
+# SPDX-License-Identifier: GPL-3.0
+#
+# GNU Radio Python Flow Graph
+# Title: Not titled yet
+# 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
+
+from gnuradio import gr
+from gnuradio.filter import firdes
+from gnuradio.fft import window
+import sys
+import signal
+from argparse import ArgumentParser
+from gnuradio.eng_arg import eng_float, intx
+from gnuradio import eng_notation
+from gnuradio import sdrplay3
+from gnuradio import spectre
+
+from spectre_core.cfg import CHUNKS_DIR_PATH
+from spectre_core.file_handlers.configs import CaptureConfig
+
+
+class tuner_2_fixed(gr.top_block):
+
+    def __init__(self,
+                 capture_config: CaptureConfig):
+        gr.top_block.__init__(self, "tuner_2_fixed", catch_exceptions=True)
+
+        ##################################################
+        # Unpack capture config
+        ##################################################
+        samp_rate = capture_config['samp_rate']
+        tag = capture_config['tag']
+        chunk_size = capture_config['chunk_size']
+        center_freq = capture_config['center_freq']
+        bandwidth = capture_config['bandwidth']
+        IF_gain = capture_config['IF_gain']
+        RF_gain = capture_config['RF_gain']
+        is_sweeping = False
+
+        ##################################################
+        # Blocks
+        ##################################################
+        self.spectre_batched_file_sink_0 = spectre.batched_file_sink(CHUNKS_DIR_PATH, 
+                                                                     tag, 
+                                                                     chunk_size, 
+                                                                     samp_rate, 
+                                                                     is_sweeping)
+        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(samp_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))
+
+
+    def get_samp_rate(self):
+        return self.samp_rate
+
+    def set_samp_rate(self, samp_rate):
+        self.samp_rate = samp_rate
+        self.sdrplay3_rspduo_0.set_sample_rate(self.samp_rate, False)
+
+
+
+
+def main(capture_config: CaptureConfig, 
+         top_block_cls=tuner_2_fixed, 
+         options=None):
+
+    tb = top_block_cls(capture_config)
+
+    def sig_handler(sig=None, frame=None):
+        tb.stop()
+        tb.wait()
+
+        sys.exit(0)
+
+    signal.signal(signal.SIGINT, sig_handler)
+    signal.signal(signal.SIGTERM, sig_handler)
+
+    tb.start()
+
+    tb.wait()
+

spectre_core-0.0.8/src/spectre_core/receivers/library/rspduo/gr/tuner_2_sweep.py

@@ -0,0 +1,119 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+#
+# SPDX-License-Identifier: GPL-3.0
+#
+# GNU Radio Python Flow Graph
+# Title: Not titled yet
+# GNU Radio version: 3.10.1.1
+
+from gnuradio import gr
+from gnuradio.filter import firdes
+from gnuradio.fft import window
+import sys
+import signal
+from argparse import ArgumentParser
+from gnuradio.eng_arg import eng_float, intx
+from gnuradio import eng_notation
+from gnuradio import sdrplay3
+from gnuradio import spectre
+
+from spectre_core.cfg import CHUNKS_DIR_PATH
+from spectre_core.file_handlers.configs import CaptureConfig
+
+
+class tuner_2_sweep(gr.top_block):
+    def __init__(self, 
+                 capture_config: CaptureConfig):
+        gr.top_block.__init__(self, "tuner_2_sweep", catch_exceptions=True)
+
+        ##################################################
+        # Unpack capture config
+        ##################################################
+        samp_rate = capture_config['samp_rate']
+        bandwidth = capture_config['bandwidth']
+        min_freq = capture_config['min_freq']
+        max_freq = capture_config['max_freq']
+        freq_step = capture_config['freq_step']
+        samples_per_step = capture_config['samples_per_step']
+        IF_gain = capture_config['IF_gain']
+        RF_gain = capture_config['RF_gain']
+        chunk_size = capture_config['chunk_size']
+        start_freq = min_freq + samp_rate/2
+        tag = capture_config['tag']
+
+        ##################################################
+        # Blocks
+        ##################################################
+        self.spectre_sweep_driver_0 = spectre.sweep_driver(min_freq, 
+                                                           max_freq, 
+                                                           freq_step, 
+                                                           samp_rate, 
+                                                           samples_per_step,
+                                                           'freq')
+        self.spectre_batched_file_sink_0 = spectre.batched_file_sink(CHUNKS_DIR_PATH, 
+                                                                     tag, 
+                                                                     chunk_size, 
+                                                                     samp_rate, 
+                                                                     True, 
+                                                                     'freq', 
+                                                                     start_freq)
+        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(samp_rate, True)
+        self.sdrplay3_rspduo_0.set_center_freq(start_freq, True)
+        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', 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))
+
+
+def main(capture_config: CaptureConfig, 
+         top_block_cls=tuner_2_sweep, 
+         options=None):
+    tb = top_block_cls(capture_config)
+
+    def sig_handler(sig=None, frame=None):
+        tb.stop()
+        tb.wait()
+
+        sys.exit(0)
+
+    signal.signal(signal.SIGINT, sig_handler)
+    signal.signal(signal.SIGTERM, sig_handler)
+
+    tb.start(1024)
+
+    tb.wait()
+
+if __name__ == '__main__':
+    main()

{spectre_core-0.0.7 → spectre_core-0.0.8}/src/spectre_core/receivers/library/rspduo/receiver.py

@@ -4,7 +4,12 @@
 
 from spectre_core.receivers.base import SDRPlayReceiver
 from spectre_core.receivers.receiver_register import register_receiver
-from spectre_core.receivers.library.rspduo.gr import tuner_1_fixed, tuner_1_sweep
+from spectre_core.receivers.library.rspduo.gr import (
+    tuner_1_fixed, 
+    tuner_1_sweep,
+    tuner_2_fixed,
+    tuner_2_sweep
+)
 from spectre_core.file_handlers.configs import CaptureConfig
 
 
@@ -17,14 +22,18 @@ class Receiver(SDRPlayReceiver):
     def _set_capture_methods(self) -> None:
         self._capture_methods = {
             "tuner-1-fixed": self.__tuner_1_fixed,
-            "tuner-1-sweep": self.__tuner_1_sweep
+            "tuner-1-sweep": self.__tuner_1_sweep,
+            "tuner-2-fixed": self.__tuner_2_fixed,
+            "tuner-2-sweep": self.__tuner_2_sweep
         }
     
 
     def _set_validators(self) -> None:
         self._validators = {
             "tuner-1-fixed": self.__tuner_1_fixed_validator,
-            "tuner-1-sweep": self.__tuner_1_sweep_validator
+            "tuner-1-sweep": self.__tuner_1_sweep_validator,
+            "tuner-2-fixed": self.__tuner_2_fixed_validator,
+            "tuner-2-sweep": self.__tuner_2_sweep_validator,
         }
         return
     
@@ -33,6 +42,8 @@ class Receiver(SDRPlayReceiver):
         self._type_templates = {
             "tuner-1-fixed": self._get_default_type_template("fixed"),
             "tuner-1-sweep": self._get_default_type_template("sweep"),
+            "tuner-2-fixed": self._get_default_type_template("fixed"),
+            "tuner-2-sweep": self._get_default_type_template("sweep"),
         }
 
     def _set_specifications(self) -> None:
@@ -55,14 +66,32 @@ class Receiver(SDRPlayReceiver):
 
     def __tuner_1_sweep(self, capture_config: CaptureConfig) -> None:
         tuner_1_sweep.main(capture_config)
+
+    
+    def __tuner_2_fixed(self, capture_config: CaptureConfig) -> None:
+        tuner_2_fixed.main(capture_config)
     
 
+    def __tuner_2_sweep(self, capture_config: CaptureConfig) -> None:
+        tuner_2_sweep.main(capture_config)
+
+
     def __tuner_1_fixed_validator(self, capture_config: CaptureConfig) -> None:
         self._default_fixed_validator(capture_config)
         self._sdrplay_validator(capture_config)
-    
-    
+ 
+
     def __tuner_1_sweep_validator(self, capture_config: CaptureConfig) -> None:
+        self._default_sweep_validator(capture_config)
+        self._sdrplay_validator(capture_config)  
+
+
+    def __tuner_2_fixed_validator(self, capture_config: CaptureConfig) -> None:
+        self._default_fixed_validator(capture_config)
+        self._sdrplay_validator(capture_config)
+
+
+    def __tuner_2_sweep_validator(self, capture_config: CaptureConfig) -> None:
         self._default_sweep_validator(capture_config)
         self._sdrplay_validator(capture_config)
     

{spectre_core-0.0.7 → spectre_core-0.0.8}/src/spectre_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spectre-core
-Version: 0.0.7
+Version: 0.0.8
 Summary: The core Python package used by the spectre program. 
 Maintainer-email: Jimmy Fitzpatrick <jcfitzpatrick12@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -698,7 +698,7 @@ Requires-Dist: watchdog==4.0.0
   
 :loudspeaker: **This project is under active development. Contributors welcome.** :loudspeaker:  
 
-```spectre-core``` provides a SDR receiver-agnostic digital signal processing framework. It is the core Python package used by the [`spectre`](https://github.com/jcfitzpatrick12/spectre.git) program. 
+```spectre-core``` provides a SDR receiver-agnostic digital signal processing framework. It is the core Python package used by the [`spectre`](https://github.com/jcfitzpatrick12/spectre.git) program.  
 
 
 ## Installation

{spectre_core-0.0.7 → spectre_core-0.0.8}/src/spectre_core.egg-info/SOURCES.txt

@@ -53,6 +53,8 @@ src/spectre_core/receivers/library/rspduo/receiver.py
 src/spectre_core/receivers/library/rspduo/gr/__init__.py
 src/spectre_core/receivers/library/rspduo/gr/tuner_1_fixed.py
 src/spectre_core/receivers/library/rspduo/gr/tuner_1_sweep.py
+src/spectre_core/receivers/library/rspduo/gr/tuner_2_fixed.py
+src/spectre_core/receivers/library/rspduo/gr/tuner_2_sweep.py
 src/spectre_core/receivers/library/test/__init__.py
 src/spectre_core/receivers/library/test/receiver.py
 src/spectre_core/receivers/library/test/gr/__init__.py