From 79052d48c39e4ddf9a41376bbf2b6ff873c102d4 Mon Sep 17 00:00:00 2001 From: Manolis Surligas Date: Sun, 19 Nov 2017 11:46:14 +0200 Subject: [PATCH] Fix deprecated variable blocks --- apps/flowgraphs/apt_demod.grc | 91 +------------------ apps/flowgraphs/bpsk_demod.grc | 91 +------------------ apps/flowgraphs/cw_demod.grc | 91 +------------------ apps/flowgraphs/fm_demod.grc | 89 +----------------- apps/flowgraphs/generic_iq_receiver.grc | 29 ------ apps/flowgraphs/satnogs_apt_demod.py | 10 +- apps/flowgraphs/satnogs_bpsk_demod.py | 10 +- apps/flowgraphs/satnogs_cw_demod.py | 10 +- apps/flowgraphs/satnogs_fm_demod.py | 10 +- .../flowgraphs/satnogs_generic_iq_receiver.py | 10 +- python/dsp_settings.py | 1 + 11 files changed, 17 insertions(+), 425 deletions(-) diff --git a/apps/flowgraphs/apt_demod.grc b/apps/flowgraphs/apt_demod.grc index f73de96..5ca4a8b 100644 --- a/apps/flowgraphs/apt_demod.grc +++ b/apps/flowgraphs/apt_demod.grc @@ -81,35 +81,6 @@ APT Generic Demodulation - - variable - - comment - Decimation factor -for the RX after the -SDR received samples - - - _enabled - True - - - _coordinate - (1704, 796) - - - _rotation - 0 - - - id - audio_gain - - - value - satnogs.fm_demod_settings[rx_sdr_device]['audio_gain'] - - variable @@ -137,35 +108,6 @@ SDR received samples 48000 - - variable - - comment - Decimation factor -for the RX after the -SDR received samples - - - _enabled - 0 - - - _coordinate - (1704, 348) - - - _rotation - 0 - - - id - decimation_rx - - - value - satnogs.fm_demod_settings[rx_sdr_device]['decimation_rx'] - - variable @@ -220,33 +162,6 @@ SDR received samples 250000 - - variable - - comment - - - - _enabled - 0 - - - _coordinate - (1704, 508) - - - _rotation - 0 - - - id - quadrature_rate - - - value - samp_rate_rx / decimation_rx - - variable @@ -260,7 +175,7 @@ TX sampling rate _coordinate - (1704, 956) + (1704, 476) _rotation @@ -914,7 +829,7 @@ we shift the LO a little further _coordinate - (1704, 608) + (1704, 324) _rotation @@ -2865,7 +2780,7 @@ we shift the LO a little further 1 - rps + pps 10 diff --git a/apps/flowgraphs/bpsk_demod.grc b/apps/flowgraphs/bpsk_demod.grc index 8ea53cd..82bd45d 100644 --- a/apps/flowgraphs/bpsk_demod.grc +++ b/apps/flowgraphs/bpsk_demod.grc @@ -81,35 +81,6 @@ BPSK Generic Demodulation - - variable - - comment - Decimation factor -for the RX after the -SDR received samples - - - _enabled - True - - - _coordinate - (1704, 796) - - - _rotation - 0 - - - id - audio_gain - - - value - satnogs.fm_demod_settings[rx_sdr_device]['audio_gain'] - - variable @@ -137,35 +108,6 @@ SDR received samples 48000 - - variable - - comment - Decimation factor -for the RX after the -SDR received samples - - - _enabled - 0 - - - _coordinate - (1704, 348) - - - _rotation - 0 - - - id - decimation_rx - - - value - satnogs.fm_demod_settings[rx_sdr_device]['decimation_rx'] - - variable @@ -220,33 +162,6 @@ SDR received samples 250000 - - variable - - comment - - - - _enabled - 0 - - - _coordinate - (1704, 508) - - - _rotation - 0 - - - id - quadrature_rate - - - value - samp_rate_rx / decimation_rx - - variable @@ -260,7 +175,7 @@ TX sampling rate _coordinate - (1704, 956) + (1704, 460) _rotation @@ -1136,7 +1051,7 @@ we shift the LO a little further _coordinate - (1704, 608) + (1704, 324) _rotation @@ -3154,7 +3069,7 @@ we shift the LO a little further 1 - rps + pps 10 diff --git a/apps/flowgraphs/cw_demod.grc b/apps/flowgraphs/cw_demod.grc index 87f3797..9a013f0 100644 --- a/apps/flowgraphs/cw_demod.grc +++ b/apps/flowgraphs/cw_demod.grc @@ -81,35 +81,6 @@ FM Generic Demodulation - - variable - - comment - Decimation factor -for the RX after the -SDR received samples - - - _enabled - True - - - _coordinate - (1704, 796) - - - _rotation - 0 - - - id - audio_gain - - - value - satnogs.fm_demod_settings[rx_sdr_device]['audio_gain'] - - variable @@ -137,35 +108,6 @@ SDR received samples 48000 - - variable - - comment - Decimation factor -for the RX after the -SDR received samples - - - _enabled - 0 - - - _coordinate - (1704, 348) - - - _rotation - 0 - - - id - decimation_rx - - - value - satnogs.fm_demod_settings[rx_sdr_device]['decimation_rx'] - - variable @@ -220,33 +162,6 @@ SDR received samples 250000 - - variable - - comment - - - - _enabled - 0 - - - _coordinate - (1704, 508) - - - _rotation - 0 - - - id - quadrature_rate - - - value - samp_rate_rx / decimation_rx - - variable @@ -260,7 +175,7 @@ TX sampling rate _coordinate - (1704, 956) + (1704, 452) _rotation @@ -1136,7 +1051,7 @@ we shift the LO a little further _coordinate - (1704, 608) + (1704, 324) _rotation @@ -3154,7 +3069,7 @@ we shift the LO a little further 1 - rps + pps 10 diff --git a/apps/flowgraphs/fm_demod.grc b/apps/flowgraphs/fm_demod.grc index f6ce9a2..809ebab 100644 --- a/apps/flowgraphs/fm_demod.grc +++ b/apps/flowgraphs/fm_demod.grc @@ -81,35 +81,6 @@ FM Generic Demodulation - - variable - - comment - Decimation factor -for the RX after the -SDR received samples - - - _enabled - True - - - _coordinate - (1061, 865) - - - _rotation - 0 - - - id - audio_gain - - - value - satnogs.fm_demod_settings[rx_sdr_device]['audio_gain'] - - variable @@ -137,35 +108,6 @@ SDR received samples 48000 - - variable - - comment - Decimation factor -for the RX after the -SDR received samples - - - _enabled - 0 - - - _coordinate - (1704, 348) - - - _rotation - 0 - - - id - decimation_rx - - - value - satnogs.fm_demod_settings[rx_sdr_device]['decimation_rx'] - - variable @@ -247,33 +189,6 @@ SDR received samples 3000 - - variable - - comment - - - - _enabled - 0 - - - _coordinate - (1704, 508) - - - _rotation - 0 - - - id - quadrature_rate - - - value - samp_rate_rx / decimation_rx - - variable @@ -287,7 +202,7 @@ TX sampling rate _coordinate - (1196, 865) + (1088, 860) _rotation @@ -2911,7 +2826,7 @@ max_modulation_freq = 3000 1 - rps + pps 10 diff --git a/apps/flowgraphs/generic_iq_receiver.grc b/apps/flowgraphs/generic_iq_receiver.grc index cea658e..12b6e3b 100644 --- a/apps/flowgraphs/generic_iq_receiver.grc +++ b/apps/flowgraphs/generic_iq_receiver.grc @@ -108,35 +108,6 @@ 2 - - variable - - comment - Decimation factor -for the RX after the -SDR received samples - - - _enabled - True - - - _coordinate - (336, 612) - - - _rotation - 0 - - - id - audio_gain - - - value - satnogs.fm_demod_settings[rx_sdr_device]['audio_gain'] - - variable diff --git a/apps/flowgraphs/satnogs_apt_demod.py b/apps/flowgraphs/satnogs_apt_demod.py index 939d574..ed5b44e 100755 --- a/apps/flowgraphs/satnogs_apt_demod.py +++ b/apps/flowgraphs/satnogs_apt_demod.py @@ -5,7 +5,7 @@ # Title: APT Generic Demodulation # Author: Manolis Surligas (surligas@gmail.com) # Description: A generic APT demodulation block -# Generated: Wed Nov 1 13:04:36 2017 +# Generated: Sun Nov 19 11:34:53 2017 ################################################## from gnuradio import analog @@ -57,7 +57,6 @@ class satnogs_apt_demod(gr.top_block): self.filter_rate = filter_rate = 250000 self.deviation = deviation = 17000 self.audio_samp_rate = audio_samp_rate = 48000 - self.audio_gain = audio_gain = satnogs.fm_demod_settings[rx_sdr_device]['audio_gain'] ################################################## # Blocks @@ -211,7 +210,6 @@ class satnogs_apt_demod(gr.top_block): self.osmosdr_source_0.set_if_gain(satnogs.handle_rx_if_gain(self.rx_sdr_device, self.if_gain), 0) self.osmosdr_source_0.set_bb_gain(satnogs.handle_rx_bb_gain(self.rx_sdr_device, self.bb_gain), 0) self.osmosdr_source_0.set_antenna(satnogs.handle_rx_antenna(self.rx_sdr_device, self.antenna), 0) - self.set_audio_gain(satnogs.fm_demod_settings[self.rx_sdr_device]['audio_gain']) def get_waterfall_file_path(self): return self.waterfall_file_path @@ -260,12 +258,6 @@ class satnogs_apt_demod(gr.top_block): def set_audio_samp_rate(self, audio_samp_rate): self.audio_samp_rate = audio_samp_rate - def get_audio_gain(self): - return self.audio_gain - - def set_audio_gain(self, audio_gain): - self.audio_gain = audio_gain - def argument_parser(): description = 'A generic APT demodulation block' diff --git a/apps/flowgraphs/satnogs_bpsk_demod.py b/apps/flowgraphs/satnogs_bpsk_demod.py index 9381c93..b13a05f 100755 --- a/apps/flowgraphs/satnogs_bpsk_demod.py +++ b/apps/flowgraphs/satnogs_bpsk_demod.py @@ -5,7 +5,7 @@ # Title: BPSK Generic Demodulation # Author: surligas, cshields, csete # Description: A generic BPSK demodulation block -# Generated: Wed Nov 1 14:52:53 2017 +# Generated: Sun Nov 19 11:35:26 2017 ################################################## from gnuradio import analog @@ -58,7 +58,6 @@ class satnogs_bpsk_demod(gr.top_block): self.filter_rate = filter_rate = 250000 self.deviation = deviation = 5000 self.audio_samp_rate = audio_samp_rate = 48000 - self.audio_gain = audio_gain = satnogs.fm_demod_settings[rx_sdr_device]['audio_gain'] ################################################## # Blocks @@ -222,7 +221,6 @@ class satnogs_bpsk_demod(gr.top_block): self.osmosdr_source_0.set_if_gain(satnogs.handle_rx_if_gain(self.rx_sdr_device, self.if_gain), 0) self.osmosdr_source_0.set_bb_gain(satnogs.handle_rx_bb_gain(self.rx_sdr_device, self.bb_gain), 0) self.osmosdr_source_0.set_antenna(satnogs.handle_rx_antenna(self.rx_sdr_device, self.antenna), 0) - self.set_audio_gain(satnogs.fm_demod_settings[self.rx_sdr_device]['audio_gain']) def get_waterfall_file_path(self): return self.waterfall_file_path @@ -272,12 +270,6 @@ class satnogs_bpsk_demod(gr.top_block): self.low_pass_filter_0.set_taps(firdes.low_pass(1, self.audio_samp_rate, 2000, 1000, firdes.WIN_HAMMING, 6.76)) self.analog_sig_source_x_0.set_sampling_freq(self.audio_samp_rate) - def get_audio_gain(self): - return self.audio_gain - - def set_audio_gain(self, audio_gain): - self.audio_gain = audio_gain - def argument_parser(): description = 'A generic BPSK demodulation block' diff --git a/apps/flowgraphs/satnogs_cw_demod.py b/apps/flowgraphs/satnogs_cw_demod.py index 98f2866..ee0d28f 100755 --- a/apps/flowgraphs/satnogs_cw_demod.py +++ b/apps/flowgraphs/satnogs_cw_demod.py @@ -5,7 +5,7 @@ # Title: FM Generic Demodulation # Author: surligas, cshields, csete # Description: A generic CW demodulation block -# Generated: Wed Nov 1 13:13:56 2017 +# Generated: Sun Nov 19 11:36:27 2017 ################################################## from gnuradio import analog @@ -58,7 +58,6 @@ class satnogs_cw_demod(gr.top_block): self.filter_rate = filter_rate = 250000 self.deviation = deviation = 5000 self.audio_samp_rate = audio_samp_rate = 48000 - self.audio_gain = audio_gain = satnogs.fm_demod_settings[rx_sdr_device]['audio_gain'] ################################################## # Blocks @@ -222,7 +221,6 @@ class satnogs_cw_demod(gr.top_block): self.osmosdr_source_0.set_if_gain(satnogs.handle_rx_if_gain(self.rx_sdr_device, self.if_gain), 0) self.osmosdr_source_0.set_bb_gain(satnogs.handle_rx_bb_gain(self.rx_sdr_device, self.bb_gain), 0) self.osmosdr_source_0.set_antenna(satnogs.handle_rx_antenna(self.rx_sdr_device, self.antenna), 0) - self.set_audio_gain(satnogs.fm_demod_settings[self.rx_sdr_device]['audio_gain']) def get_waterfall_file_path(self): return self.waterfall_file_path @@ -272,12 +270,6 @@ class satnogs_cw_demod(gr.top_block): self.low_pass_filter_0.set_taps(firdes.low_pass(1, self.audio_samp_rate, 2000, 1000, firdes.WIN_HAMMING, 6.76)) self.analog_sig_source_x_0.set_sampling_freq(self.audio_samp_rate) - def get_audio_gain(self): - return self.audio_gain - - def set_audio_gain(self, audio_gain): - self.audio_gain = audio_gain - def argument_parser(): description = 'A generic CW demodulation block' diff --git a/apps/flowgraphs/satnogs_fm_demod.py b/apps/flowgraphs/satnogs_fm_demod.py index 7ef6b68..7c1ed8f 100755 --- a/apps/flowgraphs/satnogs_fm_demod.py +++ b/apps/flowgraphs/satnogs_fm_demod.py @@ -5,7 +5,7 @@ # Title: FM Generic Demodulation # Author: Manolis Surligas (surligas@gmail.com) # Description: A generic FM demodulation block -# Generated: Wed Nov 1 13:04:41 2017 +# Generated: Sun Nov 19 11:35:00 2017 ################################################## from gnuradio import analog @@ -58,7 +58,6 @@ class satnogs_fm_demod(gr.top_block): self.filter_rate = filter_rate = 250000 self.deviation = deviation = 5000 self.audio_samp_rate = audio_samp_rate = 48000 - self.audio_gain = audio_gain = satnogs.fm_demod_settings[rx_sdr_device]['audio_gain'] ################################################## # Blocks @@ -208,7 +207,6 @@ class satnogs_fm_demod(gr.top_block): self.osmosdr_source_0.set_if_gain(satnogs.handle_rx_if_gain(self.rx_sdr_device, self.if_gain), 0) self.osmosdr_source_0.set_bb_gain(satnogs.handle_rx_bb_gain(self.rx_sdr_device, self.bb_gain), 0) self.osmosdr_source_0.set_antenna(satnogs.handle_rx_antenna(self.rx_sdr_device, self.antenna), 0) - self.set_audio_gain(satnogs.fm_demod_settings[self.rx_sdr_device]['audio_gain']) def get_waterfall_file_path(self): return self.waterfall_file_path @@ -267,12 +265,6 @@ class satnogs_fm_demod(gr.top_block): self.low_pass_filter_0.set_taps(firdes.low_pass(1, self.audio_samp_rate, self.deviation+self.max_modulation_freq, 3000, firdes.WIN_HAMMING, 6.76)) self.analog_quadrature_demod_cf_0.set_gain((2*math.pi*self.deviation)/self.audio_samp_rate) - def get_audio_gain(self): - return self.audio_gain - - def set_audio_gain(self, audio_gain): - self.audio_gain = audio_gain - def argument_parser(): description = 'A generic FM demodulation block' diff --git a/apps/flowgraphs/satnogs_generic_iq_receiver.py b/apps/flowgraphs/satnogs_generic_iq_receiver.py index 826eb0f..7d296ef 100755 --- a/apps/flowgraphs/satnogs_generic_iq_receiver.py +++ b/apps/flowgraphs/satnogs_generic_iq_receiver.py @@ -5,7 +5,7 @@ # Title: Generic IQ samples receiver # Author: Manolis Surligas (surligas@gmail.com) # Description: A generic FM demodulation block -# Generated: Tue Jul 25 21:47:53 2017 +# Generated: Sun Nov 19 11:38:07 2017 ################################################## from gnuradio import blocks @@ -51,7 +51,6 @@ class satnogs_generic_iq_receiver(gr.top_block): self.quadrature_rate = quadrature_rate = samp_rate_rx / decimation_rx self.audio_samp_rate = audio_samp_rate = 44100 - self.audio_gain = audio_gain = satnogs.fm_demod_settings[rx_sdr_device]['audio_gain'] self.audio_decimation = audio_decimation = 2 ################################################## @@ -171,7 +170,6 @@ class satnogs_generic_iq_receiver(gr.top_block): self.osmosdr_source_0.set_if_gain(satnogs.handle_rx_if_gain(self.rx_sdr_device, self.if_gain), 0) self.osmosdr_source_0.set_bb_gain(satnogs.handle_rx_bb_gain(self.rx_sdr_device, self.bb_gain), 0) self.osmosdr_source_0.set_antenna(satnogs.handle_rx_antenna(self.rx_sdr_device, self.antenna), 0) - self.set_audio_gain(satnogs.fm_demod_settings[self.rx_sdr_device]['audio_gain']) def get_samp_rate_rx(self): return self.samp_rate_rx @@ -208,12 +206,6 @@ class satnogs_generic_iq_receiver(gr.top_block): def set_audio_samp_rate(self, audio_samp_rate): self.audio_samp_rate = audio_samp_rate - def get_audio_gain(self): - return self.audio_gain - - def set_audio_gain(self, audio_gain): - self.audio_gain = audio_gain - def get_audio_decimation(self): return self.audio_decimation diff --git a/python/dsp_settings.py b/python/dsp_settings.py index 52911c0..43ef43b 100644 --- a/python/dsp_settings.py +++ b/python/dsp_settings.py @@ -26,6 +26,7 @@ fm_demod_settings = {'usrpb200' : {'decimation_rx' : 5, 'audio_gain' : 0.9}, 'usrp2' : {'decimation_rx' : 5, 'audio_gain' : 0.9}, 'airspy' : {'decimation_rx' : 10, 'audio_gain' : 0.9}, + 'airspymini' : {'decimation_rx' : 5, 'audio_gain' : 0.9}, 'hackrf' : {'decimation_rx' : 5, 'audio_gain' : 0.9}, 'rtlsdr' : {'decimation_rx' : 5, 'audio_gain' : 0.9} } \ No newline at end of file