Commit 01b56db3 authored by Manolis Surligas's avatar Manolis Surligas

Fix inconsistencies between the command line arguments of the flowgraphs

* Set the default USRP RX and TX port to the TX/RX
* All flowgraphs follow the same command line arguments scheme 
parent 13f5cfe4
......@@ -749,7 +749,7 @@ TX sampling rate</value>
</param>
<param>
<key>value</key>
<value>test.wav</value>
<value>test.ogg</value>
</param>
</block>
<block>
......@@ -2865,8 +2865,8 @@ we shift the LO a little further</value>
<value>1</value>
</param>
<param>
<key>pps</key>
<value>8</value>
<key>rps</key>
<value>10</value>
</param>
<param>
<key>samp_rate</key>
......
......@@ -971,7 +971,7 @@ tone. This tone is typically 500-800 Hz.</value>
</param>
<param>
<key>value</key>
<value>test.wav</value>
<value>test.ogg</value>
</param>
</block>
<block>
......@@ -3154,8 +3154,8 @@ we shift the LO a little further</value>
<value>1</value>
</param>
<param>
<key>pps</key>
<value>8</value>
<key>rps</key>
<value>10</value>
</param>
<param>
<key>samp_rate</key>
......
......@@ -178,7 +178,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(805, 985)</value>
<value>(789, 857)</value>
</param>
<param>
<key>_rotation</key>
......@@ -491,7 +491,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(398, 1081)</value>
<value>(382, 953)</value>
</param>
<param>
<key>_rotation</key>
......@@ -534,7 +534,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(311, 1081)</value>
<value>(295, 953)</value>
</param>
<param>
<key>_rotation</key>
......@@ -775,7 +775,7 @@ tone. This tone is typically 500-800 Hz.</value>
</param>
<param>
<key>_coordinate</key>
<value>(704, 1084)</value>
<value>(686, 953)</value>
</param>
<param>
<key>_rotation</key>
......@@ -818,7 +818,7 @@ tone. This tone is typically 500-800 Hz.</value>
</param>
<param>
<key>_coordinate</key>
<value>(63, 1081)</value>
<value>(47, 953)</value>
</param>
<param>
<key>_rotation</key>
......@@ -861,7 +861,7 @@ tone. This tone is typically 500-800 Hz.</value>
</param>
<param>
<key>_coordinate</key>
<value>(64, 984)</value>
<value>(47, 857)</value>
</param>
<param>
<key>_rotation</key>
......@@ -904,7 +904,7 @@ tone. This tone is typically 500-800 Hz.</value>
</param>
<param>
<key>_coordinate</key>
<value>(480, 1084)</value>
<value>(462, 953)</value>
</param>
<param>
<key>_rotation</key>
......@@ -947,7 +947,7 @@ tone. This tone is typically 500-800 Hz.</value>
</param>
<param>
<key>_coordinate</key>
<value>(494, 985)</value>
<value>(478, 857)</value>
</param>
<param>
<key>_rotation</key>
......@@ -971,7 +971,7 @@ tone. This tone is typically 500-800 Hz.</value>
</param>
<param>
<key>value</key>
<value>test.wav</value>
<value>test.ogg</value>
</param>
</block>
<block>
......@@ -1049,7 +1049,7 @@ tone. This tone is typically 500-800 Hz.</value>
</param>
<param>
<key>_coordinate</key>
<value>(231, 1081)</value>
<value>(215, 953)</value>
</param>
<param>
<key>_rotation</key>
......@@ -1092,7 +1092,7 @@ tone. This tone is typically 500-800 Hz.</value>
</param>
<param>
<key>_coordinate</key>
<value>(600, 1084)</value>
<value>(582, 953)</value>
</param>
<param>
<key>_rotation</key>
......@@ -2661,7 +2661,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(726, 985)</value>
<value>(710, 857)</value>
</param>
<param>
<key>_rotation</key>
......@@ -2704,7 +2704,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(159, 1081)</value>
<value>(143, 953)</value>
</param>
<param>
<key>_rotation</key>
......@@ -2747,7 +2747,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(327, 985)</value>
<value>(311, 857)</value>
</param>
<param>
<key>_rotation</key>
......@@ -2790,7 +2790,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(414, 985)</value>
<value>(398, 857)</value>
</param>
<param>
<key>_rotation</key>
......@@ -2833,7 +2833,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(223, 985)</value>
<value>(207, 857)</value>
</param>
<param>
<key>_rotation</key>
......@@ -3154,8 +3154,8 @@ we shift the LO a little further</value>
<value>1</value>
</param>
<param>
<key>pps</key>
<value>8</value>
<key>rps</key>
<value>10</value>
</param>
<param>
<key>samp_rate</key>
......@@ -3178,7 +3178,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(590, 985)</value>
<value>(574, 857)</value>
</param>
<param>
<key>_rotation</key>
......
<?xml version='1.0' encoding='utf-8'?>
<?grc format='1' created='3.7.10'?>
<?grc format='1' created='3.7.11'?>
<flow_graph>
<timestamp>Thu May 5 00:22:45 2016</timestamp>
<block>
......@@ -95,7 +95,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(1069, 865)</value>
<value>(1061, 865)</value>
</param>
<param>
<key>_rotation</key>
......@@ -776,7 +776,7 @@ TX sampling rate</value>
</param>
<param>
<key>value</key>
<value>test.wav</value>
<value>test.ogg</value>
</param>
</block>
<block>
......@@ -2911,8 +2911,8 @@ max_modulation_freq = 3000</value>
<value>1</value>
</param>
<param>
<key>pps</key>
<value>8</value>
<key>rps</key>
<value>10</value>
</param>
<param>
<key>samp_rate</key>
......
This diff is collapsed.
<?xml version='1.0' encoding='utf-8'?>
<?grc format='1' created='3.7.10'?>
<?grc format='1' created='3.7.11'?>
<flow_graph>
<timestamp>Thu May 5 00:22:45 2016</timestamp>
<block>
......@@ -95,7 +95,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(1128, 948)</value>
<value>(574, 801)</value>
</param>
<param>
<key>_rotation</key>
......@@ -122,7 +122,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(960, 884)</value>
<value>(446, 586)</value>
</param>
<param>
<key>_rotation</key>
......@@ -149,7 +149,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(1040, 948)</value>
<value>(95, 809)</value>
</param>
<param>
<key>_rotation</key>
......@@ -176,7 +176,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(960, 948)</value>
<value>(15, 809)</value>
</param>
<param>
<key>_rotation</key>
......@@ -203,7 +203,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(1232, 884)</value>
<value>(734, 746)</value>
</param>
<param>
<key>_rotation</key>
......@@ -230,7 +230,7 @@ SDR received samples</value>
</param>
<param>
<key>_coordinate</key>
<value>(1232, 948)</value>
<value>(191, 809)</value>
</param>
<param>
<key>_rotation</key>
......@@ -258,7 +258,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(960, 756)</value>
<value>(335, 586)</value>
</param>
<param>
<key>_rotation</key>
......@@ -293,7 +293,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(48, 716)</value>
<value>(15, 590)</value>
</param>
<param>
<key>_rotation</key>
......@@ -332,7 +332,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(1080, 876)</value>
<value>(574, 738)</value>
</param>
<param>
<key>_rotation</key>
......@@ -406,7 +406,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(376, 1116)</value>
<value>(247, 905)</value>
</param>
<param>
<key>_rotation</key>
......@@ -430,7 +430,7 @@ TX sampling rate</value>
</param>
<param>
<key>value</key>
<value></value>
<value>satnogs.not_set_antenna</value>
</param>
</block>
<block>
......@@ -449,7 +449,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(224, 1104)</value>
<value>(159, 905)</value>
</param>
<param>
<key>_rotation</key>
......@@ -602,7 +602,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(432, 776)</value>
<value>(183, 586)</value>
</param>
<param>
<key>_rotation</key>
......@@ -645,7 +645,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(744, 992)</value>
<value>(454, 730)</value>
</param>
<param>
<key>_rotation</key>
......@@ -841,7 +841,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(64, 984)</value>
<value>(15, 730)</value>
</param>
<param>
<key>_rotation</key>
......@@ -884,7 +884,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(512, 1112)</value>
<value>(327, 905)</value>
</param>
<param>
<key>_rotation</key>
......@@ -927,7 +927,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(272, 1216)</value>
<value>(151, 985)</value>
</param>
<param>
<key>_rotation</key>
......@@ -1029,7 +1029,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(144, 1104)</value>
<value>(79, 905)</value>
</param>
<param>
<key>_rotation</key>
......@@ -1072,7 +1072,7 @@ TX sampling rate</value>
</param>
<param>
<key>_coordinate</key>
<value>(720, 1112)</value>
<value>(454, 905)</value>
</param>
<param>
<key>_rotation</key>
......@@ -1116,7 +1116,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(432, 1224)</value>
<value>(247, 985)</value>
</param>
<param>
<key>_rotation</key>
......@@ -1226,11 +1226,11 @@ we shift the LO a little further</value>
</param>
<param>
<key>ant0</key>
<value>antenna</value>
<value>satnogs.handle_rx_antenna(rx_sdr_device, antenna)</value>
</param>
<param>
<key>bb_gain0</key>
<value>bb_gain</value>
<value>satnogs.handle_rx_bb_gain(rx_sdr_device, bb_gain)</value>
</param>
<param>
<key>bw0</key>
......@@ -1254,7 +1254,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>if_gain0</key>
<value>if_gain</value>
<value>satnogs.handle_rx_if_gain(rx_sdr_device, if_gain)</value>
</param>
<param>
<key>iq_balance_mode0</key>
......@@ -1262,7 +1262,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>gain0</key>
<value>rf_gain</value>
<value>satnogs.handle_rx_rf_gain(rx_sdr_device, rf_gain)</value>
</param>
<param>
<key>ant10</key>
......@@ -2514,7 +2514,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>args</key>
<value>dev_args</value>
<value>satnogs.handle_rx_dev_args(rx_sdr_device, dev_args)</value>
</param>
<param>
<key>_enabled</key>
......@@ -2522,7 +2522,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(16, 376)</value>
<value>(15, 311)</value>
</param>
<param>
<key>_rotation</key>
......@@ -2641,7 +2641,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(568, 1224)</value>
<value>(454, 985)</value>
</param>
<param>
<key>_rotation</key>
......@@ -2684,7 +2684,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(72, 1104)</value>
<value>(7, 905)</value>
</param>
<param>
<key>_rotation</key>
......@@ -2727,7 +2727,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(600, 984)</value>
<value>(367, 730)</value>
</param>
<param>
<key>_rotation</key>
......@@ -2770,7 +2770,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(464, 992)</value>
<value>(287, 730)</value>
</param>
<param>
<key>_rotation</key>
......@@ -2813,7 +2813,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(312, 984)</value>
<value>(175, 730)</value>
</param>
<param>
<key>_rotation</key>
......@@ -3302,8 +3302,8 @@ we shift the LO a little further</value>
<value>1</value>
</param>
<param>
<key>pps</key>
<value>8</value>
<key>rps</key>
<value>10</value>
</param>
<param>
<key>samp_rate</key>
......@@ -3326,7 +3326,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>_coordinate</key>
<value>(56, 1216)</value>
<value>(7, 985)</value>
</param>
<param>
<key>_rotation</key>
......
......@@ -5,7 +5,7 @@
# Title: APT Generic Demodulation
# Author: Manolis Surligas (surligas@gmail.com)
# Description: A generic APT demodulation block
# Generated: Wed Aug 9 13:40:42 2017
# Generated: Wed Nov 1 13:04:36 2017
##################################################
from gnuradio import analog
......@@ -23,7 +23,7 @@ import time
class satnogs_apt_demod(gr.top_block):
def __init__(self, antenna=satnogs.not_set_antenna, bb_gain=satnogs.not_set_rx_bb_gain, decoded_data_file_path='/tmp/.satnogs/data/data', dev_args=satnogs.not_set_dev_args, doppler_correction_per_sec=20, enable_iq_dump=0, file_path='test.wav', if_gain=satnogs.not_set_rx_if_gain, iq_file_path='/tmp/iq.dat', lo_offset=100e3, ppm=0, rf_gain=satnogs.not_set_rx_rf_gain, rigctl_port=4532, rx_freq=100e6, rx_sdr_device='usrpb200', waterfall_file_path='/tmp/waterfall.dat'):
def __init__(self, antenna=satnogs.not_set_antenna, bb_gain=satnogs.not_set_rx_bb_gain, decoded_data_file_path='/tmp/.satnogs/data/data', dev_args=satnogs.not_set_dev_args, doppler_correction_per_sec=20, enable_iq_dump=0, file_path='test.ogg', if_gain=satnogs.not_set_rx_if_gain, iq_file_path='/tmp/iq.dat', lo_offset=100e3, ppm=0, rf_gain=satnogs.not_set_rx_rf_gain, rigctl_port=4532, rx_freq=100e6, rx_sdr_device='usrpb200', waterfall_file_path='/tmp/waterfall.dat'):
gr.top_block.__init__(self, "APT Generic Demodulation")
##################################################
......@@ -62,7 +62,7 @@ class satnogs_apt_demod(gr.top_block):
##################################################
# Blocks
##################################################
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate*2, 0.0, 8, 1024, waterfall_file_path, 1)
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate*2, 0.0, 10, 1024, waterfall_file_path, 1)
self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000/doppler_correction_per_sec, 1500)
self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0)
self.satnogs_iq_sink_0 = satnogs.iq_sink(32767, iq_file_path, False, enable_iq_dump)
......@@ -289,7 +289,7 @@ def argument_parser():
"", "--enable-iq-dump", dest="enable_iq_dump", type="intx", default=0,
help="Set enable_iq_dump [default=%default]")
parser.add_option(
"", "--file-path", dest="file_path", type="string", default='test.wav',
"", "--file-path", dest="file_path", type="string", default='test.ogg',
help="Set file_path [default=%default]")
parser.add_option(
"", "--if-gain", dest="if_gain", type="eng_float", default=eng_notation.num_to_str(satnogs.not_set_rx_if_gain),
......
......@@ -5,7 +5,7 @@
# Title: BPSK Generic Demodulation
# Author: surligas, cshields, csete
# Description: A generic BPSK demodulation block
# Generated: Wed Aug 9 13:40:52 2017
# Generated: Wed Nov 1 14:52:53 2017
##################################################
from gnuradio import analog
......@@ -23,7 +23,7 @@ import time
class satnogs_bpsk_demod(gr.top_block):
def __init__(self, antenna=satnogs.not_set_antenna, bb_gain=satnogs.not_set_rx_bb_gain, cw_offset=1500, decoded_data_file_path='/tmp/.satnogs/data/data', dev_args=satnogs.not_set_dev_args, doppler_correction_per_sec=20, enable_iq_dump=0, file_path='test.wav', if_gain=satnogs.not_set_rx_if_gain, iq_file_path='/tmp/iq.dat', lo_offset=100e3, ppm=0, rf_gain=satnogs.not_set_rx_rf_gain, rigctl_port=4532, rx_freq=100e6, rx_sdr_device='usrpb200', waterfall_file_path='/tmp/waterfall.dat'):
def __init__(self, antenna=satnogs.not_set_antenna, bb_gain=satnogs.not_set_rx_bb_gain, cw_offset=1500, decoded_data_file_path='/tmp/.satnogs/data/data', dev_args=satnogs.not_set_dev_args, doppler_correction_per_sec=20, enable_iq_dump=0, file_path='test.ogg', if_gain=satnogs.not_set_rx_if_gain, iq_file_path='/tmp/iq.dat', lo_offset=100e3, ppm=0, rf_gain=satnogs.not_set_rx_rf_gain, rigctl_port=4532, rx_freq=100e6, rx_sdr_device='usrpb200', waterfall_file_path='/tmp/waterfall.dat'):
gr.top_block.__init__(self, "BPSK Generic Demodulation")
##################################################
......@@ -63,7 +63,7 @@ class satnogs_bpsk_demod(gr.top_block):
##################################################
# Blocks
##################################################
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 8, 1024, waterfall_file_path, 1)
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 10, 1024, waterfall_file_path, 1)
self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000/doppler_correction_per_sec, 1500)
self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0)
self.satnogs_iq_sink_0 = satnogs.iq_sink(32767, iq_file_path, False, enable_iq_dump)
......@@ -304,7 +304,7 @@ def argument_parser():
"", "--enable-iq-dump", dest="enable_iq_dump", type="intx", default=0,
help="Set enable_iq_dump [default=%default]")
parser.add_option(
"", "--file-path", dest="file_path", type="string", default='test.wav',
"", "--file-path", dest="file_path", type="string", default='test.ogg',
help="Set file_path [default=%default]")
parser.add_option(
"", "--if-gain", dest="if_gain", type="eng_float", default=eng_notation.num_to_str(satnogs.not_set_rx_if_gain),
......
......@@ -5,7 +5,7 @@
# Title: FM Generic Demodulation
# Author: surligas, cshields, csete
# Description: A generic CW demodulation block
# Generated: Wed Aug 9 13:41:00 2017
# Generated: Wed Nov 1 13:13:56 2017
##################################################
from gnuradio import analog
......@@ -23,7 +23,7 @@ import time
class satnogs_cw_demod(gr.top_block):
def __init__(self, antenna=satnogs.not_set_antenna, bb_gain=satnogs.not_set_rx_bb_gain, cw_offset=700, decoded_data_file_path='/tmp/.satnogs/data/data', dev_args=satnogs.not_set_dev_args, doppler_correction_per_sec=20, enable_iq_dump=0, file_path='test.wav', if_gain=satnogs.not_set_rx_if_gain, iq_file_path='/tmp/iq.dat', lo_offset=100e3, ppm=0, rf_gain=satnogs.not_set_rx_rf_gain, rigctl_port=4532, rx_freq=100e6, rx_sdr_device='usrpb200', waterfall_file_path='/tmp/waterfall.dat'):
def __init__(self, antenna=satnogs.not_set_antenna, bb_gain=satnogs.not_set_rx_bb_gain, cw_offset=700, decoded_data_file_path='/tmp/.satnogs/data/data', dev_args=satnogs.not_set_dev_args, doppler_correction_per_sec=20, enable_iq_dump=0, file_path='test.ogg', if_gain=satnogs.not_set_rx_if_gain, iq_file_path='/tmp/iq.dat', lo_offset=100e3, ppm=0, rf_gain=satnogs.not_set_rx_rf_gain, rigctl_port=4532, rx_freq=100e6, rx_sdr_device='usrpb200', waterfall_file_path='/tmp/waterfall.dat'):
gr.top_block.__init__(self, "FM Generic Demodulation")
##################################################
......@@ -63,7 +63,7 @@ class satnogs_cw_demod(gr.top_block):
##################################################
# Blocks
##################################################
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 8, 1024, waterfall_file_path, 1)
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 10, 1024, waterfall_file_path, 1)
self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000/doppler_correction_per_sec, 1500)
self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0)
self.satnogs_iq_sink_0 = satnogs.iq_sink(32767, iq_file_path, False, enable_iq_dump)
......@@ -304,7 +304,7 @@ def argument_parser():
"", "--enable-iq-dump", dest="enable_iq_dump", type="intx", default=0,
help="Set enable_iq_dump [default=%default]")
parser.add_option(
"", "--file-path", dest="file_path", type="string", default='test.wav',
"", "--file-path", dest="file_path", type="string", default='test.ogg',
help="Set file_path [default=%default]")
parser.add_option(
"", "--if-gain", dest="if_gain", type="eng_float", default=eng_notation.num_to_str(satnogs.not_set_rx_if_gain),
......
......@@ -5,7 +5,7 @@
# Title: FM Generic Demodulation
# Author: Manolis Surligas (surligas@gmail.com)
# Description: A generic FM demodulation block
# Generated: Thu Sep 21 10:50:12 2017
# Generated: Wed Nov 1 13:04:41 2017
##################################################
from gnuradio import analog
......@@ -23,7 +23,7 @@ import time
class satnogs_fm_demod(gr.top_block):
def __init__(self, antenna=satnogs.not_set_antenna, bb_gain=satnogs.not_set_rx_bb_gain, decoded_data_file_path='/tmp/.satnogs/data/data', dev_args=satnogs.not_set_dev_args, doppler_correction_per_sec=20, enable_iq_dump=0, file_path='test.wav', if_gain=satnogs.not_set_rx_if_gain, iq_file_path='/tmp/iq.dat', lo_offset=100e3, ppm=0, rf_gain=satnogs.not_set_rx_rf_gain, rigctl_port=4532, rx_freq=100e6, rx_sdr_device='usrpb200', waterfall_file_path='/tmp/waterfall.dat'):
def __init__(self, antenna=satnogs.not_set_antenna, bb_gain=satnogs.not_set_rx_bb_gain, decoded_data_file_path='/tmp/.satnogs/data/data', dev_args=satnogs.not_set_dev_args, doppler_correction_per_sec=20, enable_iq_dump=0, file_path='test.ogg', if_gain=satnogs.not_set_rx_if_gain, iq_file_path='/tmp/iq.dat', lo_offset=100e3, ppm=0, rf_gain=satnogs.not_set_rx_rf_gain, rigctl_port=4532, rx_freq=100e6, rx_sdr_device='usrpb200', waterfall_file_path='/tmp/waterfall.dat'):
gr.top_block.__init__(self, "FM Generic Demodulation")
##################################################
......@@ -51,9 +51,9 @@ class satnogs_fm_demod(gr.top_block):
##################################################
self.samp_rate_rx = samp_rate_rx = satnogs.hw_rx_settings[rx_sdr_device]['samp_rate']
self.xlate_filter_taps = xlate_filter_taps = firdes.low_pass(1, samp_rate_rx, 125000, 25000, firdes.WIN_HAMMING, 6.76)
self.taps = taps = firdes.low_pass(12.0, samp_rate_rx, 100e3, 60000, firdes.WIN_HAMMING, 6.76)
self.max_modulation_freq = max_modulation_freq = 3000
self.filter_rate = filter_rate = 250000
self.deviation = deviation = 5000
......@@ -63,7 +63,7 @@ class satnogs_fm_demod(gr.top_block):
##################################################
# Blocks
##################################################
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 8, 1024, waterfall_file_path, 1)
self.satnogs_waterfall_sink_0 = satnogs.waterfall_sink(audio_samp_rate, 0.0, 10, 1024, waterfall_file_path, 1)
self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000/doppler_correction_per_sec, 1500)
self.satnogs_ogg_encoder_0 = satnogs.ogg_encoder(file_path, audio_samp_rate, 1.0)
self.satnogs_iq_sink_0 = satnogs.iq_sink(32767, iq_file_path, False, enable_iq_dump)
......@@ -80,7 +80,7 @@ class satnogs_fm_demod(gr.top_block):
self.osmosdr_source_0.set_bb_gain(satnogs.handle_rx_bb_gain(rx_sdr_device, bb_gain), 0)
self.osmosdr_source_0.set_antenna(satnogs.handle_rx_antenna(rx_sdr_device, antenna), 0)
self.osmosdr_source_0.set_bandwidth(samp_rate_rx, 0)
self.low_pass_filter_0 = filter.fir_filter_ccf(1, firdes.low_pass(
1, audio_samp_rate, deviation+max_modulation_freq, 3000, firdes.WIN_HAMMING, 6.76))
self.freq_xlating_fir_filter_xxx_0 = filter.freq_xlating_fir_filter_ccc(int(samp_rate_rx/filter_rate), (xlate_filter_taps), lo_offset, samp_rate_rx)
......@@ -95,15 +95,15 @@ class satnogs_fm_demod(gr.top_block):
##################################################
# Connections
##################################################
self.msg_connect((self.satnogs_tcp_rigctl_msg_source_0, 'freq'), (self.satnogs_coarse_doppler_correction_cc_0, 'freq'))
self.connect((self.analog_quadrature_demod_cf_0, 0), (self.satnogs_ogg_encoder_0, 0))
self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.low_pass_filter_0, 0))
self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.satnogs_iq_sink_0, 0))
self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.satnogs_waterfall_sink_0, 0))
self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.blks2_rational_resampler_xxx_1, 0))
self.connect((self.low_pass_filter_0, 0), (self.analog_quadrature_demod_cf_0, 0))
self.connect((self.osmosdr_source_0, 0), (self.satnogs_coarse_doppler_correction_cc_0, 0))
self.connect((self.satnogs_coarse_doppler_correction_cc_0, 0), (self.freq_xlating_fir_filter_xxx_0, 0))
self.msg_connect((self.satnogs_tcp_rigctl_msg_source_0, 'freq'), (self.satnogs_coarse_doppler_correction_cc_0, 'freq'))
self.connect((self.analog_quadrature_demod_cf_0, 0), (self.satnogs_ogg_encoder_0, 0))
self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.low_pass_filter_0, 0))
self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.satnogs_iq_sink_0, 0))
self.connect((self.blks2_rational_resampler_xxx_1, 0), (self.satnogs_waterfall_sink_0, 0))
self.connect((self.freq_xlating_fir_filter_xxx_0, 0), (self.blks2_rational_resampler_xxx_1, 0))
self.connect((self.low_pass_filter_0, 0), (self.analog_quadrature_demod_cf_0, 0))
self.connect((self.osmosdr_source_0, 0), (self.satnogs_coarse_doppler_correction_cc_0, 0))
self.connect((self.satnogs_coarse_doppler_correction_cc_0, 0), (self.freq_xlating_fir_filter_xxx_0, 0))
def get_antenna(self):
return self.antenna
......@@ -296,7 +296,7 @@ def argument_parser():
"", "--enable-iq-dump", dest="enable_iq_dump", type="intx", default=0,
help="Set enable_iq_dump [default=%default]")
parser.add_option(
"", "--file-path", dest="file_path", type="string", default='test.wav',
"", "--file-path", dest="file_path", type="string", default='test.ogg',
help="Set file_path [default=%default]")
parser.add_option(
"", "--if-gain", dest="if_gain", type="eng_float", default=eng_notation.num_to_str(satnogs.not_set_rx_if_gain),
......
This diff is collapsed.
......@@ -36,10 +36,10 @@ hw_tx_settings = {'usrpb200' : {'rf_gain' : 60.0, 'if_gain' : 0.0,
hw_rx_settings = {'usrpb200' : {'rf_gain' : 50.0, 'if_gain' : 0.0,
'bb_gain' : 0.0, 'samp_rate' : 5e5,
'antenna' : 'RX2', 'dev_arg': 'uhd'},
'antenna' : 'TX/RX', 'dev_arg': 'uhd'},
'usrp2' : {'rf_gain' : 50.0, 'if_gain' : 0.0,
'bb_gain' : 0.0, 'samp_rate' : 5e5,
'antenna' : 'RX2', 'dev_arg': 'uhd'},
'antenna' : 'TX/RX', 'dev_arg': 'uhd'},
'airspy' : {'rf_gain' : 30.0, 'if_gain' : 0.0,
'bb_gain' : 0.0, 'samp_rate' : 10e6,
'antenna' : '', 'dev_arg': 'airspy'},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment