Commit ddabee58 authored by Manolis Surligas's avatar Manolis Surligas

Increase the doppler frequency correction update rate

* Default frequency update intervals: 50ms
* Fix issue ignoring the doppler_correction_per_sec parameter
parent 3dec97fb
......@@ -620,7 +620,7 @@ TX sampling rate</value>
</param>
<param>
<key>value</key>
<value>1000</value>
<value>20</value>
</param>
</block>
<block>
......@@ -2639,7 +2639,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>interval</key>
<value>1000</value>
<value>1000/doppler_correction_per_sec</value>
</param>
</block>
<block>
......
......@@ -842,7 +842,7 @@ tone. This tone is typically 500-800 Hz.</value>
</param>
<param>
<key>value</key>
<value>1000</value>
<value>20</value>
</param>
</block>
<block>
......@@ -2928,7 +2928,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>interval</key>
<value>1000</value>
<value>1000/doppler_correction_per_sec</value>
</param>
</block>
<block>
......
......@@ -842,7 +842,7 @@ tone. This tone is typically 500-800 Hz.</value>
</param>
<param>
<key>value</key>
<value>1000</value>
<value>20</value>
</param>
</block>
<block>
......@@ -2928,7 +2928,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>interval</key>
<value>1000</value>
<value>1000/doppler_correction_per_sec</value>
</param>
</block>
<block>
......
......@@ -620,7 +620,7 @@ TX sampling rate</value>
</param>
<param>
<key>value</key>
<value>1000</value>
<value>20</value>
</param>
</block>
<block>
......@@ -2580,7 +2580,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>interval</key>
<value>1000</value>
<value>1000/doppler_correction_per_sec</value>
</param>
</block>
<block>
......
......@@ -629,7 +629,7 @@ TX sampling rate</value>
</param>
<param>
<key>value</key>
<value>1000</value>
<value>20</value>
</param>
</block>
<block>
......@@ -2845,7 +2845,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>interval</key>
<value>1000</value>
<value>1000/doppler_correction_per_sec</value>
</param>
</block>
<connection>
......
<?xml version='1.0' encoding='utf-8'?>
<?grc format='1' created='3.7.10'?>
<?grc format='1' created='3.7.11'?>
<flow_graph>
<timestamp>Mon Apr 10 23:26:02 2017</timestamp>
<block>
......@@ -627,7 +627,7 @@ TX sampling rate</value>
</param>
<param>
<key>value</key>
<value>1000</value>
<value>20</value>
</param>
</block>
<block>
......@@ -783,49 +783,6 @@ TX sampling rate</value>
<value>fff</value>
</param>
</block>
<block>
<key>parameter</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(504, 724)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>flip_images</value>
</param>
<param>
<key>label</key>
<value></value>
</param>
<param>
<key>short_id</key>
<value></value>
</param>
<param>
<key>type</key>
<value>intx</value>
</param>
<param>
<key>value</key>
<value>0</value>
</param>
</block>
<block>
<key>freq_xlating_fir_filter_xxx</key>
<param>
......@@ -2932,7 +2889,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>flip</key>
<value>bool(flip_images)</value>
<value>False</value>
</param>
<param>
<key>_coordinate</key>
......@@ -2960,11 +2917,11 @@ we shift the LO a little further</value>
</param>
<param>
<key>split</key>
<value>bool(split_images)</value>
<value>True</value>
</param>
<param>
<key>sync</key>
<value>bool(sync)</value>
<value>False</value>
</param>
</block>
<block>
......@@ -3066,7 +3023,7 @@ we shift the LO a little further</value>
</param>
<param>
<key>interval</key>
<value>1000</value>
<value>1000/doppler_correction_per_sec</value>
</param>
</block>
<block>
......@@ -3124,92 +3081,6 @@ we shift the LO a little further</value>
<value>samp_rate_rx/ ( first_stage_decimation * int(samp_rate_rx/ first_stage_decimation / initial_bandwidth))</value>
</param>
</block>
<block>
<key>parameter</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(320, 724)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>split_images</value>
</param>
<param>
<key>label</key>
<value></value>
</param>
<param>
<key>short_id</key>
<value></value>
</param>
<param>
<key>type</key>
<value>intx</value>
</param>
<param>
<key>value</key>
<value>0</value>
</param>
</block>
<block>
<key>parameter</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(424, 724)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>sync</value>
</param>
<param>
<key>label</key>
<value></value>
</param>
<param>
<key>short_id</key>
<value></value>
</param>
<param>
<key>type</key>
<value>intx</value>
</param>
<param>
<key>value</key>
<value>0</value>
</param>
</block>
<block>
<key>parameter</key>
<param>
......
This diff is collapsed.
This diff is collapsed.
......@@ -5,7 +5,7 @@
# Title: FM Generic Demodulation
# Author: Manolis Surligas (surligas@gmail.com)
# Description: A generic FM demodulation block
# Generated: Thu Jul 20 22:29:23 2017
# Generated: Tue Jul 25 21:49:05 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, dev_args=satnogs.not_set_dev_args, doppler_correction_per_sec=1000, file_path='test.wav', if_gain=satnogs.not_set_rx_if_gain, 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, dev_args=satnogs.not_set_dev_args, doppler_correction_per_sec=20, file_path='test.wav', if_gain=satnogs.not_set_rx_if_gain, 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")
##################################################
......@@ -60,7 +60,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_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500)
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_coarse_doppler_correction_cc_0 = satnogs.coarse_doppler_correction_cc(rx_freq, samp_rate_rx)
self.osmosdr_source_0 = osmosdr.source( args="numchan=" + str(1) + " " + satnogs.handle_rx_dev_args(rx_sdr_device, dev_args) )
......@@ -251,7 +251,7 @@ def argument_parser():
"", "--dev-args", dest="dev_args", type="string", default=satnogs.not_set_dev_args,
help="Set dev_args [default=%default]")
parser.add_option(
"", "--doppler-correction-per-sec", dest="doppler_correction_per_sec", type="intx", default=1000,
"", "--doppler-correction-per-sec", dest="doppler_correction_per_sec", type="intx", default=20,
help="Set doppler_correction_per_sec [default=%default]")
parser.add_option(
"", "--file-path", dest="file_path", type="string", default='test.wav',
......
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