sebastian
/
gr-satnogs
mirror of https://gitlab.com/LongHairedHacker/gr-satnogs.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'fix_flowgraphs' into 'master' 

Fix deprecated variable blocks

See merge request librespacefoundation/satnogs/gr-satnogs!120
This commit is contained in:
Manolis Surligas 2017-11-19 09:47:14 +00:00
parent 6050b2ac5c 79052d48c3
commit 1b0f949e8d
11 changed files with 17 additions and 425 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
apps/flowgraphs/apt_demod.grc
View File

@ -81,35 +81,6 @@
<value>APT Generic Demodulation</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
<value>Decimation factor
for the RX after the
SDR received samples</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 796)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>audio_gain</value>
</param>
<param>
<key>value</key>
<value>satnogs.fm_demod_settings[rx_sdr_device]['audio_gain']</value>
</param>
</block>
<block>
<key>variable</key>
<param>
@ -137,35 +108,6 @@ SDR received samples</value>
<value>48000</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
<value>Decimation factor
for the RX after the
SDR received samples</value>
</param>
<param>
<key>_enabled</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 348)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>decimation_rx</value>
</param>
<param>
<key>value</key>
<value>satnogs.fm_demod_settings[rx_sdr_device]['decimation_rx']</value>
</param>
</block>
<block>
<key>variable</key>
<param>
@ -220,33 +162,6 @@ SDR received samples</value>
<value>250000</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 508)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>quadrature_rate</value>
</param>
<param>
<key>value</key>
<value>samp_rate_rx / decimation_rx</value>
</param>
</block>
<block>
<key>variable</key>
<param>
@ -260,7 +175,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 956)</value>
<value>(1704, 476)</value>
</param>
<param>
<key>_rotation</key>
@ -914,7 +829,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 608)</value>
<value>(1704, 324)</value>
</param>
<param>
<key>_rotation</key>
@ -2865,7 +2780,7 @@ we shift the LO a little further</value>
<value>1</value>
</param>
<param>
<key>rps</key>
<key>pps</key>
<value>10</value>
</param>
<param>

91
apps/flowgraphs/bpsk_demod.grc
View File

@ -81,35 +81,6 @@
<value>BPSK Generic Demodulation</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
<value>Decimation factor
for the RX after the
SDR received samples</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 796)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>audio_gain</value>
</param>
<param>
<key>value</key>
<value>satnogs.fm_demod_settings[rx_sdr_device]['audio_gain']</value>
</param>
</block>
<block>
<key>variable</key>
<param>
@ -137,35 +108,6 @@ SDR received samples</value>
<value>48000</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
<value>Decimation factor
for the RX after the
SDR received samples</value>
</param>
<param>
<key>_enabled</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 348)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>decimation_rx</value>
</param>
<param>
<key>value</key>
<value>satnogs.fm_demod_settings[rx_sdr_device]['decimation_rx']</value>
</param>
</block>
<block>
<key>variable</key>
<param>
@ -220,33 +162,6 @@ SDR received samples</value>
<value>250000</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 508)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>quadrature_rate</value>
</param>
<param>
<key>value</key>
<value>samp_rate_rx / decimation_rx</value>
</param>
</block>
<block>
<key>variable</key>
<param>
@ -260,7 +175,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 956)</value>
<value>(1704, 460)</value>
</param>
<param>
<key>_rotation</key>
@ -1136,7 +1051,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 608)</value>
<value>(1704, 324)</value>
</param>
<param>
<key>_rotation</key>
@ -3154,7 +3069,7 @@ we shift the LO a little further</value>
<value>1</value>
</param>
<param>
<key>rps</key>
<key>pps</key>
<value>10</value>
</param>
<param>

91
apps/flowgraphs/cw_demod.grc
View File

@ -81,35 +81,6 @@
<value>FM Generic Demodulation</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
<value>Decimation factor
for the RX after the
SDR received samples</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 796)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>audio_gain</value>
</param>
<param>
<key>value</key>
<value>satnogs.fm_demod_settings[rx_sdr_device]['audio_gain']</value>
</param>
</block>
<block>
<key>variable</key>
<param>
@ -137,35 +108,6 @@ SDR received samples</value>
<value>48000</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
<value>Decimation factor
for the RX after the
SDR received samples</value>
</param>
<param>
<key>_enabled</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 348)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>decimation_rx</value>
</param>
<param>
<key>value</key>
<value>satnogs.fm_demod_settings[rx_sdr_device]['decimation_rx']</value>
</param>
</block>
<block>
<key>variable</key>
<param>
@ -220,33 +162,6 @@ SDR received samples</value>
<value>250000</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 508)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>quadrature_rate</value>
</param>
<param>
<key>value</key>
<value>samp_rate_rx / decimation_rx</value>
</param>
</block>
<block>
<key>variable</key>
<param>
@ -260,7 +175,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 956)</value>
<value>(1704, 452)</value>
</param>
<param>
<key>_rotation</key>
@ -1136,7 +1051,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 608)</value>
<value>(1704, 324)</value>
</param>
<param>
<key>_rotation</key>
@ -3154,7 +3069,7 @@ we shift the LO a little further</value>
<value>1</value>
</param>
<param>
<key>rps</key>
<key>pps</key>
<value>10</value>
</param>
<param>

89
apps/flowgraphs/fm_demod.grc
View File

@ -81,35 +81,6 @@
<value>FM Generic Demodulation</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
<value>Decimation factor
for the RX after the
SDR received samples</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1061, 865)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>audio_gain</value>
</param>
<param>
<key>value</key>
<value>satnogs.fm_demod_settings[rx_sdr_device]['audio_gain']</value>
</param>
</block>
<block>
<key>variable</key>
<param>
@ -137,35 +108,6 @@ SDR received samples</value>
<value>48000</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
<value>Decimation factor
for the RX after the
SDR received samples</value>
</param>
<param>
<key>_enabled</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 348)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>decimation_rx</value>
</param>
<param>
<key>value</key>
<value>satnogs.fm_demod_settings[rx_sdr_device]['decimation_rx']</value>
</param>
</block>
<block>
<key>variable</key>
<param>
@ -247,33 +189,6 @@ SDR received samples</value>
<value>3000</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(1704, 508)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>quadrature_rate</value>
</param>
<param>
<key>value</key>
<value>samp_rate_rx / decimation_rx</value>
</param>
</block>
<block>
<key>variable</key>
<param>
@ -287,7 +202,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(1196, 865)</value>
<value>(1088, 860)</value>
</param>
<param>
<key>_rotation</key>
@ -2911,7 +2826,7 @@ max_modulation_freq = 3000</value>
<value>1</value>
</param>
<param>
<key>rps</key>
<key>pps</key>
<value>10</value>
</param>
<param>

29
apps/flowgraphs/generic_iq_receiver.grc
View File

@ -108,35 +108,6 @@
<value>2</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
<value>Decimation factor
for the RX after the
SDR received samples</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(336, 612)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>audio_gain</value>
</param>
<param>
<key>value</key>
<value>satnogs.fm_demod_settings[rx_sdr_device]['audio_gain']</value>
</param>
</block>
<block>
<key>variable</key>
<param>

10
apps/flowgraphs/satnogs_apt_demod.py
View File

@ -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'

10
apps/flowgraphs/satnogs_bpsk_demod.py
View File

@ -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'

10
apps/flowgraphs/satnogs_cw_demod.py
View File

@ -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'

10
apps/flowgraphs/satnogs_fm_demod.py
View File

@ -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'

10
apps/flowgraphs/satnogs_generic_iq_receiver.py
View File

@ -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

1
python/dsp_settings.py
View File

@ -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}
}