From 735eaec9c601c4a68e2f0f34a91ca43ee2dc43ad Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 27 Oct 2011 13:55:16 -0700 Subject: noaa: updated applications to use gr-uhd Note: LRIT related files were removed; these were never finished --- gr-noaa/apps/CMakeLists.txt | 2 - gr-noaa/apps/Makefile.am | 8 +- gr-noaa/apps/file_rx_hrpt.grc | 755 +++++---------- gr-noaa/apps/file_rx_hrpt.py | 334 +++---- gr-noaa/apps/file_rx_lrit.grc | 1372 -------------------------- gr-noaa/apps/file_rx_lrit.py | 337 ------- gr-noaa/apps/hrpt_demod.grc | 310 +++--- gr-noaa/apps/hrpt_demod.py | 76 +- gr-noaa/apps/usrp_rx_hrpt.grc | 1419 ++++++++++++++++++--------- gr-noaa/apps/usrp_rx_hrpt.py | 401 ++++---- gr-noaa/apps/usrp_rx_hrpt_nogui.grc | 1035 +++++++++++++++----- gr-noaa/apps/usrp_rx_hrpt_nogui.py | 217 +++-- gr-noaa/apps/usrp_rx_lrit.grc | 1825 ----------------------------------- gr-noaa/apps/usrp_rx_lrit.py | 523 ---------- 14 files changed, 2682 insertions(+), 5932 deletions(-) delete mode 100644 gr-noaa/apps/file_rx_lrit.grc delete mode 100755 gr-noaa/apps/file_rx_lrit.py delete mode 100644 gr-noaa/apps/usrp_rx_lrit.grc delete mode 100755 gr-noaa/apps/usrp_rx_lrit.py (limited to 'gr-noaa') diff --git a/gr-noaa/apps/CMakeLists.txt b/gr-noaa/apps/CMakeLists.txt index 37d07ffa0..233f0ee5f 100644 --- a/gr-noaa/apps/CMakeLists.txt +++ b/gr-noaa/apps/CMakeLists.txt @@ -24,10 +24,8 @@ GR_PYTHON_INSTALL( hrpt_decode.py hrpt_demod.py file_rx_hrpt.py - file_rx_lrit.py usrp_rx_hrpt.py usrp_rx_hrpt_nogui.py - usrp_rx_lrit.py DESTINATION ${GR_RUNTIME_DIR} COMPONENT "noaa_python" ) diff --git a/gr-noaa/apps/Makefile.am b/gr-noaa/apps/Makefile.am index b760e52b4..c60c8c137 100644 --- a/gr-noaa/apps/Makefile.am +++ b/gr-noaa/apps/Makefile.am @@ -27,17 +27,13 @@ dist_bin_SCRIPTS = \ hrpt_decode.py \ hrpt_demod.py \ file_rx_hrpt.py \ - file_rx_lrit.py \ usrp_rx_hrpt.py \ - usrp_rx_hrpt_nogui.py \ - usrp_rx_lrit.py + usrp_rx_hrpt_nogui.py EXTRA_DIST += \ hrpt_decode.grc \ hrpt_demod.grc \ file_rx_hrpt.grc \ - file_rx_lrit.grc \ usrp_rx_hrpt.grc \ - usrp_rx_hrpt_nogui.grc \ - usrp_rx_lrit.grc + usrp_rx_hrpt_nogui.grc endif diff --git a/gr-noaa/apps/file_rx_hrpt.grc b/gr-noaa/apps/file_rx_hrpt.grc index e3cccd393..4097e83d3 100644 --- a/gr-noaa/apps/file_rx_hrpt.grc +++ b/gr-noaa/apps/file_rx_hrpt.grc @@ -1,55 +1,23 @@ - Mon Nov 9 07:47:17 2009 + Thu Oct 27 13:48:25 2011 - options + variable id - file_rx_hrpt + max_carrier_offset _enabled True - title - USRP HRPT Receiver - - - author - - - - description - - - - window_size - 4096,4096 - - - generate_options - wx_gui - - - category - Custom - - - run_options - run - - - run - True - - - realtime_scheduling - + value + 2*math.pi*100e3/sample_rate _coordinate - (10, 10) + (575, 19) _rotation @@ -106,7 +74,7 @@ variable id - sample_rate + hs _enabled @@ -114,11 +82,11 @@ value - 64e6/decim + int(sps/2.0) _coordinate - (198, 17) + (499, 19) _rotation @@ -126,22 +94,22 @@ - virtual_source + variable id - virtual_source_0 + max_clock_offset _enabled True - stream_id - baseband + value + 100e-6 _coordinate - (173, 971) + (705, 19) _rotation @@ -149,77 +117,79 @@ - wxgui_scopesink2 + import id - demod_scope + import_0 _enabled True - type - float - - - title - Post-Demod + import + import math, os - samp_rate - sym_rate*2.0 + _coordinate + (9, 106) - v_scale - 0.5 + _rotation + 0 + + + variable - v_offset - 0 + id + config_filename - t_scale - 10.0/sym_rate + _enabled + True - ac_couple - False + value + os.environ['HOME']+'/.gnuradio/config.conf' - xy_mode - False + _coordinate + (13, 168) - num_inputs - 1 + _rotation + 0 + + + variable - win_size - + id + sample_rate - grid_pos - 0, 0, 1, 1 + _enabled + True - notebook - displays, 1 + value + 4e6 _coordinate - (666, 542) + (198, 17) _rotation - 180 + 0 - gr_clock_recovery_mm_xx + digital_clock_recovery_mm_xx id - gr_clock_recovery_mm_xx_0 + digital_clock_recovery_mm_xx_0 _enabled @@ -251,7 +221,7 @@ _coordinate - (873, 696) + (897, 341) _rotation @@ -259,34 +229,22 @@ - gr_moving_average_xx + virtual_sink id - gr_moving_average_xx_0 + virtual_sink_0 _enabled True - type - float - - - length - hs - - - scale - 1.0/hs - - - max_iter - 4000 + stream_id + baseband _coordinate - (682, 713) + (1139, 373) _rotation @@ -317,7 +275,7 @@ _coordinate - (469, 713) + (470, 357) _rotation @@ -325,22 +283,34 @@ - virtual_sink + gr_moving_average_xx id - virtual_sink_0 + gr_moving_average_xx_0 _enabled True - stream_id - baseband + type + float + + + length + hs + + + scale + 1.0/hs + + + max_iter + 4000 _coordinate - (1142, 728) + (683, 357) _rotation @@ -348,22 +318,34 @@ - variable + gr_file_sink id - config_filename + frame_sink _enabled True - value - os.environ['HOME']+'/.gnuradio/config.conf' + file + output_filename + + + type + short + + + vlen + 1 + + + unbuffered + False _coordinate - (13, 159) + (809, 595) _rotation @@ -371,22 +353,26 @@ - import + noaa_hrpt_decoder id - import_0 + decoder _enabled True - import - import math, os + verbose + True + + + output + True _coordinate - (11, 110) + (810, 496) _rotation @@ -425,7 +411,7 @@ _coordinate - (301, 705) + (302, 349) _rotation @@ -444,7 +430,7 @@ _coordinate - (73, 733) + (92, 377) _rotation @@ -452,26 +438,22 @@ - gr_file_source + gr_throttle id - gr_file_source_0 + throttle _enabled True - - file - input_filename - type short - repeat - False + samples_per_second + 2*sample_rate vlen @@ -479,42 +461,42 @@ _coordinate - (76, 613) + (94, 323) _rotation - 0 + 180 - notebook + gr_file_source id - displays + gr_file_source_0 _enabled True - style - wx.NB_TOP + file + input_filename - labels - ['Spectrum','Demod'] + type + short - grid_pos - 1,0,1,2 + repeat + False - notebook - + vlen + 1 _coordinate - (12, 249) + (95, 257) _rotation @@ -522,86 +504,85 @@ - wxgui_fftsink2 + variable_config id - rx_fft + freq _enabled True - type - complex - - - title - RX Spectrum + value + 1698e6 - samp_rate - sample_rate + type + real - baseband_freq - 0 + config_file + config_filename - y_per_div - 5 + section + 'usrp_rx_hrpt' - y_divs - 8 + option + 'freq' - ref_level - -5 + writeback + freq - ref_scale - 2.0 + _coordinate + (218, 104) - fft_size - 1024 + _rotation + 0 + + + variable_config - fft_rate - 15 + id + gain - peak_hold - False + _enabled + True - average - True + value + 35 - avg_alpha - 0.1 + type + real - win - None + config_file + config_filename - win_size - 640, 360 + section + 'usrp_rx_hrpt' - grid_pos - 0, 0, 1, 1 + option + 'gain' - notebook - displays, 0 + writeback + gain _coordinate - (471, 450) + (375, 105) _rotation @@ -609,84 +590,42 @@ - gr_binary_slicer_fb + variable_config id - gr_binary_slicer_fb_0 + pll_alpha _enabled True - _coordinate - (393, 975) + value + 0.01 - _rotation - 0 + type + real - - - gr_throttle - id - throttle + config_file + config_filename - _enabled - True + section + 'usrp_rx_hrpt' - type - short + option + 'pll_alpha' - samples_per_second - 2*sample_rate - - - vlen - 1 - - - _coordinate - (75, 679) - - - _rotation - 180 - - - - parameter - - id - input_filename - - - _enabled - True - - - label - input_filename - - - value - usrp.dat - - - type - string - - - short_id - F + writeback + pll_alpha _coordinate - (196, 98) + (534, 104) _rotation @@ -694,213 +633,42 @@ - parameter + variable_config id - decim + clock_alpha _enabled True - - label - decim - value - 32 + 0.01 type - intx - - - short_id - d - - - _coordinate - (307, 98) - - - _rotation - 0 - - - - variable_slider - - id - pll_alpha - - - _enabled - True - - - label - PLL Alpha - - - value - saved_pll_alpha - - - min - 0.0 - - - max - 0.5 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - 0, 0, 1, 1 + real - notebook - + config_file + config_filename - _coordinate - (397, 98) + section + 'usrp_rx_hrpt' - _rotation - 0 + option + 'clock_alpha' - - - variable_slider - id + writeback clock_alpha - - _enabled - True - - - label - Clock Alpha - - - value - saved_clock_alpha - - - min - 0.0 - - - max - 0.5 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - 0, 1, 1, 1 - - - notebook - - - - _coordinate - (540, 98) - - - _rotation - 0 - - - - variable - - id - hs - - - _enabled - True - - - value - int(sps/2.0) - - - _coordinate - (499, 19) - - - _rotation - 0 - - - - variable - - id - max_carrier_offset - - - _enabled - True - - - value - 2*math.pi*100e3/sample_rate - - - _coordinate - (575, 19) - - - _rotation - 0 - - - - variable - - id - max_clock_offset - - - _enabled - True - - - value - 100e-6 - _coordinate - (705, 19) + (692, 104) _rotation @@ -943,7 +711,7 @@ _coordinate - (521, 254) + (850, 105) _rotation @@ -951,42 +719,18 @@ - variable_config + noaa_hrpt_deframer id - saved_pll_alpha + deframer _enabled True - - value - 0.01 - - - type - real - - - config_file - config_filename - - - section - 'usrp_rx_hrpt' - - - option - 'pll_alpha' - - - writeback - pll_alpha - _coordinate - (195, 253) + (598, 546) _rotation @@ -994,42 +738,22 @@ - variable_config + virtual_source id - saved_clock_alpha + virtual_source_0 _enabled True - value - 0.01 - - - type - real - - - config_file - config_filename - - - section - 'usrp_rx_hrpt' - - - option - 'clock_alpha' - - - writeback - clock_alpha + stream_id + baseband _coordinate - (360, 255) + (90, 542) _rotation @@ -1037,10 +761,10 @@ - noaa_hrpt_deframer + digital_binary_slicer_fb id - deframer + digital_binary_slicer_fb_0 _enabled @@ -1048,7 +772,7 @@ _coordinate - (579, 975) + (332, 546) _rotation @@ -1056,57 +780,54 @@ - noaa_hrpt_decoder + options id - decoder + file_rx_hrpt _enabled True - verbose - True + title + USRP HRPT Receiver - output - False + author + - _coordinate - (849, 925) + description + - _rotation - 0 + window_size + 4096,4096 - - - gr_file_sink - id - frame_sink + generate_options + no_gui - _enabled - True + category + Custom - file - output_filename + run_options + prompt - type - short + run + True - vlen - 1 + realtime_scheduling + _coordinate - (848, 1007) + (10, 10) _rotation @@ -1114,38 +835,14 @@ - virtual_source_0 - gr_binary_slicer_fb_0 - 0 - 0 - - - deframer - frame_sink - 0 - 0 - - - deframer - decoder - 0 - 0 - - - gr_clock_recovery_mm_xx_0 + digital_clock_recovery_mm_xx_0 virtual_sink_0 0 0 - - gr_clock_recovery_mm_xx_0 - demod_scope - 0 - 0 - gr_moving_average_xx_0 - gr_clock_recovery_mm_xx_0 + digital_clock_recovery_mm_xx_0 0 0 @@ -1162,8 +859,14 @@ 0 - agc - rx_fft + deframer + decoder + 0 + 0 + + + deframer + frame_sink 0 0 @@ -1186,7 +889,13 @@ 0 - gr_binary_slicer_fb_0 + virtual_source_0 + digital_binary_slicer_fb_0 + 0 + 0 + + + digital_binary_slicer_fb_0 deframer 0 0 diff --git a/gr-noaa/apps/file_rx_hrpt.py b/gr-noaa/apps/file_rx_hrpt.py index 13b887635..fcd1832f6 100755 --- a/gr-noaa/apps/file_rx_hrpt.py +++ b/gr-noaa/apps/file_rx_hrpt.py @@ -2,53 +2,36 @@ ################################################## # Gnuradio Python Flow Graph # Title: USRP HRPT Receiver -# Generated: Mon Nov 9 07:47:17 2009 +# Generated: Thu Oct 27 13:48:25 2011 ################################################## +from gnuradio import digital from gnuradio import eng_notation from gnuradio import gr from gnuradio import noaa -from gnuradio import window from gnuradio.eng_option import eng_option from gnuradio.gr import firdes -from gnuradio.wxgui import fftsink2 -from gnuradio.wxgui import forms -from gnuradio.wxgui import scopesink2 -from grc_gnuradio import wxgui as grc_wxgui from optparse import OptionParser import ConfigParser import math, os -import wx -class file_rx_hrpt(grc_wxgui.top_block_gui): +class file_rx_hrpt(gr.top_block): - def __init__(self, input_filename="usrp.dat", decim=32): - grc_wxgui.top_block_gui.__init__(self, title="USRP HRPT Receiver") - - ################################################## - # Parameters - ################################################## - self.input_filename = input_filename - self.decim = decim + def __init__(self): + gr.top_block.__init__(self, "USRP HRPT Receiver") ################################################## # Variables ################################################## self.sym_rate = sym_rate = 600*1109 - self.sample_rate = sample_rate = 64e6/decim - self.config_filename = config_filename = os.environ['HOME']+'/.gnuradio/config.conf' + self.sample_rate = sample_rate = 4e6 self.sps = sps = sample_rate/sym_rate - self._saved_pll_alpha_config = ConfigParser.ConfigParser() - self._saved_pll_alpha_config.read(config_filename) - try: saved_pll_alpha = self._saved_pll_alpha_config.getfloat('usrp_rx_hrpt', 'pll_alpha') - except: saved_pll_alpha = 0.01 - self.saved_pll_alpha = saved_pll_alpha - self._saved_clock_alpha_config = ConfigParser.ConfigParser() - self._saved_clock_alpha_config.read(config_filename) - try: saved_clock_alpha = self._saved_clock_alpha_config.getfloat('usrp_rx_hrpt', 'clock_alpha') - except: saved_clock_alpha = 0.01 - self.saved_clock_alpha = saved_clock_alpha - self.pll_alpha = pll_alpha = saved_pll_alpha + self.config_filename = config_filename = os.environ['HOME']+'/.gnuradio/config.conf' + self._pll_alpha_config = ConfigParser.ConfigParser() + self._pll_alpha_config.read(config_filename) + try: pll_alpha = self._pll_alpha_config.getfloat('usrp_rx_hrpt', 'pll_alpha') + except: pll_alpha = 0.01 + self.pll_alpha = pll_alpha self._output_filename_config = ConfigParser.ConfigParser() self._output_filename_config.read(config_filename) try: output_filename = self._output_filename_config.get('usrp_rx_hrpt', 'filename') @@ -57,190 +40,127 @@ class file_rx_hrpt(grc_wxgui.top_block_gui): self.max_clock_offset = max_clock_offset = 100e-6 self.max_carrier_offset = max_carrier_offset = 2*math.pi*100e3/sample_rate self.hs = hs = int(sps/2.0) - self.clock_alpha = clock_alpha = saved_clock_alpha - - ################################################## - # Notebooks - ################################################## - self.displays = wx.Notebook(self.GetWin(), style=wx.NB_TOP) - self.displays.AddPage(grc_wxgui.Panel(self.displays), "Spectrum") - self.displays.AddPage(grc_wxgui.Panel(self.displays), "Demod") - self.GridAdd(self.displays, 1, 0, 1, 2) - - ################################################## - # Controls - ################################################## - _pll_alpha_sizer = wx.BoxSizer(wx.VERTICAL) - self._pll_alpha_text_box = forms.text_box( - parent=self.GetWin(), - sizer=_pll_alpha_sizer, - value=self.pll_alpha, - callback=self.set_pll_alpha, - label="PLL Alpha", - converter=forms.float_converter(), - proportion=0, - ) - self._pll_alpha_slider = forms.slider( - parent=self.GetWin(), - sizer=_pll_alpha_sizer, - value=self.pll_alpha, - callback=self.set_pll_alpha, - minimum=0.0, - maximum=0.5, - num_steps=100, - style=wx.SL_HORIZONTAL, - cast=float, - proportion=1, - ) - self.GridAdd(_pll_alpha_sizer, 0, 0, 1, 1) - _clock_alpha_sizer = wx.BoxSizer(wx.VERTICAL) - self._clock_alpha_text_box = forms.text_box( - parent=self.GetWin(), - sizer=_clock_alpha_sizer, - value=self.clock_alpha, - callback=self.set_clock_alpha, - label="Clock Alpha", - converter=forms.float_converter(), - proportion=0, - ) - self._clock_alpha_slider = forms.slider( - parent=self.GetWin(), - sizer=_clock_alpha_sizer, - value=self.clock_alpha, - callback=self.set_clock_alpha, - minimum=0.0, - maximum=0.5, - num_steps=100, - style=wx.SL_HORIZONTAL, - cast=float, - proportion=1, - ) - self.GridAdd(_clock_alpha_sizer, 0, 1, 1, 1) + self._gain_config = ConfigParser.ConfigParser() + self._gain_config.read(config_filename) + try: gain = self._gain_config.getfloat('usrp_rx_hrpt', 'gain') + except: gain = 35 + self.gain = gain + self._freq_config = ConfigParser.ConfigParser() + self._freq_config.read(config_filename) + try: freq = self._freq_config.getfloat('usrp_rx_hrpt', 'freq') + except: freq = 1698e6 + self.freq = freq + self._clock_alpha_config = ConfigParser.ConfigParser() + self._clock_alpha_config.read(config_filename) + try: clock_alpha = self._clock_alpha_config.getfloat('usrp_rx_hrpt', 'clock_alpha') + except: clock_alpha = 0.01 + self.clock_alpha = clock_alpha ################################################## # Blocks ################################################## - self.agc = gr.agc_cc(1e-6, 1.0, 1.0, 1.0) - self.decoder = noaa.hrpt_decoder(True,False) - self.deframer = noaa.hrpt_deframer() - self.demod_scope = scopesink2.scope_sink_f( - self.displays.GetPage(1).GetWin(), - title="Post-Demod", - sample_rate=sym_rate*2.0, - v_scale=0.5, - v_offset=0, - t_scale=10.0/sym_rate, - ac_couple=False, - xy_mode=False, - num_inputs=1, - ) - self.displays.GetPage(1).GridAdd(self.demod_scope.win, 0, 0, 1, 1) - self.frame_sink = gr.file_sink(gr.sizeof_short*1, output_filename) - self.gr_binary_slicer_fb_0 = gr.binary_slicer_fb() - self.gr_clock_recovery_mm_xx_0 = gr.clock_recovery_mm_ff(sps/2.0, clock_alpha**2/4.0, 0.5, clock_alpha, max_clock_offset) - self.gr_file_source_0 = gr.file_source(gr.sizeof_short*1, input_filename, False) - self.gr_interleaved_short_to_complex_0 = gr.interleaved_short_to_complex() - self.gr_moving_average_xx_0 = gr.moving_average_ff(hs, 1.0/hs, 4000) - self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset) - self.rx_fft = fftsink2.fft_sink_c( - self.displays.GetPage(0).GetWin(), - baseband_freq=0, - y_per_div=5, - y_divs=8, - ref_level=-5, - ref_scale=2.0, - sample_rate=sample_rate, - fft_size=1024, - fft_rate=15, - average=True, - avg_alpha=0.1, - title="RX Spectrum", - peak_hold=False, - size=(640, 360), - ) - self.displays.GetPage(0).GridAdd(self.rx_fft.win, 0, 0, 1, 1) self.throttle = gr.throttle(gr.sizeof_short*1, 2*sample_rate) + self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset) + self.gr_moving_average_xx_0 = gr.moving_average_ff(hs, 1.0/hs, 4000) + self.gr_interleaved_short_to_complex_0 = gr.interleaved_short_to_complex() + self.gr_file_source_0 = gr.file_source(gr.sizeof_short*1, "input_filename", False) + self.frame_sink = gr.file_sink(gr.sizeof_short*1, output_filename) + self.frame_sink.set_unbuffered(False) + self.digital_clock_recovery_mm_xx_0 = digital.clock_recovery_mm_ff(sps/2.0, clock_alpha**2/4.0, 0.5, clock_alpha, max_clock_offset) + self.digital_binary_slicer_fb_0 = digital.binary_slicer_fb() + self.deframer = noaa.hrpt_deframer() + self.decoder = noaa.hrpt_decoder(True,True) + self.agc = gr.agc_cc(1e-6, 1.0, 1.0, 1.0) ################################################## # Connections ################################################## - self.connect((self.gr_clock_recovery_mm_xx_0, 0), (self.gr_binary_slicer_fb_0, 0)) - self.connect((self.deframer, 0), (self.frame_sink, 0)) - self.connect((self.deframer, 0), (self.decoder, 0)) - self.connect((self.gr_clock_recovery_mm_xx_0, 0), (self.demod_scope, 0)) - self.connect((self.gr_moving_average_xx_0, 0), (self.gr_clock_recovery_mm_xx_0, 0)) + self.connect((self.gr_moving_average_xx_0, 0), (self.digital_clock_recovery_mm_xx_0, 0)) self.connect((self.pll, 0), (self.gr_moving_average_xx_0, 0)) self.connect((self.agc, 0), (self.pll, 0)) - self.connect((self.agc, 0), (self.rx_fft, 0)) + self.connect((self.deframer, 0), (self.decoder, 0)) + self.connect((self.deframer, 0), (self.frame_sink, 0)) self.connect((self.gr_interleaved_short_to_complex_0, 0), (self.agc, 0)) self.connect((self.throttle, 0), (self.gr_interleaved_short_to_complex_0, 0)) self.connect((self.gr_file_source_0, 0), (self.throttle, 0)) - self.connect((self.gr_binary_slicer_fb_0, 0), (self.deframer, 0)) - - def set_input_filename(self, input_filename): - self.input_filename = input_filename + self.connect((self.digital_clock_recovery_mm_xx_0, 0), (self.digital_binary_slicer_fb_0, 0)) + self.connect((self.digital_binary_slicer_fb_0, 0), (self.deframer, 0)) - def set_decim(self, decim): - self.decim = decim - self.set_sample_rate(64e6/self.decim) + def get_sym_rate(self): + return self.sym_rate def set_sym_rate(self, sym_rate): self.sym_rate = sym_rate self.set_sps(self.sample_rate/self.sym_rate) - self.demod_scope.set_sample_rate(self.sym_rate*2.0) + + def get_sample_rate(self): + return self.sample_rate def set_sample_rate(self, sample_rate): self.sample_rate = sample_rate - self.set_sps(self.sample_rate/self.sym_rate) - self.rx_fft.set_sample_rate(self.sample_rate) self.set_max_carrier_offset(2*math.pi*100e3/self.sample_rate) + self.set_sps(self.sample_rate/self.sym_rate) + + def get_sps(self): + return self.sps + + def set_sps(self, sps): + self.sps = sps + self.set_hs(int(self.sps/2.0)) + self.digital_clock_recovery_mm_xx_0.set_omega(self.sps/2.0) + + def get_config_filename(self): + return self.config_filename def set_config_filename(self, config_filename): self.config_filename = config_filename + self._freq_config = ConfigParser.ConfigParser() + self._freq_config.read(self.config_filename) + if not self._freq_config.has_section('usrp_rx_hrpt'): + self._freq_config.add_section('usrp_rx_hrpt') + self._freq_config.set('usrp_rx_hrpt', 'freq', str(self.freq)) + self._freq_config.write(open(self.config_filename, 'w')) + self._gain_config = ConfigParser.ConfigParser() + self._gain_config.read(self.config_filename) + if not self._gain_config.has_section('usrp_rx_hrpt'): + self._gain_config.add_section('usrp_rx_hrpt') + self._gain_config.set('usrp_rx_hrpt', 'gain', str(self.gain)) + self._gain_config.write(open(self.config_filename, 'w')) + self._pll_alpha_config = ConfigParser.ConfigParser() + self._pll_alpha_config.read(self.config_filename) + if not self._pll_alpha_config.has_section('usrp_rx_hrpt'): + self._pll_alpha_config.add_section('usrp_rx_hrpt') + self._pll_alpha_config.set('usrp_rx_hrpt', 'pll_alpha', str(self.pll_alpha)) + self._pll_alpha_config.write(open(self.config_filename, 'w')) + self._clock_alpha_config = ConfigParser.ConfigParser() + self._clock_alpha_config.read(self.config_filename) + if not self._clock_alpha_config.has_section('usrp_rx_hrpt'): + self._clock_alpha_config.add_section('usrp_rx_hrpt') + self._clock_alpha_config.set('usrp_rx_hrpt', 'clock_alpha', str(self.clock_alpha)) + self._clock_alpha_config.write(open(self.config_filename, 'w')) self._output_filename_config = ConfigParser.ConfigParser() self._output_filename_config.read(self.config_filename) if not self._output_filename_config.has_section('usrp_rx_hrpt'): self._output_filename_config.add_section('usrp_rx_hrpt') self._output_filename_config.set('usrp_rx_hrpt', 'filename', str(self.output_filename)) self._output_filename_config.write(open(self.config_filename, 'w')) - self._saved_pll_alpha_config = ConfigParser.ConfigParser() - self._saved_pll_alpha_config.read(self.config_filename) - if not self._saved_pll_alpha_config.has_section('usrp_rx_hrpt'): - self._saved_pll_alpha_config.add_section('usrp_rx_hrpt') - self._saved_pll_alpha_config.set('usrp_rx_hrpt', 'pll_alpha', str(self.pll_alpha)) - self._saved_pll_alpha_config.write(open(self.config_filename, 'w')) - self._saved_clock_alpha_config = ConfigParser.ConfigParser() - self._saved_clock_alpha_config.read(self.config_filename) - if not self._saved_clock_alpha_config.has_section('usrp_rx_hrpt'): - self._saved_clock_alpha_config.add_section('usrp_rx_hrpt') - self._saved_clock_alpha_config.set('usrp_rx_hrpt', 'clock_alpha', str(self.clock_alpha)) - self._saved_clock_alpha_config.write(open(self.config_filename, 'w')) - - def set_sps(self, sps): - self.sps = sps - self.gr_clock_recovery_mm_xx_0.set_omega(self.sps/2.0) - self.set_hs(int(self.sps/2.0)) - def set_saved_pll_alpha(self, saved_pll_alpha): - self.saved_pll_alpha = saved_pll_alpha - self.set_pll_alpha(self.saved_pll_alpha) - - def set_saved_clock_alpha(self, saved_clock_alpha): - self.saved_clock_alpha = saved_clock_alpha - self.set_clock_alpha(self.saved_clock_alpha) + def get_pll_alpha(self): + return self.pll_alpha def set_pll_alpha(self, pll_alpha): self.pll_alpha = pll_alpha self.pll.set_alpha(self.pll_alpha) self.pll.set_beta(self.pll_alpha**2/4.0) - self._pll_alpha_slider.set_value(self.pll_alpha) - self._pll_alpha_text_box.set_value(self.pll_alpha) - self._saved_pll_alpha_config = ConfigParser.ConfigParser() - self._saved_pll_alpha_config.read(self.config_filename) - if not self._saved_pll_alpha_config.has_section('usrp_rx_hrpt'): - self._saved_pll_alpha_config.add_section('usrp_rx_hrpt') - self._saved_pll_alpha_config.set('usrp_rx_hrpt', 'pll_alpha', str(self.pll_alpha)) - self._saved_pll_alpha_config.write(open(self.config_filename, 'w')) + self._pll_alpha_config = ConfigParser.ConfigParser() + self._pll_alpha_config.read(self.config_filename) + if not self._pll_alpha_config.has_section('usrp_rx_hrpt'): + self._pll_alpha_config.add_section('usrp_rx_hrpt') + self._pll_alpha_config.set('usrp_rx_hrpt', 'pll_alpha', str(self.pll_alpha)) + self._pll_alpha_config.write(open(self.config_filename, 'w')) + + def get_output_filename(self): + return self.output_filename def set_output_filename(self, output_filename): self.output_filename = output_filename @@ -251,37 +171,69 @@ class file_rx_hrpt(grc_wxgui.top_block_gui): self._output_filename_config.set('usrp_rx_hrpt', 'filename', str(self.output_filename)) self._output_filename_config.write(open(self.config_filename, 'w')) + def get_max_clock_offset(self): + return self.max_clock_offset + def set_max_clock_offset(self, max_clock_offset): self.max_clock_offset = max_clock_offset + def get_max_carrier_offset(self): + return self.max_carrier_offset + def set_max_carrier_offset(self, max_carrier_offset): self.max_carrier_offset = max_carrier_offset self.pll.set_max_offset(self.max_carrier_offset) + def get_hs(self): + return self.hs + def set_hs(self, hs): self.hs = hs self.gr_moving_average_xx_0.set_length_and_scale(self.hs, 1.0/self.hs) + def get_gain(self): + return self.gain + + def set_gain(self, gain): + self.gain = gain + self._gain_config = ConfigParser.ConfigParser() + self._gain_config.read(self.config_filename) + if not self._gain_config.has_section('usrp_rx_hrpt'): + self._gain_config.add_section('usrp_rx_hrpt') + self._gain_config.set('usrp_rx_hrpt', 'gain', str(self.gain)) + self._gain_config.write(open(self.config_filename, 'w')) + + def get_freq(self): + return self.freq + + def set_freq(self, freq): + self.freq = freq + self._freq_config = ConfigParser.ConfigParser() + self._freq_config.read(self.config_filename) + if not self._freq_config.has_section('usrp_rx_hrpt'): + self._freq_config.add_section('usrp_rx_hrpt') + self._freq_config.set('usrp_rx_hrpt', 'freq', str(self.freq)) + self._freq_config.write(open(self.config_filename, 'w')) + + def get_clock_alpha(self): + return self.clock_alpha + def set_clock_alpha(self, clock_alpha): self.clock_alpha = clock_alpha - self.gr_clock_recovery_mm_xx_0.set_gain_omega(self.clock_alpha**2/4.0) - self.gr_clock_recovery_mm_xx_0.set_gain_mu(self.clock_alpha) - self._clock_alpha_slider.set_value(self.clock_alpha) - self._clock_alpha_text_box.set_value(self.clock_alpha) - self._saved_clock_alpha_config = ConfigParser.ConfigParser() - self._saved_clock_alpha_config.read(self.config_filename) - if not self._saved_clock_alpha_config.has_section('usrp_rx_hrpt'): - self._saved_clock_alpha_config.add_section('usrp_rx_hrpt') - self._saved_clock_alpha_config.set('usrp_rx_hrpt', 'clock_alpha', str(self.clock_alpha)) - self._saved_clock_alpha_config.write(open(self.config_filename, 'w')) + self.digital_clock_recovery_mm_xx_0.set_gain_omega(self.clock_alpha**2/4.0) + self.digital_clock_recovery_mm_xx_0.set_gain_mu(self.clock_alpha) + self._clock_alpha_config = ConfigParser.ConfigParser() + self._clock_alpha_config.read(self.config_filename) + if not self._clock_alpha_config.has_section('usrp_rx_hrpt'): + self._clock_alpha_config.add_section('usrp_rx_hrpt') + self._clock_alpha_config.set('usrp_rx_hrpt', 'clock_alpha', str(self.clock_alpha)) + self._clock_alpha_config.write(open(self.config_filename, 'w')) if __name__ == '__main__': parser = OptionParser(option_class=eng_option, usage="%prog: [options]") - parser.add_option("-F", "--input-filename", dest="input_filename", type="string", default="usrp.dat", - help="Set usrp.dat [default=%default]") - parser.add_option("-d", "--decim", dest="decim", type="intx", default=32, - help="Set decim [default=%default]") (options, args) = parser.parse_args() - tb = file_rx_hrpt(input_filename=options.input_filename, decim=options.decim) - tb.Run(True) + tb = file_rx_hrpt() + tb.start() + raw_input('Press Enter to quit: ') + tb.stop() diff --git a/gr-noaa/apps/file_rx_lrit.grc b/gr-noaa/apps/file_rx_lrit.grc deleted file mode 100644 index ee6da2a31..000000000 --- a/gr-noaa/apps/file_rx_lrit.grc +++ /dev/null @@ -1,1372 +0,0 @@ - - - Wed Dec 16 09:14:28 2009 - - options - - id - file_rx_lrit - - - _enabled - True - - - title - LRIT Receiver (from capture file) - - - author - - - - description - - - - window_size - 4095, 4095 - - - generate_options - wx_gui - - - category - Custom - - - run_options - prompt - - - run - True - - - realtime_scheduling - - - - _coordinate - (10, 10) - - - _rotation - 0 - - - - variable - - id - symbol_rate - - - _enabled - True - - - value - 293e3 - - - _coordinate - (347, 10) - - - _rotation - 0 - - - - variable - - id - sps - - - _enabled - True - - - value - sample_rate/symbol_rate - - - _coordinate - (445, 10) - - - _rotation - 0 - - - - variable - - id - config_filename - - - _enabled - True - - - value - os.environ['HOME']+'/.gnuradio/config.conf' - - - _coordinate - (11, 136) - - - _rotation - 0 - - - - import - - id - import_0 - - - _enabled - True - - - import - import os - - - _coordinate - (10, 82) - - - _rotation - 0 - - - - variable - - id - sample_rate - - - _enabled - True - - - value - 64e6/decim - - - _coordinate - (249, 10) - - - _rotation - 0 - - - - wxgui_fftsink2 - - id - rx_spectrum - - - _enabled - True - - - type - complex - - - title - Baseband Spectrum - - - samp_rate - sample_rate - - - baseband_freq - 0 - - - y_per_div - 5 - - - y_divs - 10 - - - ref_level - 50 - - - ref_scale - 2.0 - - - fft_size - 1024 - - - fft_rate - 15 - - - peak_hold - False - - - average - True - - - avg_alpha - 0 - - - win - None - - - win_size - - - - grid_pos - 0, 0, 1, 1 - - - notebook - displays, 0 - - - _coordinate - (267, 556) - - - _rotation - 0 - - - - gr_file_source - - id - gr_file_source_0 - - - _enabled - True - - - file - lrit.dat - - - type - complex - - - repeat - False - - - vlen - 1 - - - _coordinate - (79, 729) - - - _rotation - 0 - - - - gr_throttle - - id - gr_throttle_0 - - - _enabled - True - - - type - complex - - - samples_per_second - sample_rate - - - vlen - 1 - - - _coordinate - (60, 824) - - - _rotation - 0 - - - - wxgui_scopesink2 - - id - rx_waveform - - - _enabled - True - - - type - complex - - - title - Baseband Waveform - - - samp_rate - sample_rate - - - v_scale - 0 - - - v_offset - 0 - - - t_scale - 20.0/sample_rate - - - ac_couple - False - - - xy_mode - False - - - num_inputs - 1 - - - win_size - - - - grid_pos - 1, 0, 1, 1 - - - notebook - displays, 0 - - - _coordinate - (267, 915) - - - _rotation - 0 - - - - variable_slider - - id - gain_mu - - - _enabled - True - - - label - Gain Mu - - - value - saved_gain_mu - - - min - 0 - - - max - 0.5 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - 0, 1, 1, 1 - - - notebook - - - - _coordinate - (478, 91) - - - _rotation - 0 - - - - wxgui_fftsink2 - - id - costas_spectrum - - - _enabled - True - - - type - complex - - - title - PLL Spectrum - - - samp_rate - sample_rate - - - baseband_freq - 0 - - - y_per_div - 10 - - - y_divs - 10 - - - ref_level - -15 - - - ref_scale - 2.0 - - - fft_size - 1024 - - - fft_rate - 30 - - - peak_hold - False - - - average - True - - - avg_alpha - 0 - - - win - window.hanning - - - win_size - - - - grid_pos - 0, 0, 1, 1 - - - notebook - displays, 2 - - - _coordinate - (916, 535) - - - _rotation - 0 - - - - gr_clock_recovery_mm_xx - - id - gr_clock_recovery_mm_xx_0 - - - _enabled - True - - - type - complex - - - omega - sps - - - gain_omega - (gain_mu**2)/4.0 - - - mu - 0.5 - - - gain_mu - gain_mu - - - omega_relative_limit - 50e-6 - - - _coordinate - (915, 789) - - - _rotation - 0 - - - - wxgui_fftsink2 - - id - costas_spectrum_0 - - - _enabled - True - - - type - complex - - - title - Bit Sync Spectrum - - - samp_rate - symbol_rate - - - baseband_freq - 0 - - - y_per_div - 10 - - - y_divs - 10 - - - ref_level - -15 - - - ref_scale - 2.0 - - - fft_size - 1024 - - - fft_rate - 30 - - - peak_hold - False - - - average - True - - - avg_alpha - 0 - - - win - window.hanning - - - win_size - - - - grid_pos - 0, 0, 1, 1 - - - notebook - displays, 3 - - - _coordinate - (1160, 539) - - - _rotation - 0 - - - - notebook - - id - displays - - - _enabled - True - - - style - wx.NB_TOP - - - labels - ['USRP RX', 'RRC Filter', 'PLL', 'MM'] - - - grid_pos - 1, 0, 1, 2 - - - notebook - - - - _coordinate - (15, 206) - - - _rotation - 0 - - - - variable_slider - - id - costas_alpha - - - _enabled - True - - - label - Costas Alpha - - - value - saved_costas_alpha - - - min - 0 - - - max - 0.5 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - 0, 0, 1, 1 - - - notebook - - - - _coordinate - (338, 90) - - - _rotation - 0 - - - - wxgui_scopesink2 - - id - costas_waveform - - - _enabled - True - - - type - complex - - - title - PLL Waveform - - - samp_rate - sample_rate - - - v_scale - 0.5 - - - v_offset - 0 - - - t_scale - 20.0/sample_rate - - - ac_couple - False - - - xy_mode - False - - - num_inputs - 1 - - - win_size - - - - grid_pos - 1, 0, 1, 1 - - - notebook - displays, 2 - - - _coordinate - (915, 928) - - - _rotation - 0 - - - - wxgui_scopesink2 - - id - mm_waveform - - - _enabled - True - - - type - complex - - - title - Constellation - - - samp_rate - symbol_rate - - - v_scale - 0.5 - - - v_offset - 0 - - - t_scale - 20.0/symbol_rate - - - ac_couple - False - - - xy_mode - True - - - num_inputs - 1 - - - win_size - - - - grid_pos - 1, 0, 1, 1 - - - notebook - displays, 3 - - - _coordinate - (1160, 922) - - - _rotation - 0 - - - - variable_config - - id - saved_costas_alpha - - - _enabled - True - - - value - 0.2 - - - type - real - - - config_file - config_filename - - - section - 'usrp_rx_lrit' - - - option - 'costas_alpha' - - - writeback - costas_alpha - - - _coordinate - (251, 244) - - - _rotation - 0 - - - - variable_config - - id - saved_gain_mu - - - _enabled - True - - - value - 0.2 - - - type - real - - - config_file - config_filename - - - section - 'usrp_rx_lrit' - - - option - 'gain_mu' - - - writeback - gain_mu - - - _coordinate - (411, 242) - - - _rotation - 0 - - - - parameter - - id - decim - - - _enabled - True - - - label - Decim - - - value - 160 - - - type - intx - - - short_id - d - - - _coordinate - (249, 90) - - - _rotation - 0 - - - - wxgui_fftsink2 - - id - rrc_spectrum - - - _enabled - True - - - type - complex - - - title - RRC Spectrum - - - samp_rate - sample_rate - - - baseband_freq - 0 - - - y_per_div - 10 - - - y_divs - 10 - - - ref_level - -15 - - - ref_scale - 2.0 - - - fft_size - 1024 - - - fft_rate - 30 - - - peak_hold - False - - - average - True - - - avg_alpha - 0 - - - win - window.hanning - - - win_size - - - - grid_pos - 0, 0, 1, 1 - - - notebook - displays, 1 - - - _coordinate - (705, 534) - - - _rotation - 0 - - - - gr_agc_xx - - id - gr_agc_xx_0 - - - _enabled - True - - - type - complex - - - rate - 1e-6 - - - reference - 1.0 - - - gain - 1.0/32767.0 - - - max_gain - 1.0 - - - _coordinate - (273, 800) - - - _rotation - 0 - - - - wxgui_scopesink2 - - id - rx_waveform_0 - - - _enabled - True - - - type - complex - - - title - RRC Waveform - - - samp_rate - sample_rate - - - v_scale - 0.5 - - - v_offset - 0 - - - t_scale - 20.0/sample_rate - - - ac_couple - False - - - xy_mode - False - - - num_inputs - 1 - - - win_size - - - - grid_pos - 1, 0, 1, 1 - - - notebook - displays, 1 - - - _coordinate - (706, 927) - - - _rotation - 0 - - - - gr_costas_loop_cc - - id - costas - - - _enabled - True - - - alpha - costas_alpha - - - beta - (costas_alpha**2)/4.0 - - - max_freq - 50e-6*sps - - - min_freq - -50e-6*sps - - - order - 2 - - - _coordinate - (706, 792) - - - _rotation - 0 - - - - root_raised_cosine_filter - - id - rrc - - - _enabled - True - - - type - fir_filter_ccf - - - decim - 1 - - - interp - 1 - - - gain - 1 - - - samp_rate - sample_rate - - - sym_rate - symbol_rate - - - alpha - 0.25 - - - ntaps - int(11*sample_rate/symbol_rate) - - - _coordinate - (448, 784) - - - _rotation - 0 - - - - rrc - rx_waveform_0 - 0 - 0 - - - rrc - rrc_spectrum - 0 - 0 - - - gr_agc_xx_0 - rrc - 0 - 0 - - - gr_throttle_0 - rx_waveform - 0 - 0 - - - gr_throttle_0 - rx_spectrum - 0 - 0 - - - gr_throttle_0 - gr_agc_xx_0 - 0 - 0 - - - gr_file_source_0 - gr_throttle_0 - 0 - 0 - - - rrc - costas - 0 - 0 - - - costas - costas_spectrum - 0 - 0 - - - costas - costas_waveform - 0 - 0 - - - costas - gr_clock_recovery_mm_xx_0 - 0 - 0 - - - gr_clock_recovery_mm_xx_0 - costas_spectrum_0 - 0 - 0 - - - gr_clock_recovery_mm_xx_0 - mm_waveform - 0 - 0 - - diff --git a/gr-noaa/apps/file_rx_lrit.py b/gr-noaa/apps/file_rx_lrit.py deleted file mode 100755 index 9a50631f7..000000000 --- a/gr-noaa/apps/file_rx_lrit.py +++ /dev/null @@ -1,337 +0,0 @@ -#!/usr/bin/env python -################################################## -# Gnuradio Python Flow Graph -# Title: LRIT Receiver (from capture file) -# Generated: Wed Dec 16 09:16:13 2009 -################################################## - -from gnuradio import eng_notation -from gnuradio import gr -from gnuradio import window -from gnuradio.eng_option import eng_option -from gnuradio.gr import firdes -from gnuradio.wxgui import fftsink2 -from gnuradio.wxgui import forms -from gnuradio.wxgui import scopesink2 -from grc_gnuradio import wxgui as grc_wxgui -from optparse import OptionParser -import ConfigParser -import os -import wx - -class file_rx_lrit(grc_wxgui.top_block_gui): - - def __init__(self, decim=160): - grc_wxgui.top_block_gui.__init__(self, title="LRIT Receiver (from capture file)") - - ################################################## - # Parameters - ################################################## - self.decim = decim - - ################################################## - # Variables - ################################################## - self.config_filename = config_filename = os.environ['HOME']+'/.gnuradio/config.conf' - self.symbol_rate = symbol_rate = 293e3 - self._saved_gain_mu_config = ConfigParser.ConfigParser() - self._saved_gain_mu_config.read(config_filename) - try: saved_gain_mu = self._saved_gain_mu_config.getfloat('usrp_rx_lrit', 'gain_mu') - except: saved_gain_mu = 0.2 - self.saved_gain_mu = saved_gain_mu - self._saved_costas_alpha_config = ConfigParser.ConfigParser() - self._saved_costas_alpha_config.read(config_filename) - try: saved_costas_alpha = self._saved_costas_alpha_config.getfloat('usrp_rx_lrit', 'costas_alpha') - except: saved_costas_alpha = 0.2 - self.saved_costas_alpha = saved_costas_alpha - self.sample_rate = sample_rate = 64e6/decim - self.sps = sps = sample_rate/symbol_rate - self.gain_mu = gain_mu = saved_gain_mu - self.costas_alpha = costas_alpha = saved_costas_alpha - - ################################################## - # Notebooks - ################################################## - self.displays = wx.Notebook(self.GetWin(), style=wx.NB_TOP) - self.displays.AddPage(grc_wxgui.Panel(self.displays), "USRP RX") - self.displays.AddPage(grc_wxgui.Panel(self.displays), "RRC Filter") - self.displays.AddPage(grc_wxgui.Panel(self.displays), "PLL") - self.displays.AddPage(grc_wxgui.Panel(self.displays), "MM") - self.GridAdd(self.displays, 1, 0, 1, 2) - - ################################################## - # Controls - ################################################## - _gain_mu_sizer = wx.BoxSizer(wx.VERTICAL) - self._gain_mu_text_box = forms.text_box( - parent=self.GetWin(), - sizer=_gain_mu_sizer, - value=self.gain_mu, - callback=self.set_gain_mu, - label="Gain Mu", - converter=forms.float_converter(), - proportion=0, - ) - self._gain_mu_slider = forms.slider( - parent=self.GetWin(), - sizer=_gain_mu_sizer, - value=self.gain_mu, - callback=self.set_gain_mu, - minimum=0, - maximum=0.5, - num_steps=100, - style=wx.SL_HORIZONTAL, - cast=float, - proportion=1, - ) - self.GridAdd(_gain_mu_sizer, 0, 1, 1, 1) - _costas_alpha_sizer = wx.BoxSizer(wx.VERTICAL) - self._costas_alpha_text_box = forms.text_box( - parent=self.GetWin(), - sizer=_costas_alpha_sizer, - value=self.costas_alpha, - callback=self.set_costas_alpha, - label="Costas Alpha", - converter=forms.float_converter(), - proportion=0, - ) - self._costas_alpha_slider = forms.slider( - parent=self.GetWin(), - sizer=_costas_alpha_sizer, - value=self.costas_alpha, - callback=self.set_costas_alpha, - minimum=0, - maximum=0.5, - num_steps=100, - style=wx.SL_HORIZONTAL, - cast=float, - proportion=1, - ) - self.GridAdd(_costas_alpha_sizer, 0, 0, 1, 1) - - ################################################## - # Blocks - ################################################## - self.costas = gr.costas_loop_cc(costas_alpha, (costas_alpha**2)/4.0, 50e-6*sps, -50e-6*sps, 2) - self.costas_spectrum = fftsink2.fft_sink_c( - self.displays.GetPage(2).GetWin(), - baseband_freq=0, - y_per_div=10, - y_divs=10, - ref_level=-15, - ref_scale=2.0, - sample_rate=sample_rate, - fft_size=1024, - fft_rate=30, - average=True, - avg_alpha=None, - title="PLL Spectrum", - peak_hold=False, - win=window.hanning, - ) - self.displays.GetPage(2).GridAdd(self.costas_spectrum.win, 0, 0, 1, 1) - self.costas_spectrum_0 = fftsink2.fft_sink_c( - self.displays.GetPage(3).GetWin(), - baseband_freq=0, - y_per_div=10, - y_divs=10, - ref_level=-15, - ref_scale=2.0, - sample_rate=symbol_rate, - fft_size=1024, - fft_rate=30, - average=True, - avg_alpha=None, - title="Bit Sync Spectrum", - peak_hold=False, - win=window.hanning, - ) - self.displays.GetPage(3).GridAdd(self.costas_spectrum_0.win, 0, 0, 1, 1) - self.costas_waveform = scopesink2.scope_sink_c( - self.displays.GetPage(2).GetWin(), - title="PLL Waveform", - sample_rate=sample_rate, - v_scale=0.5, - v_offset=0, - t_scale=20.0/sample_rate, - ac_couple=False, - xy_mode=False, - num_inputs=1, - ) - self.displays.GetPage(2).GridAdd(self.costas_waveform.win, 1, 0, 1, 1) - self.gr_agc_xx_0 = gr.agc_cc(1e-6, 1.0, 1.0/32767.0, 1.0) - self.gr_clock_recovery_mm_xx_0 = gr.clock_recovery_mm_cc(sps, (gain_mu**2)/4.0, 0.5, gain_mu, 50e-6) - self.gr_file_source_0 = gr.file_source(gr.sizeof_gr_complex*1, "lrit.dat", False) - self.gr_throttle_0 = gr.throttle(gr.sizeof_gr_complex*1, sample_rate) - self.mm_waveform = scopesink2.scope_sink_c( - self.displays.GetPage(3).GetWin(), - title="Constellation", - sample_rate=symbol_rate, - v_scale=0.5, - v_offset=0, - t_scale=20.0/symbol_rate, - ac_couple=False, - xy_mode=True, - num_inputs=1, - ) - self.displays.GetPage(3).GridAdd(self.mm_waveform.win, 1, 0, 1, 1) - self.rrc = gr.fir_filter_ccf(1, firdes.root_raised_cosine( - 1, sample_rate, symbol_rate, 0.25, int(11*sample_rate/symbol_rate))) - self.rrc_spectrum = fftsink2.fft_sink_c( - self.displays.GetPage(1).GetWin(), - baseband_freq=0, - y_per_div=10, - y_divs=10, - ref_level=-15, - ref_scale=2.0, - sample_rate=sample_rate, - fft_size=1024, - fft_rate=30, - average=True, - avg_alpha=None, - title="RRC Spectrum", - peak_hold=False, - win=window.hanning, - ) - self.displays.GetPage(1).GridAdd(self.rrc_spectrum.win, 0, 0, 1, 1) - self.rx_spectrum = fftsink2.fft_sink_c( - self.displays.GetPage(0).GetWin(), - baseband_freq=0, - y_per_div=5, - y_divs=10, - ref_level=50, - ref_scale=2.0, - sample_rate=sample_rate, - fft_size=1024, - fft_rate=15, - average=True, - avg_alpha=None, - title="Baseband Spectrum", - peak_hold=False, - ) - self.displays.GetPage(0).GridAdd(self.rx_spectrum.win, 0, 0, 1, 1) - self.rx_waveform = scopesink2.scope_sink_c( - self.displays.GetPage(0).GetWin(), - title="Baseband Waveform", - sample_rate=sample_rate, - v_scale=0, - v_offset=0, - t_scale=20.0/sample_rate, - ac_couple=False, - xy_mode=False, - num_inputs=1, - ) - self.displays.GetPage(0).GridAdd(self.rx_waveform.win, 1, 0, 1, 1) - self.rx_waveform_0 = scopesink2.scope_sink_c( - self.displays.GetPage(1).GetWin(), - title="RRC Waveform", - sample_rate=sample_rate, - v_scale=0.5, - v_offset=0, - t_scale=20.0/sample_rate, - ac_couple=False, - xy_mode=False, - num_inputs=1, - ) - self.displays.GetPage(1).GridAdd(self.rx_waveform_0.win, 1, 0, 1, 1) - - ################################################## - # Connections - ################################################## - self.connect((self.rrc, 0), (self.rx_waveform_0, 0)) - self.connect((self.rrc, 0), (self.rrc_spectrum, 0)) - self.connect((self.gr_agc_xx_0, 0), (self.rrc, 0)) - self.connect((self.gr_throttle_0, 0), (self.rx_waveform, 0)) - self.connect((self.gr_throttle_0, 0), (self.rx_spectrum, 0)) - self.connect((self.gr_throttle_0, 0), (self.gr_agc_xx_0, 0)) - self.connect((self.gr_file_source_0, 0), (self.gr_throttle_0, 0)) - self.connect((self.rrc, 0), (self.costas, 0)) - self.connect((self.costas, 0), (self.costas_spectrum, 0)) - self.connect((self.costas, 0), (self.costas_waveform, 0)) - self.connect((self.costas, 0), (self.gr_clock_recovery_mm_xx_0, 0)) - self.connect((self.gr_clock_recovery_mm_xx_0, 0), (self.costas_spectrum_0, 0)) - self.connect((self.gr_clock_recovery_mm_xx_0, 0), (self.mm_waveform, 0)) - - def set_decim(self, decim): - self.decim = decim - self.set_sample_rate(64e6/self.decim) - - def set_config_filename(self, config_filename): - self.config_filename = config_filename - self._saved_costas_alpha_config = ConfigParser.ConfigParser() - self._saved_costas_alpha_config.read(self.config_filename) - if not self._saved_costas_alpha_config.has_section('usrp_rx_lrit'): - self._saved_costas_alpha_config.add_section('usrp_rx_lrit') - self._saved_costas_alpha_config.set('usrp_rx_lrit', 'costas_alpha', str(self.costas_alpha)) - self._saved_costas_alpha_config.write(open(self.config_filename, 'w')) - self._saved_gain_mu_config = ConfigParser.ConfigParser() - self._saved_gain_mu_config.read(self.config_filename) - if not self._saved_gain_mu_config.has_section('usrp_rx_lrit'): - self._saved_gain_mu_config.add_section('usrp_rx_lrit') - self._saved_gain_mu_config.set('usrp_rx_lrit', 'gain_mu', str(self.gain_mu)) - self._saved_gain_mu_config.write(open(self.config_filename, 'w')) - - def set_symbol_rate(self, symbol_rate): - self.symbol_rate = symbol_rate - self.set_sps(self.sample_rate/self.symbol_rate) - self.costas_spectrum_0.set_sample_rate(self.symbol_rate) - self.mm_waveform.set_sample_rate(self.symbol_rate) - self.rrc.set_taps(firdes.root_raised_cosine(1, self.sample_rate, self.symbol_rate, 0.25, int(11*self.sample_rate/self.symbol_rate))) - - def set_saved_gain_mu(self, saved_gain_mu): - self.saved_gain_mu = saved_gain_mu - self.set_gain_mu(self.saved_gain_mu) - - def set_saved_costas_alpha(self, saved_costas_alpha): - self.saved_costas_alpha = saved_costas_alpha - self.set_costas_alpha(self.saved_costas_alpha) - - def set_sample_rate(self, sample_rate): - self.sample_rate = sample_rate - self.set_sps(self.sample_rate/self.symbol_rate) - self.rx_spectrum.set_sample_rate(self.sample_rate) - self.rx_waveform.set_sample_rate(self.sample_rate) - self.costas_spectrum.set_sample_rate(self.sample_rate) - self.costas_waveform.set_sample_rate(self.sample_rate) - self.rrc_spectrum.set_sample_rate(self.sample_rate) - self.rx_waveform_0.set_sample_rate(self.sample_rate) - self.rrc.set_taps(firdes.root_raised_cosine(1, self.sample_rate, self.symbol_rate, 0.25, int(11*self.sample_rate/self.symbol_rate))) - - def set_sps(self, sps): - self.sps = sps - self.gr_clock_recovery_mm_xx_0.set_omega(self.sps) - - def set_gain_mu(self, gain_mu): - self.gain_mu = gain_mu - self._gain_mu_slider.set_value(self.gain_mu) - self._gain_mu_text_box.set_value(self.gain_mu) - self.gr_clock_recovery_mm_xx_0.set_gain_omega((self.gain_mu**2)/4.0) - self.gr_clock_recovery_mm_xx_0.set_gain_mu(self.gain_mu) - self._saved_gain_mu_config = ConfigParser.ConfigParser() - self._saved_gain_mu_config.read(self.config_filename) - if not self._saved_gain_mu_config.has_section('usrp_rx_lrit'): - self._saved_gain_mu_config.add_section('usrp_rx_lrit') - self._saved_gain_mu_config.set('usrp_rx_lrit', 'gain_mu', str(self.gain_mu)) - self._saved_gain_mu_config.write(open(self.config_filename, 'w')) - - def set_costas_alpha(self, costas_alpha): - self.costas_alpha = costas_alpha - self._costas_alpha_slider.set_value(self.costas_alpha) - self._costas_alpha_text_box.set_value(self.costas_alpha) - self._saved_costas_alpha_config = ConfigParser.ConfigParser() - self._saved_costas_alpha_config.read(self.config_filename) - if not self._saved_costas_alpha_config.has_section('usrp_rx_lrit'): - self._saved_costas_alpha_config.add_section('usrp_rx_lrit') - self._saved_costas_alpha_config.set('usrp_rx_lrit', 'costas_alpha', str(self.costas_alpha)) - self._saved_costas_alpha_config.write(open(self.config_filename, 'w')) - self.costas.set_alpha(self.costas_alpha) - self.costas.set_beta((self.costas_alpha**2)/4.0) - -if __name__ == '__main__': - parser = OptionParser(option_class=eng_option, usage="%prog: [options]") - parser.add_option("-d", "--decim", dest="decim", type="intx", default=160, - help="Set Decim [default=%default]") - (options, args) = parser.parse_args() - tb = file_rx_lrit(decim=options.decim) - tb.Run(True) - diff --git a/gr-noaa/apps/hrpt_demod.grc b/gr-noaa/apps/hrpt_demod.grc index 8af3d82dd..f5833b864 100644 --- a/gr-noaa/apps/hrpt_demod.grc +++ b/gr-noaa/apps/hrpt_demod.grc @@ -1,6 +1,6 @@ - Sun Nov 8 10:41:07 2009 + Thu Oct 27 13:51:57 2011 options @@ -102,29 +102,6 @@ 0 - - variable - - id - sample_rate - - - _enabled - True - - - value - 64e6/decim - - - _coordinate - (198, 17) - - - _rotation - 0 - - import @@ -342,122 +319,6 @@ 0 - - gr_moving_average_xx - - id - gr_moving_average_xx_0 - - - _enabled - True - - - type - float - - - length - hs - - - scale - 1.0/hs - - - max_iter - 4000 - - - _coordinate - (504, 402) - - - _rotation - 0 - - - - gr_clock_recovery_mm_xx - - id - gr_clock_recovery_mm_xx_0 - - - _enabled - True - - - type - float - - - omega - sps/2.0 - - - gain_omega - clock_alpha**2/4.0 - - - mu - 0.5 - - - gain_mu - clock_alpha - - - omega_relative_limit - max_clock_offset - - - _coordinate - (703, 386) - - - _rotation - 0 - - - - noaa_hrpt_deframer - - id - noaa_hrpt_deframer_0 - - - _enabled - True - - - _coordinate - (1142, 422) - - - _rotation - 0 - - - - gr_binary_slicer_fb - - id - gr_binary_slicer_fb_0 - - - _enabled - True - - - _coordinate - (960, 422) - - - _rotation - 0 - - variable @@ -681,6 +542,10 @@ vlen 1 + + unbuffered + False + _coordinate (1144, 489) @@ -690,24 +555,151 @@ 180 + + gr_moving_average_xx + + id + gr_moving_average_xx_0 + + + _enabled + True + + + type + float + + + length + hs + + + scale + 1.0/hs + + + max_iter + 4000 + + + _coordinate + (504, 402) + + + _rotation + 0 + + + + variable + + id + sample_rate + + + _enabled + True + + + value + 4e6 + + + _coordinate + (198, 17) + + + _rotation + 0 + + + + digital_clock_recovery_mm_xx + + id + digital_clock_recovery_mm_xx_0 + + + _enabled + True + + + type + float + + + omega + sps/2.0 + + + gain_omega + clock_alpha**2/4.0 + + + mu + 0.5 + + + gain_mu + clock_alpha + + + omega_relative_limit + max_clock_offset + + + _coordinate + (704, 386) + + + _rotation + 0 + + + + noaa_hrpt_deframer + + id + noaa_hrpt_deframer_0 + + + _enabled + True + + + _coordinate + (1142, 422) + + + _rotation + 0 + + + + digital_binary_slicer_fb + + id + digital_binary_slicer_fb_0 + + + _enabled + True + + + _coordinate + (957, 422) + + + _rotation + 0 + + file_source cs2cf 0 0 - - gr_clock_recovery_mm_xx_0 - gr_binary_slicer_fb_0 - 0 - 0 - - - gr_moving_average_xx_0 - gr_clock_recovery_mm_xx_0 - 0 - 0 - pll gr_moving_average_xx_0 @@ -739,7 +731,19 @@ 0 - gr_binary_slicer_fb_0 + gr_moving_average_xx_0 + digital_clock_recovery_mm_xx_0 + 0 + 0 + + + digital_clock_recovery_mm_xx_0 + digital_binary_slicer_fb_0 + 0 + 0 + + + digital_binary_slicer_fb_0 noaa_hrpt_deframer_0 0 0 diff --git a/gr-noaa/apps/hrpt_demod.py b/gr-noaa/apps/hrpt_demod.py index 38d031686..38b4b2fe3 100755 --- a/gr-noaa/apps/hrpt_demod.py +++ b/gr-noaa/apps/hrpt_demod.py @@ -2,9 +2,10 @@ ################################################## # Gnuradio Python Flow Graph # Title: Hrpt Demod -# Generated: Sun Nov 8 10:41:08 2009 +# Generated: Thu Oct 27 13:51:59 2011 ################################################## +from gnuradio import digital from gnuradio import eng_notation from gnuradio import gr from gnuradio import noaa @@ -31,7 +32,7 @@ class hrpt_demod(gr.top_block): # Variables ################################################## self.sym_rate = sym_rate = 600*1109 - self.sample_rate = sample_rate = 64e6/decim + self.sample_rate = sample_rate = 4e6 self.sps = sps = sample_rate/sym_rate self.max_clock_offset = max_clock_offset = 100e-6 self.max_carrier_offset = max_carrier_offset = 2*math.pi*100e3/sample_rate @@ -40,71 +41,104 @@ class hrpt_demod(gr.top_block): ################################################## # Blocks ################################################## - self.agc = gr.agc_cc(1e-5, 1.0, 1.0/32768.0, 1.0) - self.cs2cf = gr.interleaved_short_to_complex() - self.decoder = noaa.hrpt_decoder(True,False) - self.file_source = gr.file_source(gr.sizeof_short*1, input_filename, False) - self.gr_binary_slicer_fb_0 = gr.binary_slicer_fb() - self.gr_clock_recovery_mm_xx_0 = gr.clock_recovery_mm_ff(sps/2.0, clock_alpha**2/4.0, 0.5, clock_alpha, max_clock_offset) - self.gr_file_sink_0 = gr.file_sink(gr.sizeof_short*1, output_filename) - self.gr_moving_average_xx_0 = gr.moving_average_ff(hs, 1.0/hs, 4000) - self.noaa_hrpt_deframer_0 = noaa.hrpt_deframer() self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset) + self.noaa_hrpt_deframer_0 = noaa.hrpt_deframer() + self.gr_moving_average_xx_0 = gr.moving_average_ff(hs, 1.0/hs, 4000) + self.gr_file_sink_0 = gr.file_sink(gr.sizeof_short*1, output_filename) + self.gr_file_sink_0.set_unbuffered(False) + self.file_source = gr.file_source(gr.sizeof_short*1, input_filename, False) + self.digital_clock_recovery_mm_xx_0 = digital.clock_recovery_mm_ff(sps/2.0, clock_alpha**2/4.0, 0.5, clock_alpha, max_clock_offset) + self.digital_binary_slicer_fb_0 = digital.binary_slicer_fb() + self.decoder = noaa.hrpt_decoder(True,False) + self.cs2cf = gr.interleaved_short_to_complex() + self.agc = gr.agc_cc(1e-5, 1.0, 1.0/32768.0, 1.0) ################################################## # Connections ################################################## self.connect((self.file_source, 0), (self.cs2cf, 0)) - self.connect((self.gr_clock_recovery_mm_xx_0, 0), (self.gr_binary_slicer_fb_0, 0)) - self.connect((self.gr_moving_average_xx_0, 0), (self.gr_clock_recovery_mm_xx_0, 0)) self.connect((self.pll, 0), (self.gr_moving_average_xx_0, 0)) self.connect((self.cs2cf, 0), (self.agc, 0)) self.connect((self.agc, 0), (self.pll, 0)) self.connect((self.noaa_hrpt_deframer_0, 0), (self.gr_file_sink_0, 0)) self.connect((self.noaa_hrpt_deframer_0, 0), (self.decoder, 0)) - self.connect((self.gr_binary_slicer_fb_0, 0), (self.noaa_hrpt_deframer_0, 0)) + self.connect((self.gr_moving_average_xx_0, 0), (self.digital_clock_recovery_mm_xx_0, 0)) + self.connect((self.digital_clock_recovery_mm_xx_0, 0), (self.digital_binary_slicer_fb_0, 0)) + self.connect((self.digital_binary_slicer_fb_0, 0), (self.noaa_hrpt_deframer_0, 0)) + + def get_input_filename(self): + return self.input_filename def set_input_filename(self, input_filename): self.input_filename = input_filename + def get_output_filename(self): + return self.output_filename + def set_output_filename(self, output_filename): self.output_filename = output_filename + def get_decim(self): + return self.decim + def set_decim(self, decim): self.decim = decim - self.set_sample_rate(64e6/self.decim) + + def get_pll_alpha(self): + return self.pll_alpha def set_pll_alpha(self, pll_alpha): self.pll_alpha = pll_alpha self.pll.set_alpha(self.pll_alpha) self.pll.set_beta(self.pll_alpha**2/4.0) + def get_clock_alpha(self): + return self.clock_alpha + def set_clock_alpha(self, clock_alpha): self.clock_alpha = clock_alpha - self.gr_clock_recovery_mm_xx_0.set_gain_omega(self.clock_alpha**2/4.0) - self.gr_clock_recovery_mm_xx_0.set_gain_mu(self.clock_alpha) + self.digital_clock_recovery_mm_xx_0.set_gain_omega(self.clock_alpha**2/4.0) + self.digital_clock_recovery_mm_xx_0.set_gain_mu(self.clock_alpha) + + def get_sym_rate(self): + return self.sym_rate def set_sym_rate(self, sym_rate): self.sym_rate = sym_rate self.set_sps(self.sample_rate/self.sym_rate) + def get_sample_rate(self): + return self.sample_rate + def set_sample_rate(self, sample_rate): self.sample_rate = sample_rate self.set_max_carrier_offset(2*math.pi*100e3/self.sample_rate) self.set_sps(self.sample_rate/self.sym_rate) + def get_sps(self): + return self.sps + def set_sps(self, sps): self.sps = sps self.set_hs(int(self.sps/2.0)) - self.gr_clock_recovery_mm_xx_0.set_omega(self.sps/2.0) + self.digital_clock_recovery_mm_xx_0.set_omega(self.sps/2.0) + + def get_max_clock_offset(self): + return self.max_clock_offset def set_max_clock_offset(self, max_clock_offset): self.max_clock_offset = max_clock_offset + def get_max_carrier_offset(self): + return self.max_carrier_offset + def set_max_carrier_offset(self, max_carrier_offset): self.max_carrier_offset = max_carrier_offset self.pll.set_max_offset(self.max_carrier_offset) + def get_hs(self): + return self.hs + def set_hs(self, hs): self.hs = hs self.gr_moving_average_xx_0.set_length_and_scale(self.hs, 1.0/self.hs) @@ -116,11 +150,11 @@ if __name__ == '__main__': parser.add_option("-o", "--output-filename", dest="output_filename", type="string", default="frames.dat", help="Set frames.dat [default=%default]") parser.add_option("-d", "--decim", dest="decim", type="intx", default=32, - help="Set decim [default=%default]") + help="Set None [default=%default]") parser.add_option("-p", "--pll-alpha", dest="pll_alpha", type="eng_float", default=eng_notation.num_to_str(0.01), - help="Set pll_alpha [default=%default]") + help="Set None [default=%default]") parser.add_option("-s", "--clock-alpha", dest="clock_alpha", type="eng_float", default=eng_notation.num_to_str(0.01), - help="Set clock_alpha [default=%default]") + help="Set None [default=%default]") (options, args) = parser.parse_args() tb = hrpt_demod(input_filename=options.input_filename, output_filename=options.output_filename, decim=options.decim, pll_alpha=options.pll_alpha, clock_alpha=options.clock_alpha) tb.run() diff --git a/gr-noaa/apps/usrp_rx_hrpt.grc b/gr-noaa/apps/usrp_rx_hrpt.grc index 990855f69..26af48ff0 100644 --- a/gr-noaa/apps/usrp_rx_hrpt.grc +++ b/gr-noaa/apps/usrp_rx_hrpt.grc @@ -1,6 +1,6 @@ - Mon Nov 9 07:56:11 2009 + Thu Oct 27 13:26:39 2011 options @@ -148,29 +148,6 @@ 0 - - variable - - id - sample_rate - - - _enabled - True - - - value - 64e6/decim - - - _coordinate - (198, 17) - - - _rotation - 0 - - variable_slider @@ -325,10 +302,10 @@ - variable_static_text + variable_slider id - side_text + clock_alpha _enabled @@ -336,23 +313,35 @@ label - USRP Side + Clock Alpha value - side + saved_clock_alpha - converver - str_converter + min + 0.0 - formatter - None + max + 0.5 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter grid_pos - 1, 0, 1, 1 + 0, 3, 1, 1 notebook @@ -360,7 +349,7 @@ _coordinate - (828, 20) + (618, 106) _rotation @@ -368,34 +357,26 @@ - variable_static_text + notebook id - decim_text + displays _enabled True - label - Decimation - - - value - decim - - - converver - float_converter + style + wx.NB_TOP - formatter - None + labels + ['Spectrum','Demod'] grid_pos - 1, 1, 1, 1 + 2,0,1,4 notebook @@ -403,7 +384,7 @@ _coordinate - (973, 20) + (12, 249) _rotation @@ -411,88 +392,86 @@ - variable + wxgui_fftsink2 id - config_filename + rx_fft _enabled True - value - os.environ['HOME']+'/.gnuradio/config.conf' + type + complex - _coordinate - (12, 129) + title + RX Spectrum - _rotation - 0 + samp_rate + sample_rate - - - import - id - import_0 + baseband_freq + freq - _enabled - True + y_per_div + 5 - import - import math, os + y_divs + 8 - _coordinate - (11, 76) + ref_level + -5 - _rotation - 0 + ref_scale + 2.0 - - - variable_config - id - saved_freq + fft_size + 1024 - _enabled - True + fft_rate + 15 - value - 1698e6 + peak_hold + False - type - real + average + True - config_file - config_filename + avg_alpha + 0.1 - section - 'usrp_rx_hrpt' + win + None - option - 'freq' + win_size + 640, 360 - writeback - freq + grid_pos + 0, 0, 1, 1 + + + notebook + displays, 0 _coordinate - (507, 258) + (477, 457) _rotation @@ -500,10 +479,10 @@ - variable_config + variable id - saved_gain + max_clock_offset _enabled @@ -511,31 +490,11 @@ value - 35 - - - type - real - - - config_file - config_filename - - - section - 'usrp_rx_hrpt' - - - option - 'gain' - - - writeback - gain + 100e-6 _coordinate - (664, 259) + (705, 19) _rotation @@ -543,54 +502,69 @@ - variable_slider + gr_agc_xx id - clock_alpha + agc _enabled True - label - Clock Alpha + type + complex - value - saved_clock_alpha + rate + 1e-6 - min - 0.0 + reference + 1.0 - max - 0.5 + gain + 1.0 - num_steps - 100 + max_gain + 1.0 - style - wx.SL_HORIZONTAL + _coordinate + (301, 705) - converver - float_converter + _rotation + 0 + + + noaa_hrpt_pll_cf - grid_pos - 0, 3, 1, 1 + id + pll - notebook - + _enabled + True + + + alpha + pll_alpha + + + beta + pll_alpha**2/4.0 + + + max_offset + max_carrier_offset _coordinate - (618, 106) + (469, 713) _rotation @@ -601,7 +575,7 @@ variable_config id - side + addr _enabled @@ -609,7 +583,7 @@ value - 'A' + "" type @@ -625,11 +599,11 @@ option - 'side' + 'addr' writeback - side + addr _coordinate @@ -641,88 +615,622 @@ - notebook + uhd_usrp_source id - displays + uhd_usrp_source_0 _enabled True - style - wx.NB_TOP + type + complex - labels - ['Spectrum','Demod'] + dev_addr + addr - grid_pos - 2,0,1,4 + sync + - notebook - + clock_rate + 0.0 - _coordinate - (12, 249) + num_mboards + 1 - _rotation - 0 + ref_source0 + - - - gr_file_sink - id - frame_sink + sd_spec0 + - _enabled - True + ref_source1 + + + + sd_spec1 + + + + ref_source2 + + + + sd_spec2 + + + + ref_source3 + + + + sd_spec3 + + + + ref_source4 + + + + sd_spec4 + + + + ref_source5 + + + + sd_spec5 + + + + ref_source6 + + + + sd_spec6 + + + + ref_source7 + + + + sd_spec7 + + + + nchan + 1 + + + samp_rate + sample_rate + + + center_freq0 + freq + + + gain0 + 0 + + + ant0 + + + + bw0 + 0 + + + center_freq1 + 0 + + + gain1 + 0 + + + ant1 + + + + bw1 + 0 + + + center_freq2 + 0 + + + gain2 + 0 + + + ant2 + + + + bw2 + 0 + + + center_freq3 + 0 + + + gain3 + 0 + + + ant3 + + + + bw3 + 0 + + + center_freq4 + 0 + + + gain4 + 0 + + + ant4 + + + + bw4 + 0 + + + center_freq5 + 0 + + + gain5 + 0 + + + ant5 + + + + bw5 + 0 + + + center_freq6 + 0 + + + gain6 + 0 + + + ant6 + + + + bw6 + 0 + + + center_freq7 + 0 + + + gain7 + 0 + + + ant7 + + + + bw7 + 0 + + + center_freq8 + 0 + + + gain8 + 0 + + + ant8 + + + + bw8 + 0 + + + center_freq9 + 0 + + + gain9 + 0 + + + ant9 + + + + bw9 + 0 + + + center_freq10 + 0 + + + gain10 + 0 + + + ant10 + + + + bw10 + 0 + + + center_freq11 + 0 + + + gain11 + 0 + + + ant11 + + + + bw11 + 0 + + + center_freq12 + 0 + + + gain12 + 0 + + + ant12 + + + + bw12 + 0 + + + center_freq13 + 0 + + + gain13 + 0 + + + ant13 + + + + bw13 + 0 + + + center_freq14 + 0 + + + gain14 + 0 + + + ant14 + + + + bw14 + 0 + + + center_freq15 + 0 + + + gain15 + 0 + + + ant15 + + + + bw15 + 0 + + + center_freq16 + 0 + + + gain16 + 0 + + + ant16 + + + + bw16 + 0 + + + center_freq17 + 0 + + + gain17 + 0 + + + ant17 + + + + bw17 + 0 + + + center_freq18 + 0 + + + gain18 + 0 + + + ant18 + + + + bw18 + 0 + + + center_freq19 + 0 + + + gain19 + 0 + + + ant19 + + + + bw19 + 0 + + + center_freq20 + 0 + + + gain20 + 0 + + + ant20 + + + + bw20 + 0 + + + center_freq21 + 0 + + + gain21 + 0 + + + ant21 + + + + bw21 + 0 + + + center_freq22 + 0 + + + gain22 + 0 + + + ant22 + + + + bw22 + 0 + + + center_freq23 + 0 + + + gain23 + 0 + + + ant23 + + + + bw23 + 0 + + + center_freq24 + 0 + + + gain24 + 0 + + + ant24 + + + + bw24 + 0 + + + center_freq25 + 0 + + + gain25 + 0 + + + ant25 + + + + bw25 + 0 + + + center_freq26 + 0 + + + gain26 + 0 + + + ant26 + + + + bw26 + 0 + + + center_freq27 + 0 + + + gain27 + 0 + + + ant27 + + + + bw27 + 0 + + + center_freq28 + 0 + + + gain28 + 0 + + + ant28 + + + + bw28 + 0 + + + center_freq29 + 0 + + + gain29 + 0 + + + ant29 + + + + bw29 + 0 - file - output_filename + center_freq30 + 0 - type - short + gain30 + 0 - vlen - 1 + ant30 + - _coordinate - (973, 1024) + bw30 + 0 - _rotation + center_freq31 0 - - - virtual_source - id - virtual_source_0 + gain31 + 0 - _enabled - True + ant31 + - stream_id - baseband + bw31 + 0 _coordinate - (173, 971) + (49, 713) _rotation @@ -730,109 +1238,131 @@ - wxgui_scopesink2 + variable_static_text id - demod_scope + addr_text _enabled True - type - float + label + USRP Addr - title - Post-Demod + value + addr - samp_rate - sym_rate*2.0 + converver + str_converter - v_scale - 0.5 + formatter + None - v_offset + grid_pos + 1, 0, 1, 1 + + + notebook + + + + _coordinate + (828, 20) + + + _rotation 0 + + + variable_static_text - t_scale - 10.0/sym_rate + id + rate_text - ac_couple - False + _enabled + True - xy_mode - False + label + Baseband Rate - num_inputs - 1 + value + sample_rate - win_size - + converver + float_converter + + + formatter + None grid_pos - 0, 0, 1, 1 + 1, 1, 1, 1 notebook - displays, 1 + _coordinate - (666, 542) + (973, 20) _rotation - 180 + 0 - gr_clock_recovery_mm_xx + import id - gr_clock_recovery_mm_xx_0 + import_0 _enabled True - type - float + import + import math, os - omega - sps/2.0 + _coordinate + (9, 106) - gain_omega - clock_alpha**2/4.0 + _rotation + 0 + + + variable - mu - 0.5 + id + config_filename - gain_mu - clock_alpha + _enabled + True - omega_relative_limit - max_clock_offset + value + os.environ['HOME']+'/.gnuradio/config.conf' _coordinate - (873, 696) + (13, 168) _rotation @@ -840,34 +1370,42 @@ - gr_moving_average_xx + variable_config id - gr_moving_average_xx_0 + output_filename _enabled True + + value + 'frames.hrpt' + type - float + string - length - hs + config_file + config_filename - scale - 1.0/hs + section + 'usrp_rx_hrpt' - max_iter - 4000 + option + 'filename' + + + writeback + output_filename _coordinate - (682, 713) + (990, 255) _rotation @@ -875,30 +1413,42 @@ - noaa_hrpt_pll_cf + variable_config id - pll + saved_clock_alpha _enabled True - alpha - pll_alpha + value + 0.01 - beta - pll_alpha**2/4.0 + type + real - max_offset - max_carrier_offset + config_file + config_filename + + + section + 'usrp_rx_hrpt' + + + option + 'clock_alpha' + + + writeback + clock_alpha _coordinate - (469, 713) + (832, 254) _rotation @@ -906,22 +1456,42 @@ - virtual_sink + variable_config id - virtual_sink_0 + saved_pll_alpha _enabled True - stream_id - baseband + value + 0.01 + + + type + real + + + config_file + config_filename + + + section + 'usrp_rx_hrpt' + + + option + 'pll_alpha' + + + writeback + pll_alpha _coordinate - (1142, 728) + (674, 254) _rotation @@ -929,38 +1499,42 @@ - gr_agc_xx + variable_config id - agc + saved_gain _enabled True + + value + 35 + type - complex + real - rate - 1e-6 + config_file + config_filename - reference - 1.0 + section + 'usrp_rx_hrpt' - gain - 1.0 + option + 'gain' - max_gain - 1.0 + writeback + gain _coordinate - (301, 705) + (515, 255) _rotation @@ -968,58 +1542,42 @@ - usrp_simple_source_x + variable_config id - usrp_source + saved_freq _enabled True - type - complex - - - format - - - - which - 0 - - - decimation - decim - - - frequency - freq + value + 1698e6 - lo_offset - float('inf') + type + real - gain - gain + config_file + config_filename - side - side + section + 'usrp_rx_hrpt' - rx_ant - RXA + option + 'freq' - hb_filters - + writeback + freq _coordinate - (89, 689) + (358, 254) _rotation @@ -1027,74 +1585,77 @@ - wxgui_fftsink2 + variable id - rx_fft + sample_rate _enabled True - type - complex + value + 4e6 - title - RX Spectrum + _coordinate + (198, 17) - samp_rate - sample_rate + _rotation + 0 + + + wxgui_scopesink2 - baseband_freq - freq + id + demod_scope - y_per_div - 5 + _enabled + True - y_divs - 8 + type + float - ref_level - -5 + title + Post-Demod - ref_scale - 2.0 + samp_rate + sym_rate*2.0 - fft_size - 1024 + v_scale + 0.5 - fft_rate - 15 + v_offset + 0 - peak_hold - False + t_scale + 10.0/sym_rate - average - True + ac_couple + False - avg_alpha - 0.1 + xy_mode + False - win - None + num_inputs + 1 win_size - 640, 360 + grid_pos @@ -1102,49 +1663,54 @@ notebook - displays, 0 + displays, 1 + + + trig_mode + gr.gr_TRIG_MODE_AUTO + + + y_axis_label + Counts _coordinate - (477, 457) + (666, 542) _rotation - 0 + 180 - gr_binary_slicer_fb + gr_moving_average_xx id - gr_binary_slicer_fb_0 + gr_moving_average_xx_0 _enabled True - _coordinate - (393, 975) + type + float - _rotation - 0 + length + hs - - - noaa_hrpt_deframer - id - deframer + scale + 1.0/hs - _enabled - True + max_iter + 4000 _coordinate - (762, 975) + (682, 713) _rotation @@ -1152,42 +1718,22 @@ - variable_config + virtual_sink id - decim + virtual_sink_0 _enabled True - value - 32 - - - type - real - - - config_file - config_filename - - - section - 'usrp_rx_hrpt' - - - option - 'decim' - - - writeback - decim + stream_id + baseband _coordinate - (351, 255) + (1138, 729) _rotation @@ -1195,42 +1741,42 @@ - variable_config + digital_clock_recovery_mm_xx id - saved_pll_alpha + digital_clock_recovery_mm_xx_0 _enabled True - value - 0.01 + type + float - type - real + omega + sps/2.0 - config_file - config_filename + gain_omega + clock_alpha**2/4.0 - section - 'usrp_rx_hrpt' + mu + 0.5 - option - 'pll_alpha' + gain_mu + clock_alpha - writeback - pll_alpha + omega_relative_limit + max_clock_offset _coordinate - (823, 258) + (896, 697) _rotation @@ -1238,42 +1784,22 @@ - variable_config + virtual_source id - saved_clock_alpha + virtual_source_0 _enabled True - value - 0.01 - - - type - real - - - config_file - config_filename - - - section - 'usrp_rx_hrpt' - - - option - 'clock_alpha' - - - writeback - clock_alpha + stream_id + baseband _coordinate - (981, 258) + (173, 971) _rotation @@ -1281,42 +1807,37 @@ - variable_config + digital_binary_slicer_fb id - output_filename + digital_binary_slicer_fb_0 _enabled True - value - 'frames.hrpt' - - - type - string - - - config_file - config_filename + _coordinate + (423, 975) - section - 'usrp_rx_hrpt' + _rotation + 0 + + + noaa_hrpt_deframer - option - 'filename' + id + deframer - writeback - output_filename + _enabled + True _coordinate - (1139, 259) + (762, 975) _rotation @@ -1351,34 +1872,40 @@ - variable + gr_file_sink id - max_clock_offset + frame_sink _enabled True - value - 100e-6 + file + output_filename + + + type + short + + + vlen + 1 + + + unbuffered + False _coordinate - (705, 19) + (973, 1024) _rotation 0 - - virtual_source_0 - gr_binary_slicer_fb_0 - 0 - 0 - deframer frame_sink @@ -1392,20 +1919,20 @@ 0 - gr_clock_recovery_mm_xx_0 - virtual_sink_0 + agc + pll 0 0 - gr_clock_recovery_mm_xx_0 - demod_scope + agc + rx_fft 0 0 - gr_moving_average_xx_0 - gr_clock_recovery_mm_xx_0 + uhd_usrp_source_0 + agc 0 0 @@ -1416,25 +1943,31 @@ 0 - agc - pll + gr_moving_average_xx_0 + demod_scope 0 0 - usrp_source - agc + gr_moving_average_xx_0 + digital_clock_recovery_mm_xx_0 0 0 - agc - rx_fft + digital_clock_recovery_mm_xx_0 + virtual_sink_0 + 0 + 0 + + + virtual_source_0 + digital_binary_slicer_fb_0 0 0 - gr_binary_slicer_fb_0 + digital_binary_slicer_fb_0 deframer 0 0 diff --git a/gr-noaa/apps/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py index 48c5f9d29..e603e768e 100755 --- a/gr-noaa/apps/usrp_rx_hrpt.py +++ b/gr-noaa/apps/usrp_rx_hrpt.py @@ -2,19 +2,20 @@ ################################################## # Gnuradio Python Flow Graph # Title: USRP HRPT Receiver -# Generated: Mon Nov 9 07:56:11 2009 +# Generated: Thu Oct 27 13:26:42 2011 ################################################## +from gnuradio import digital from gnuradio import eng_notation from gnuradio import gr from gnuradio import noaa +from gnuradio import uhd from gnuradio import window from gnuradio.eng_option import eng_option from gnuradio.gr import firdes from gnuradio.wxgui import fftsink2 from gnuradio.wxgui import forms from gnuradio.wxgui import scopesink2 -from grc_gnuradio import usrp as grc_usrp from grc_gnuradio import wxgui as grc_wxgui from optparse import OptionParser import ConfigParser @@ -29,20 +30,10 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui): ################################################## # Variables ################################################## - self.config_filename = config_filename = os.environ['HOME']+'/.gnuradio/config.conf' - self._decim_config = ConfigParser.ConfigParser() - self._decim_config.read(config_filename) - try: decim = self._decim_config.getfloat('usrp_rx_hrpt', 'decim') - except: decim = 32 - self.decim = decim self.sym_rate = sym_rate = 600*1109 - self.sample_rate = sample_rate = 64e6/decim + self.sample_rate = sample_rate = 4e6 + self.config_filename = config_filename = os.environ['HOME']+'/.gnuradio/config.conf' self.sps = sps = sample_rate/sym_rate - self._side_config = ConfigParser.ConfigParser() - self._side_config.read(config_filename) - try: side = self._side_config.get('usrp_rx_hrpt', 'side') - except: side = 'A' - self.side = side self._saved_pll_alpha_config = ConfigParser.ConfigParser() self._saved_pll_alpha_config.read(config_filename) try: saved_pll_alpha = self._saved_pll_alpha_config.getfloat('usrp_rx_hrpt', 'pll_alpha') @@ -63,7 +54,12 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui): try: saved_clock_alpha = self._saved_clock_alpha_config.getfloat('usrp_rx_hrpt', 'clock_alpha') except: saved_clock_alpha = 0.01 self.saved_clock_alpha = saved_clock_alpha - self.side_text = side_text = side + self._addr_config = ConfigParser.ConfigParser() + self._addr_config.read(config_filename) + try: addr = self._addr_config.get('usrp_rx_hrpt', 'addr') + except: addr = "" + self.addr = addr + self.rate_text = rate_text = sample_rate self.pll_alpha = pll_alpha = saved_pll_alpha self._output_filename_config = ConfigParser.ConfigParser() self._output_filename_config.read(config_filename) @@ -75,28 +71,80 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui): self.hs = hs = int(sps/2.0) self.gain = gain = saved_gain self.freq = freq = saved_freq - self.decim_text = decim_text = decim self.clock_alpha = clock_alpha = saved_clock_alpha + self.addr_text = addr_text = addr ################################################## - # Notebooks + # Blocks ################################################## - self.displays = wx.Notebook(self.GetWin(), style=wx.NB_TOP) + self._freq_text_box = forms.text_box( + parent=self.GetWin(), + value=self.freq, + callback=self.set_freq, + label="Frequency", + converter=forms.float_converter(), + ) + self.GridAdd(self._freq_text_box, 0, 0, 1, 1) + self.displays = self.displays = wx.Notebook(self.GetWin(), style=wx.NB_TOP) self.displays.AddPage(grc_wxgui.Panel(self.displays), "Spectrum") self.displays.AddPage(grc_wxgui.Panel(self.displays), "Demod") self.GridAdd(self.displays, 2, 0, 1, 4) - - ################################################## - # Controls - ################################################## - self._side_text_static_text = forms.static_text( + _clock_alpha_sizer = wx.BoxSizer(wx.VERTICAL) + self._clock_alpha_text_box = forms.text_box( parent=self.GetWin(), - value=self.side_text, - callback=self.set_side_text, - label="USRP Side", - converter=forms.str_converter(), + sizer=_clock_alpha_sizer, + value=self.clock_alpha, + callback=self.set_clock_alpha, + label="Clock Alpha", + converter=forms.float_converter(), + proportion=0, + ) + self._clock_alpha_slider = forms.slider( + parent=self.GetWin(), + sizer=_clock_alpha_sizer, + value=self.clock_alpha, + callback=self.set_clock_alpha, + minimum=0.0, + maximum=0.5, + num_steps=100, + style=wx.SL_HORIZONTAL, + cast=float, + proportion=1, + ) + self.GridAdd(_clock_alpha_sizer, 0, 3, 1, 1) + self.uhd_usrp_source_0 = uhd.usrp_source( + device_addr=addr, + io_type=uhd.io_type.COMPLEX_FLOAT32, + num_channels=1, ) - self.GridAdd(self._side_text_static_text, 1, 0, 1, 1) + self.uhd_usrp_source_0.set_samp_rate(sample_rate) + self.uhd_usrp_source_0.set_center_freq(freq, 0) + self.uhd_usrp_source_0.set_gain(0, 0) + self.rx_fft = fftsink2.fft_sink_c( + self.displays.GetPage(0).GetWin(), + baseband_freq=freq, + y_per_div=5, + y_divs=8, + ref_level=-5, + ref_scale=2.0, + sample_rate=sample_rate, + fft_size=1024, + fft_rate=15, + average=True, + avg_alpha=0.1, + title="RX Spectrum", + peak_hold=False, + size=(640, 360), + ) + self.displays.GetPage(0).GridAdd(self.rx_fft.win, 0, 0, 1, 1) + self._rate_text_static_text = forms.static_text( + parent=self.GetWin(), + value=self.rate_text, + callback=self.set_rate_text, + label="Baseband Rate", + converter=forms.float_converter(), + ) + self.GridAdd(self._rate_text_static_text, 1, 1, 1, 1) _pll_alpha_sizer = wx.BoxSizer(wx.VERTICAL) self._pll_alpha_text_box = forms.text_box( parent=self.GetWin(), @@ -120,6 +168,8 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui): proportion=1, ) self.GridAdd(_pll_alpha_sizer, 0, 2, 1, 1) + self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset) + self.gr_moving_average_xx_0 = gr.moving_average_ff(hs, 1.0/hs, 4000) _gain_sizer = wx.BoxSizer(wx.VERTICAL) self._gain_text_box = forms.text_box( parent=self.GetWin(), @@ -143,52 +193,10 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui): proportion=1, ) self.GridAdd(_gain_sizer, 0, 1, 1, 1) - self._freq_text_box = forms.text_box( - parent=self.GetWin(), - value=self.freq, - callback=self.set_freq, - label="Frequency", - converter=forms.float_converter(), - ) - self.GridAdd(self._freq_text_box, 0, 0, 1, 1) - self._decim_text_static_text = forms.static_text( - parent=self.GetWin(), - value=self.decim_text, - callback=self.set_decim_text, - label="Decimation", - converter=forms.float_converter(), - ) - self.GridAdd(self._decim_text_static_text, 1, 1, 1, 1) - _clock_alpha_sizer = wx.BoxSizer(wx.VERTICAL) - self._clock_alpha_text_box = forms.text_box( - parent=self.GetWin(), - sizer=_clock_alpha_sizer, - value=self.clock_alpha, - callback=self.set_clock_alpha, - label="Clock Alpha", - converter=forms.float_converter(), - proportion=0, - ) - self._clock_alpha_slider = forms.slider( - parent=self.GetWin(), - sizer=_clock_alpha_sizer, - value=self.clock_alpha, - callback=self.set_clock_alpha, - minimum=0.0, - maximum=0.5, - num_steps=100, - style=wx.SL_HORIZONTAL, - cast=float, - proportion=1, - ) - self.GridAdd(_clock_alpha_sizer, 0, 3, 1, 1) - - ################################################## - # Blocks - ################################################## - self.agc = gr.agc_cc(1e-6, 1.0, 1.0, 1.0) - self.decoder = noaa.hrpt_decoder(True,True) - self.deframer = noaa.hrpt_deframer() + self.frame_sink = gr.file_sink(gr.sizeof_short*1, output_filename) + self.frame_sink.set_unbuffered(False) + self.digital_clock_recovery_mm_xx_0 = digital.clock_recovery_mm_ff(sps/2.0, clock_alpha**2/4.0, 0.5, clock_alpha, max_clock_offset) + self.digital_binary_slicer_fb_0 = digital.binary_slicer_fb() self.demod_scope = scopesink2.scope_sink_f( self.displays.GetPage(1).GetWin(), title="Post-Demod", @@ -199,151 +207,155 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui): ac_couple=False, xy_mode=False, num_inputs=1, + trig_mode=gr.gr_TRIG_MODE_AUTO, + y_axis_label="Counts", ) self.displays.GetPage(1).GridAdd(self.demod_scope.win, 0, 0, 1, 1) - self.frame_sink = gr.file_sink(gr.sizeof_short*1, output_filename) - self.gr_binary_slicer_fb_0 = gr.binary_slicer_fb() - self.gr_clock_recovery_mm_xx_0 = gr.clock_recovery_mm_ff(sps/2.0, clock_alpha**2/4.0, 0.5, clock_alpha, max_clock_offset) - self.gr_moving_average_xx_0 = gr.moving_average_ff(hs, 1.0/hs, 4000) - self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset) - self.rx_fft = fftsink2.fft_sink_c( - self.displays.GetPage(0).GetWin(), - baseband_freq=freq, - y_per_div=5, - y_divs=8, - ref_level=-5, - ref_scale=2.0, - sample_rate=sample_rate, - fft_size=1024, - fft_rate=15, - average=True, - avg_alpha=0.1, - title="RX Spectrum", - peak_hold=False, - size=(640, 360), + self.deframer = noaa.hrpt_deframer() + self.decoder = noaa.hrpt_decoder(True,True) + self.agc = gr.agc_cc(1e-6, 1.0, 1.0, 1.0) + self._addr_text_static_text = forms.static_text( + parent=self.GetWin(), + value=self.addr_text, + callback=self.set_addr_text, + label="USRP Addr", + converter=forms.str_converter(), ) - self.displays.GetPage(0).GridAdd(self.rx_fft.win, 0, 0, 1, 1) - self.usrp_source = grc_usrp.simple_source_c(which=0, side=side, rx_ant="RXA") - self.usrp_source.set_decim_rate(decim) - self.usrp_source.set_frequency(freq, verbose=True) - self.usrp_source.set_gain(gain) + self.GridAdd(self._addr_text_static_text, 1, 0, 1, 1) ################################################## # Connections ################################################## - self.connect((self.gr_clock_recovery_mm_xx_0, 0), (self.gr_binary_slicer_fb_0, 0)) self.connect((self.deframer, 0), (self.frame_sink, 0)) self.connect((self.deframer, 0), (self.decoder, 0)) - self.connect((self.gr_clock_recovery_mm_xx_0, 0), (self.demod_scope, 0)) - self.connect((self.gr_moving_average_xx_0, 0), (self.gr_clock_recovery_mm_xx_0, 0)) - self.connect((self.pll, 0), (self.gr_moving_average_xx_0, 0)) self.connect((self.agc, 0), (self.pll, 0)) - self.connect((self.usrp_source, 0), (self.agc, 0)) self.connect((self.agc, 0), (self.rx_fft, 0)) - self.connect((self.gr_binary_slicer_fb_0, 0), (self.deframer, 0)) - - def set_config_filename(self, config_filename): - self.config_filename = config_filename - self._saved_freq_config = ConfigParser.ConfigParser() - self._saved_freq_config.read(self.config_filename) - if not self._saved_freq_config.has_section('usrp_rx_hrpt'): - self._saved_freq_config.add_section('usrp_rx_hrpt') - self._saved_freq_config.set('usrp_rx_hrpt', 'freq', str(self.freq)) - self._saved_freq_config.write(open(self.config_filename, 'w')) - self._saved_gain_config = ConfigParser.ConfigParser() - self._saved_gain_config.read(self.config_filename) - if not self._saved_gain_config.has_section('usrp_rx_hrpt'): - self._saved_gain_config.add_section('usrp_rx_hrpt') - self._saved_gain_config.set('usrp_rx_hrpt', 'gain', str(self.gain)) - self._saved_gain_config.write(open(self.config_filename, 'w')) - self._side_config = ConfigParser.ConfigParser() - self._side_config.read(self.config_filename) - if not self._side_config.has_section('usrp_rx_hrpt'): - self._side_config.add_section('usrp_rx_hrpt') - self._side_config.set('usrp_rx_hrpt', 'side', str(self.side)) - self._side_config.write(open(self.config_filename, 'w')) - self._decim_config = ConfigParser.ConfigParser() - self._decim_config.read(self.config_filename) - if not self._decim_config.has_section('usrp_rx_hrpt'): - self._decim_config.add_section('usrp_rx_hrpt') - self._decim_config.set('usrp_rx_hrpt', 'decim', str(self.decim)) - self._decim_config.write(open(self.config_filename, 'w')) - self._saved_pll_alpha_config = ConfigParser.ConfigParser() - self._saved_pll_alpha_config.read(self.config_filename) - if not self._saved_pll_alpha_config.has_section('usrp_rx_hrpt'): - self._saved_pll_alpha_config.add_section('usrp_rx_hrpt') - self._saved_pll_alpha_config.set('usrp_rx_hrpt', 'pll_alpha', str(self.pll_alpha)) - self._saved_pll_alpha_config.write(open(self.config_filename, 'w')) - self._saved_clock_alpha_config = ConfigParser.ConfigParser() - self._saved_clock_alpha_config.read(self.config_filename) - if not self._saved_clock_alpha_config.has_section('usrp_rx_hrpt'): - self._saved_clock_alpha_config.add_section('usrp_rx_hrpt') - self._saved_clock_alpha_config.set('usrp_rx_hrpt', 'clock_alpha', str(self.clock_alpha)) - self._saved_clock_alpha_config.write(open(self.config_filename, 'w')) - self._output_filename_config = ConfigParser.ConfigParser() - self._output_filename_config.read(self.config_filename) - if not self._output_filename_config.has_section('usrp_rx_hrpt'): - self._output_filename_config.add_section('usrp_rx_hrpt') - self._output_filename_config.set('usrp_rx_hrpt', 'filename', str(self.output_filename)) - self._output_filename_config.write(open(self.config_filename, 'w')) + self.connect((self.uhd_usrp_source_0, 0), (self.agc, 0)) + self.connect((self.pll, 0), (self.gr_moving_average_xx_0, 0)) + self.connect((self.gr_moving_average_xx_0, 0), (self.demod_scope, 0)) + self.connect((self.gr_moving_average_xx_0, 0), (self.digital_clock_recovery_mm_xx_0, 0)) + self.connect((self.digital_clock_recovery_mm_xx_0, 0), (self.digital_binary_slicer_fb_0, 0)) + self.connect((self.digital_binary_slicer_fb_0, 0), (self.deframer, 0)) - def set_decim(self, decim): - self.decim = decim - self.set_sample_rate(64e6/self.decim) - self.set_decim_text(self.decim) - self.usrp_source.set_decim_rate(self.decim) - self._decim_config = ConfigParser.ConfigParser() - self._decim_config.read(self.config_filename) - if not self._decim_config.has_section('usrp_rx_hrpt'): - self._decim_config.add_section('usrp_rx_hrpt') - self._decim_config.set('usrp_rx_hrpt', 'decim', str(self.decim)) - self._decim_config.write(open(self.config_filename, 'w')) + def get_sym_rate(self): + return self.sym_rate def set_sym_rate(self, sym_rate): self.sym_rate = sym_rate self.set_sps(self.sample_rate/self.sym_rate) self.demod_scope.set_sample_rate(self.sym_rate*2.0) + def get_sample_rate(self): + return self.sample_rate + def set_sample_rate(self, sample_rate): self.sample_rate = sample_rate self.set_max_carrier_offset(2*math.pi*100e3/self.sample_rate) self.set_sps(self.sample_rate/self.sym_rate) self.rx_fft.set_sample_rate(self.sample_rate) + self.uhd_usrp_source_0.set_samp_rate(self.sample_rate) + self.set_rate_text(self.sample_rate) + + def get_config_filename(self): + return self.config_filename + + def set_config_filename(self, config_filename): + self.config_filename = config_filename + self._addr_config = ConfigParser.ConfigParser() + self._addr_config.read(self.config_filename) + if not self._addr_config.has_section('usrp_rx_hrpt'): + self._addr_config.add_section('usrp_rx_hrpt') + self._addr_config.set('usrp_rx_hrpt', 'addr', str(self.addr)) + self._addr_config.write(open(self.config_filename, 'w')) + self._output_filename_config = ConfigParser.ConfigParser() + self._output_filename_config.read(self.config_filename) + if not self._output_filename_config.has_section('usrp_rx_hrpt'): + self._output_filename_config.add_section('usrp_rx_hrpt') + self._output_filename_config.set('usrp_rx_hrpt', 'filename', str(self.output_filename)) + self._output_filename_config.write(open(self.config_filename, 'w')) + self._saved_clock_alpha_config = ConfigParser.ConfigParser() + self._saved_clock_alpha_config.read(self.config_filename) + if not self._saved_clock_alpha_config.has_section('usrp_rx_hrpt'): + self._saved_clock_alpha_config.add_section('usrp_rx_hrpt') + self._saved_clock_alpha_config.set('usrp_rx_hrpt', 'clock_alpha', str(self.clock_alpha)) + self._saved_clock_alpha_config.write(open(self.config_filename, 'w')) + self._saved_pll_alpha_config = ConfigParser.ConfigParser() + self._saved_pll_alpha_config.read(self.config_filename) + if not self._saved_pll_alpha_config.has_section('usrp_rx_hrpt'): + self._saved_pll_alpha_config.add_section('usrp_rx_hrpt') + self._saved_pll_alpha_config.set('usrp_rx_hrpt', 'pll_alpha', str(self.pll_alpha)) + self._saved_pll_alpha_config.write(open(self.config_filename, 'w')) + self._saved_gain_config = ConfigParser.ConfigParser() + self._saved_gain_config.read(self.config_filename) + if not self._saved_gain_config.has_section('usrp_rx_hrpt'): + self._saved_gain_config.add_section('usrp_rx_hrpt') + self._saved_gain_config.set('usrp_rx_hrpt', 'gain', str(self.gain)) + self._saved_gain_config.write(open(self.config_filename, 'w')) + self._saved_freq_config = ConfigParser.ConfigParser() + self._saved_freq_config.read(self.config_filename) + if not self._saved_freq_config.has_section('usrp_rx_hrpt'): + self._saved_freq_config.add_section('usrp_rx_hrpt') + self._saved_freq_config.set('usrp_rx_hrpt', 'freq', str(self.freq)) + self._saved_freq_config.write(open(self.config_filename, 'w')) + + def get_sps(self): + return self.sps def set_sps(self, sps): self.sps = sps self.set_hs(int(self.sps/2.0)) - self.gr_clock_recovery_mm_xx_0.set_omega(self.sps/2.0) - - def set_side(self, side): - self.side = side - self.set_side_text(self.side) - self._side_config = ConfigParser.ConfigParser() - self._side_config.read(self.config_filename) - if not self._side_config.has_section('usrp_rx_hrpt'): - self._side_config.add_section('usrp_rx_hrpt') - self._side_config.set('usrp_rx_hrpt', 'side', str(self.side)) - self._side_config.write(open(self.config_filename, 'w')) + self.digital_clock_recovery_mm_xx_0.set_omega(self.sps/2.0) + + def get_saved_pll_alpha(self): + return self.saved_pll_alpha def set_saved_pll_alpha(self, saved_pll_alpha): self.saved_pll_alpha = saved_pll_alpha self.set_pll_alpha(self.saved_pll_alpha) + def get_saved_gain(self): + return self.saved_gain + def set_saved_gain(self, saved_gain): self.saved_gain = saved_gain self.set_gain(self.saved_gain) + def get_saved_freq(self): + return self.saved_freq + def set_saved_freq(self, saved_freq): self.saved_freq = saved_freq self.set_freq(self.saved_freq) + def get_saved_clock_alpha(self): + return self.saved_clock_alpha + def set_saved_clock_alpha(self, saved_clock_alpha): self.saved_clock_alpha = saved_clock_alpha self.set_clock_alpha(self.saved_clock_alpha) - def set_side_text(self, side_text): - self.side_text = side_text - self._side_text_static_text.set_value(self.side_text) + def get_addr(self): + return self.addr + + def set_addr(self, addr): + self.addr = addr + self._addr_config = ConfigParser.ConfigParser() + self._addr_config.read(self.config_filename) + if not self._addr_config.has_section('usrp_rx_hrpt'): + self._addr_config.add_section('usrp_rx_hrpt') + self._addr_config.set('usrp_rx_hrpt', 'addr', str(self.addr)) + self._addr_config.write(open(self.config_filename, 'w')) + self.set_addr_text(self.addr) + + def get_rate_text(self): + return self.rate_text + + def set_rate_text(self, rate_text): + self.rate_text = rate_text + self._rate_text_static_text.set_value(self.rate_text) + + def get_pll_alpha(self): + return self.pll_alpha def set_pll_alpha(self, pll_alpha): self.pll_alpha = pll_alpha @@ -358,6 +370,9 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui): self._saved_pll_alpha_config.set('usrp_rx_hrpt', 'pll_alpha', str(self.pll_alpha)) self._saved_pll_alpha_config.write(open(self.config_filename, 'w')) + def get_output_filename(self): + return self.output_filename + def set_output_filename(self, output_filename): self.output_filename = output_filename self._output_filename_config = ConfigParser.ConfigParser() @@ -367,17 +382,29 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui): self._output_filename_config.set('usrp_rx_hrpt', 'filename', str(self.output_filename)) self._output_filename_config.write(open(self.config_filename, 'w')) + def get_max_clock_offset(self): + return self.max_clock_offset + def set_max_clock_offset(self, max_clock_offset): self.max_clock_offset = max_clock_offset + def get_max_carrier_offset(self): + return self.max_carrier_offset + def set_max_carrier_offset(self, max_carrier_offset): self.max_carrier_offset = max_carrier_offset self.pll.set_max_offset(self.max_carrier_offset) + def get_hs(self): + return self.hs + def set_hs(self, hs): self.hs = hs self.gr_moving_average_xx_0.set_length_and_scale(self.hs, 1.0/self.hs) + def get_gain(self): + return self.gain + def set_gain(self, gain): self.gain = gain self._gain_slider.set_value(self.gain) @@ -388,36 +415,44 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui): self._saved_gain_config.add_section('usrp_rx_hrpt') self._saved_gain_config.set('usrp_rx_hrpt', 'gain', str(self.gain)) self._saved_gain_config.write(open(self.config_filename, 'w')) - self.usrp_source.set_gain(self.gain) + + def get_freq(self): + return self.freq def set_freq(self, freq): self.freq = freq self._freq_text_box.set_value(self.freq) + self.rx_fft.set_baseband_freq(self.freq) + self.uhd_usrp_source_0.set_center_freq(self.freq, 0) self._saved_freq_config = ConfigParser.ConfigParser() self._saved_freq_config.read(self.config_filename) if not self._saved_freq_config.has_section('usrp_rx_hrpt'): self._saved_freq_config.add_section('usrp_rx_hrpt') self._saved_freq_config.set('usrp_rx_hrpt', 'freq', str(self.freq)) self._saved_freq_config.write(open(self.config_filename, 'w')) - self.usrp_source.set_frequency(self.freq) - self.rx_fft.set_baseband_freq(self.freq) - def set_decim_text(self, decim_text): - self.decim_text = decim_text - self._decim_text_static_text.set_value(self.decim_text) + def get_clock_alpha(self): + return self.clock_alpha def set_clock_alpha(self, clock_alpha): self.clock_alpha = clock_alpha self._clock_alpha_slider.set_value(self.clock_alpha) self._clock_alpha_text_box.set_value(self.clock_alpha) - self.gr_clock_recovery_mm_xx_0.set_gain_omega(self.clock_alpha**2/4.0) - self.gr_clock_recovery_mm_xx_0.set_gain_mu(self.clock_alpha) self._saved_clock_alpha_config = ConfigParser.ConfigParser() self._saved_clock_alpha_config.read(self.config_filename) if not self._saved_clock_alpha_config.has_section('usrp_rx_hrpt'): self._saved_clock_alpha_config.add_section('usrp_rx_hrpt') self._saved_clock_alpha_config.set('usrp_rx_hrpt', 'clock_alpha', str(self.clock_alpha)) self._saved_clock_alpha_config.write(open(self.config_filename, 'w')) + self.digital_clock_recovery_mm_xx_0.set_gain_omega(self.clock_alpha**2/4.0) + self.digital_clock_recovery_mm_xx_0.set_gain_mu(self.clock_alpha) + + def get_addr_text(self): + return self.addr_text + + def set_addr_text(self, addr_text): + self.addr_text = addr_text + self._addr_text_static_text.set_value(self.addr_text) if __name__ == '__main__': parser = OptionParser(option_class=eng_option, usage="%prog: [options]") diff --git a/gr-noaa/apps/usrp_rx_hrpt_nogui.grc b/gr-noaa/apps/usrp_rx_hrpt_nogui.grc index 22bd3bdc3..5936c94c8 100644 --- a/gr-noaa/apps/usrp_rx_hrpt_nogui.grc +++ b/gr-noaa/apps/usrp_rx_hrpt_nogui.grc @@ -1,6 +1,6 @@ - Mon Nov 9 08:03:25 2009 + Thu Oct 27 13:48:57 2011 options @@ -13,7 +13,7 @@ title - + USRP HRPT Receiver author @@ -45,7 +45,7 @@ realtime_scheduling - 1 + _coordinate @@ -152,7 +152,7 @@ variable id - sample_rate + max_clock_offset _enabled @@ -160,11 +160,34 @@ value - 64e6/decim + 100e-6 _coordinate - (198, 17) + (705, 19) + + + _rotation + 0 + + + + import + + id + import_0 + + + _enabled + True + + + import + import math, os + + + _coordinate + (9, 106) _rotation @@ -187,7 +210,7 @@ _coordinate - (13, 162) + (13, 168) _rotation @@ -195,22 +218,22 @@ - import + variable id - import_0 + sample_rate _enabled True - import - import math, os + value + 4e6 _coordinate - (11, 109) + (198, 17) _rotation @@ -221,7 +244,7 @@ variable_config id - gain + clock_alpha _enabled @@ -229,7 +252,7 @@ value - 35 + 0.01 type @@ -245,15 +268,15 @@ option - 'gain' + 'clock_alpha' writeback - gain + clock_alpha _coordinate - (668, 101) + (833, 104) _rotation @@ -264,7 +287,7 @@ variable_config id - freq + pll_alpha _enabled @@ -272,7 +295,7 @@ value - 1698e6 + 0.01 type @@ -288,15 +311,15 @@ option - 'freq' + 'pll_alpha' writeback - freq + pll_alpha _coordinate - (511, 100) + (675, 104) _rotation @@ -307,7 +330,7 @@ variable_config id - side + gain _enabled @@ -315,11 +338,11 @@ value - 'A' + 35 type - string + real config_file @@ -331,15 +354,15 @@ option - 'side' + 'gain' writeback - side + gain _coordinate - (198, 95) + (516, 105) _rotation @@ -347,38 +370,42 @@ - gr_agc_xx + variable_config id - agc + freq _enabled True + + value + 1698e6 + type - complex + real - rate - 1e-6 + config_file + config_filename - reference - 1.0 + section + 'usrp_rx_hrpt' - gain - 1.0 + option + 'freq' - max_gain - 1.0 + writeback + freq _coordinate - (339, 434) + (359, 104) _rotation @@ -386,58 +413,42 @@ - usrp_simple_source_x + variable_config id - usrp_source + output_filename _enabled True - type - complex - - - format - - - - which - 0 - - - decimation - decim - - - frequency - freq + value + 'frames.hrpt' - lo_offset - float('inf') + type + string - gain - gain + config_file + config_filename - side - side + section + 'usrp_rx_hrpt' - rx_ant - RXA + option + 'filename' - hb_filters - + writeback + output_filename _coordinate - (127, 418) + (991, 105) _rotation @@ -445,10 +456,10 @@ - gr_clock_recovery_mm_xx + digital_clock_recovery_mm_xx id - gr_clock_recovery_mm_xx_0 + digital_clock_recovery_mm_xx_0 _enabled @@ -480,7 +491,7 @@ _coordinate - (920, 426) + (897, 341) _rotation @@ -488,34 +499,22 @@ - gr_moving_average_xx + virtual_sink id - gr_moving_average_xx_0 + virtual_sink_0 _enabled True - type - float - - - length - hs - - - scale - 1.0/hs - - - max_iter - 4000 + stream_id + baseband _coordinate - (720, 442) + (1139, 373) _rotation @@ -523,188 +522,622 @@ - noaa_hrpt_pll_cf + uhd_usrp_source id - pll + uhd_usrp_source_0 _enabled True - alpha - pll_alpha - - - beta - pll_alpha**2/4.0 + type + complex - max_offset - max_carrier_offset + dev_addr + addr - _coordinate - (507, 442) + sync + - _rotation - 0 + clock_rate + 0.0 - - - virtual_sink - id - virtual_sink_0 + num_mboards + 1 - _enabled - True + ref_source0 + - stream_id - baseband + sd_spec0 + - _coordinate - (1180, 457) + ref_source1 + - _rotation - 0 + sd_spec1 + - - - gr_file_sink - id - frame_sink + ref_source2 + - _enabled - True + sd_spec2 + - file - output_filename + ref_source3 + - type - short + sd_spec3 + - vlen - 1 + ref_source4 + - _coordinate - (1026, 722) + sd_spec4 + - _rotation - 0 + ref_source5 + - - - virtual_source - id - virtual_source_0 + sd_spec5 + - _enabled - True + ref_source6 + - stream_id - baseband + sd_spec6 + - _coordinate - (226, 669) + ref_source7 + - _rotation - 0 + sd_spec7 + - - - gr_binary_slicer_fb - id - gr_binary_slicer_fb_0 + nchan + 1 - _enabled - True + samp_rate + sample_rate - _coordinate - (446, 673) + center_freq0 + freq - _rotation + gain0 0 - - - noaa_hrpt_deframer - id - deframer + ant0 + - _enabled - True + bw0 + 0 - _coordinate - (815, 673) + center_freq1 + 0 - _rotation + gain1 0 - - - variable_config - id - decim + ant1 + - _enabled - True + bw1 + 0 - value - 32 + center_freq2 + 0 - type - real + gain2 + 0 - config_file - config_filename + ant2 + - section - 'usrp_rx_hrpt' + bw2 + 0 - option - 'decim' + center_freq3 + 0 - writeback - decim + gain3 + 0 - _coordinate - (355, 97) + ant3 + + + + bw3 + 0 + + + center_freq4 + 0 + + + gain4 + 0 + + + ant4 + + + + bw4 + 0 + + + center_freq5 + 0 + + + gain5 + 0 + + + ant5 + + + + bw5 + 0 + + + center_freq6 + 0 + + + gain6 + 0 + + + ant6 + + + + bw6 + 0 + + + center_freq7 + 0 + + + gain7 + 0 + + + ant7 + + + + bw7 + 0 + + + center_freq8 + 0 + + + gain8 + 0 + + + ant8 + + + + bw8 + 0 + + + center_freq9 + 0 + + + gain9 + 0 + + + ant9 + + + + bw9 + 0 + + + center_freq10 + 0 + + + gain10 + 0 + + + ant10 + + + + bw10 + 0 + + + center_freq11 + 0 + + + gain11 + 0 + + + ant11 + + + + bw11 + 0 + + + center_freq12 + 0 + + + gain12 + 0 + + + ant12 + + + + bw12 + 0 + + + center_freq13 + 0 + + + gain13 + 0 + + + ant13 + + + + bw13 + 0 + + + center_freq14 + 0 + + + gain14 + 0 + + + ant14 + + + + bw14 + 0 + + + center_freq15 + 0 + + + gain15 + 0 + + + ant15 + + + + bw15 + 0 + + + center_freq16 + 0 + + + gain16 + 0 + + + ant16 + + + + bw16 + 0 + + + center_freq17 + 0 + + + gain17 + 0 + + + ant17 + + + + bw17 + 0 + + + center_freq18 + 0 + + + gain18 + 0 + + + ant18 + + + + bw18 + 0 + + + center_freq19 + 0 + + + gain19 + 0 + + + ant19 + + + + bw19 + 0 + + + center_freq20 + 0 + + + gain20 + 0 + + + ant20 + + + + bw20 + 0 + + + center_freq21 + 0 + + + gain21 + 0 + + + ant21 + + + + bw21 + 0 + + + center_freq22 + 0 + + + gain22 + 0 + + + ant22 + + + + bw22 + 0 + + + center_freq23 + 0 + + + gain23 + 0 + + + ant23 + + + + bw23 + 0 + + + center_freq24 + 0 + + + gain24 + 0 + + + ant24 + + + + bw24 + 0 + + + center_freq25 + 0 + + + gain25 + 0 + + + ant25 + + + + bw25 + 0 + + + center_freq26 + 0 + + + gain26 + 0 + + + ant26 + + + + bw26 + 0 + + + center_freq27 + 0 + + + gain27 + 0 + + + ant27 + + + + bw27 + 0 + + + center_freq28 + 0 + + + gain28 + 0 + + + ant28 + + + + bw28 + 0 + + + center_freq29 + 0 + + + gain29 + 0 + + + ant29 + + + + bw29 + 0 + + + center_freq30 + 0 + + + gain30 + 0 + + + ant30 + + + + bw30 + 0 + + + center_freq31 + 0 + + + gain31 + 0 + + + ant31 + + + + bw31 + 0 + + + _coordinate + (50, 357) _rotation @@ -712,42 +1145,69 @@ - variable_config + noaa_hrpt_pll_cf id - pll_alpha + pll _enabled True - value - 0.01 + alpha + pll_alpha + + + beta + pll_alpha**2/4.0 + + + max_offset + max_carrier_offset + + + _coordinate + (470, 357) + + + _rotation + 0 + + + + gr_agc_xx + + id + agc + + + _enabled + True type - real + complex - config_file - config_filename + rate + 1e-6 - section - 'usrp_rx_hrpt' + reference + 1.0 - option - 'pll_alpha' + gain + 1.0 - writeback - pll_alpha + max_gain + 1.0 _coordinate - (827, 100) + (302, 349) _rotation @@ -755,42 +1215,34 @@ - variable_config + gr_moving_average_xx id - clock_alpha + gr_moving_average_xx_0 _enabled True - - value - 0.01 - type - real - - - config_file - config_filename + float - section - 'usrp_rx_hrpt' + length + hs - option - 'clock_alpha' + scale + 1.0/hs - writeback - clock_alpha + max_iter + 4000 _coordinate - (986, 101) + (683, 357) _rotation @@ -798,42 +1250,53 @@ - variable_config + gr_file_sink id - output_filename + frame_sink _enabled True - value - 'frames.hrpt' + file + output_filename type - string + short - config_file - config_filename + vlen + 1 - section - 'usrp_rx_hrpt' + unbuffered + False - option - 'filename' + _coordinate + (809, 595) - writeback - output_filename + _rotation + 0 + + + + noaa_hrpt_deframer + + id + deframer + + + _enabled + True _coordinate - (1143, 101) + (598, 546) _rotation @@ -841,22 +1304,41 @@ - variable + digital_binary_slicer_fb id - max_clock_offset + digital_binary_slicer_fb_0 _enabled True - value - 100e-6 + _coordinate + (259, 546) + + + _rotation + 0 + + + + virtual_source + + id + virtual_source_0 + + + _enabled + True + + + stream_id + baseband _coordinate - (705, 19) + (40, 542) _rotation @@ -883,7 +1365,50 @@ _coordinate - (1027, 623) + (810, 496) + + + _rotation + 0 + + + + variable_config + + id + addr + + + _enabled + True + + + value + "" + + + type + string + + + config_file + config_filename + + + section + 'usrp_rx_hrpt' + + + option + 'addr' + + + writeback + addr + + + _coordinate + (195, 103) _rotation @@ -891,14 +1416,14 @@ - usrp_source - agc + digital_clock_recovery_mm_xx_0 + virtual_sink_0 0 0 - agc - pll + gr_moving_average_xx_0 + digital_clock_recovery_mm_xx_0 0 0 @@ -909,26 +1434,26 @@ 0 - gr_moving_average_xx_0 - gr_clock_recovery_mm_xx_0 + uhd_usrp_source_0 + agc 0 0 - gr_clock_recovery_mm_xx_0 - virtual_sink_0 + agc + pll 0 0 - virtual_source_0 - gr_binary_slicer_fb_0 + digital_binary_slicer_fb_0 + deframer 0 0 - deframer - frame_sink + virtual_source_0 + digital_binary_slicer_fb_0 0 0 @@ -939,8 +1464,8 @@ 0 - gr_binary_slicer_fb_0 - deframer + deframer + frame_sink 0 0 diff --git a/gr-noaa/apps/usrp_rx_hrpt_nogui.py b/gr-noaa/apps/usrp_rx_hrpt_nogui.py index 1b510bdb2..4fc5642ff 100755 --- a/gr-noaa/apps/usrp_rx_hrpt_nogui.py +++ b/gr-noaa/apps/usrp_rx_hrpt_nogui.py @@ -1,16 +1,17 @@ #!/usr/bin/env python ################################################## # Gnuradio Python Flow Graph -# Title: Usrp Rx Hrpt Nogui -# Generated: Mon Nov 9 08:03:25 2009 +# Title: USRP HRPT Receiver +# Generated: Thu Oct 27 13:49:01 2011 ################################################## +from gnuradio import digital from gnuradio import eng_notation from gnuradio import gr from gnuradio import noaa +from gnuradio import uhd from gnuradio.eng_option import eng_option from gnuradio.gr import firdes -from grc_gnuradio import usrp as grc_usrp from optparse import OptionParser import ConfigParser import math, os @@ -18,25 +19,15 @@ import math, os class usrp_rx_hrpt_nogui(gr.top_block): def __init__(self): - gr.top_block.__init__(self, "Usrp Rx Hrpt Nogui") + gr.top_block.__init__(self, "USRP HRPT Receiver") ################################################## # Variables ################################################## - self.config_filename = config_filename = os.environ['HOME']+'/.gnuradio/config.conf' - self._decim_config = ConfigParser.ConfigParser() - self._decim_config.read(config_filename) - try: decim = self._decim_config.getfloat('usrp_rx_hrpt', 'decim') - except: decim = 32 - self.decim = decim self.sym_rate = sym_rate = 600*1109 - self.sample_rate = sample_rate = 64e6/decim + self.sample_rate = sample_rate = 4e6 self.sps = sps = sample_rate/sym_rate - self._side_config = ConfigParser.ConfigParser() - self._side_config.read(config_filename) - try: side = self._side_config.get('usrp_rx_hrpt', 'side') - except: side = 'A' - self.side = side + self.config_filename = config_filename = os.environ['HOME']+'/.gnuradio/config.conf' self._pll_alpha_config = ConfigParser.ConfigParser() self._pll_alpha_config.read(config_filename) try: pll_alpha = self._pll_alpha_config.getfloat('usrp_rx_hrpt', 'pll_alpha') @@ -65,37 +56,86 @@ class usrp_rx_hrpt_nogui(gr.top_block): try: clock_alpha = self._clock_alpha_config.getfloat('usrp_rx_hrpt', 'clock_alpha') except: clock_alpha = 0.01 self.clock_alpha = clock_alpha + self._addr_config = ConfigParser.ConfigParser() + self._addr_config.read(config_filename) + try: addr = self._addr_config.get('usrp_rx_hrpt', 'addr') + except: addr = "" + self.addr = addr ################################################## # Blocks ################################################## - self.agc = gr.agc_cc(1e-6, 1.0, 1.0, 1.0) - self.decoder = noaa.hrpt_decoder(True,True) - self.deframer = noaa.hrpt_deframer() - self.frame_sink = gr.file_sink(gr.sizeof_short*1, output_filename) - self.gr_binary_slicer_fb_0 = gr.binary_slicer_fb() - self.gr_clock_recovery_mm_xx_0 = gr.clock_recovery_mm_ff(sps/2.0, clock_alpha**2/4.0, 0.5, clock_alpha, max_clock_offset) - self.gr_moving_average_xx_0 = gr.moving_average_ff(hs, 1.0/hs, 4000) + self.uhd_usrp_source_0 = uhd.usrp_source( + device_addr=addr, + io_type=uhd.io_type.COMPLEX_FLOAT32, + num_channels=1, + ) + self.uhd_usrp_source_0.set_samp_rate(sample_rate) + self.uhd_usrp_source_0.set_center_freq(freq, 0) + self.uhd_usrp_source_0.set_gain(0, 0) self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset) - self.usrp_source = grc_usrp.simple_source_c(which=0, side=side, rx_ant="RXA") - self.usrp_source.set_decim_rate(decim) - self.usrp_source.set_frequency(freq, verbose=True) - self.usrp_source.set_gain(gain) + self.gr_moving_average_xx_0 = gr.moving_average_ff(hs, 1.0/hs, 4000) + self.frame_sink = gr.file_sink(gr.sizeof_short*1, output_filename) + self.frame_sink.set_unbuffered(False) + self.digital_clock_recovery_mm_xx_0 = digital.clock_recovery_mm_ff(sps/2.0, clock_alpha**2/4.0, 0.5, clock_alpha, max_clock_offset) + self.digital_binary_slicer_fb_0 = digital.binary_slicer_fb() + self.deframer = noaa.hrpt_deframer() + self.decoder = noaa.hrpt_decoder(True,True) + self.agc = gr.agc_cc(1e-6, 1.0, 1.0, 1.0) ################################################## # Connections ################################################## - self.connect((self.usrp_source, 0), (self.agc, 0)) - self.connect((self.agc, 0), (self.pll, 0)) + self.connect((self.gr_moving_average_xx_0, 0), (self.digital_clock_recovery_mm_xx_0, 0)) self.connect((self.pll, 0), (self.gr_moving_average_xx_0, 0)) - self.connect((self.gr_moving_average_xx_0, 0), (self.gr_clock_recovery_mm_xx_0, 0)) - self.connect((self.gr_clock_recovery_mm_xx_0, 0), (self.gr_binary_slicer_fb_0, 0)) - self.connect((self.deframer, 0), (self.frame_sink, 0)) + self.connect((self.uhd_usrp_source_0, 0), (self.agc, 0)) + self.connect((self.agc, 0), (self.pll, 0)) + self.connect((self.digital_binary_slicer_fb_0, 0), (self.deframer, 0)) + self.connect((self.digital_clock_recovery_mm_xx_0, 0), (self.digital_binary_slicer_fb_0, 0)) self.connect((self.deframer, 0), (self.decoder, 0)) - self.connect((self.gr_binary_slicer_fb_0, 0), (self.deframer, 0)) + self.connect((self.deframer, 0), (self.frame_sink, 0)) + + def get_sym_rate(self): + return self.sym_rate + + def set_sym_rate(self, sym_rate): + self.sym_rate = sym_rate + self.set_sps(self.sample_rate/self.sym_rate) + + def get_sample_rate(self): + return self.sample_rate + + def set_sample_rate(self, sample_rate): + self.sample_rate = sample_rate + self.set_max_carrier_offset(2*math.pi*100e3/self.sample_rate) + self.set_sps(self.sample_rate/self.sym_rate) + self.uhd_usrp_source_0.set_samp_rate(self.sample_rate) + + def get_sps(self): + return self.sps + + def set_sps(self, sps): + self.sps = sps + self.set_hs(int(self.sps/2.0)) + self.digital_clock_recovery_mm_xx_0.set_omega(self.sps/2.0) + + def get_config_filename(self): + return self.config_filename def set_config_filename(self, config_filename): self.config_filename = config_filename + self._clock_alpha_config = ConfigParser.ConfigParser() + self._clock_alpha_config.read(self.config_filename) + if not self._clock_alpha_config.has_section('usrp_rx_hrpt'): + self._clock_alpha_config.add_section('usrp_rx_hrpt') + self._clock_alpha_config.set('usrp_rx_hrpt', 'clock_alpha', str(self.clock_alpha)) + self._clock_alpha_config.write(open(self.config_filename, 'w')) + self._pll_alpha_config = ConfigParser.ConfigParser() + self._pll_alpha_config.read(self.config_filename) + if not self._pll_alpha_config.has_section('usrp_rx_hrpt'): + self._pll_alpha_config.add_section('usrp_rx_hrpt') + self._pll_alpha_config.set('usrp_rx_hrpt', 'pll_alpha', str(self.pll_alpha)) + self._pll_alpha_config.write(open(self.config_filename, 'w')) self._gain_config = ConfigParser.ConfigParser() self._gain_config.read(self.config_filename) if not self._gain_config.has_section('usrp_rx_hrpt'): @@ -108,81 +148,35 @@ class usrp_rx_hrpt_nogui(gr.top_block): self._freq_config.add_section('usrp_rx_hrpt') self._freq_config.set('usrp_rx_hrpt', 'freq', str(self.freq)) self._freq_config.write(open(self.config_filename, 'w')) - self._side_config = ConfigParser.ConfigParser() - self._side_config.read(self.config_filename) - if not self._side_config.has_section('usrp_rx_hrpt'): - self._side_config.add_section('usrp_rx_hrpt') - self._side_config.set('usrp_rx_hrpt', 'side', str(self.side)) - self._side_config.write(open(self.config_filename, 'w')) - self._decim_config = ConfigParser.ConfigParser() - self._decim_config.read(self.config_filename) - if not self._decim_config.has_section('usrp_rx_hrpt'): - self._decim_config.add_section('usrp_rx_hrpt') - self._decim_config.set('usrp_rx_hrpt', 'decim', str(self.decim)) - self._decim_config.write(open(self.config_filename, 'w')) - self._pll_alpha_config = ConfigParser.ConfigParser() - self._pll_alpha_config.read(self.config_filename) - if not self._pll_alpha_config.has_section('usrp_rx_hrpt'): - self._pll_alpha_config.add_section('usrp_rx_hrpt') - self._pll_alpha_config.set('usrp_rx_hrpt', 'pll_alpha', str(self.pll_alpha)) - self._pll_alpha_config.write(open(self.config_filename, 'w')) - self._clock_alpha_config = ConfigParser.ConfigParser() - self._clock_alpha_config.read(self.config_filename) - if not self._clock_alpha_config.has_section('usrp_rx_hrpt'): - self._clock_alpha_config.add_section('usrp_rx_hrpt') - self._clock_alpha_config.set('usrp_rx_hrpt', 'clock_alpha', str(self.clock_alpha)) - self._clock_alpha_config.write(open(self.config_filename, 'w')) self._output_filename_config = ConfigParser.ConfigParser() self._output_filename_config.read(self.config_filename) if not self._output_filename_config.has_section('usrp_rx_hrpt'): self._output_filename_config.add_section('usrp_rx_hrpt') self._output_filename_config.set('usrp_rx_hrpt', 'filename', str(self.output_filename)) self._output_filename_config.write(open(self.config_filename, 'w')) + self._addr_config = ConfigParser.ConfigParser() + self._addr_config.read(self.config_filename) + if not self._addr_config.has_section('usrp_rx_hrpt'): + self._addr_config.add_section('usrp_rx_hrpt') + self._addr_config.set('usrp_rx_hrpt', 'addr', str(self.addr)) + self._addr_config.write(open(self.config_filename, 'w')) - def set_decim(self, decim): - self.decim = decim - self.set_sample_rate(64e6/self.decim) - self.usrp_source.set_decim_rate(self.decim) - self._decim_config = ConfigParser.ConfigParser() - self._decim_config.read(self.config_filename) - if not self._decim_config.has_section('usrp_rx_hrpt'): - self._decim_config.add_section('usrp_rx_hrpt') - self._decim_config.set('usrp_rx_hrpt', 'decim', str(self.decim)) - self._decim_config.write(open(self.config_filename, 'w')) - - def set_sym_rate(self, sym_rate): - self.sym_rate = sym_rate - self.set_sps(self.sample_rate/self.sym_rate) - - def set_sample_rate(self, sample_rate): - self.sample_rate = sample_rate - self.set_max_carrier_offset(2*math.pi*100e3/self.sample_rate) - self.set_sps(self.sample_rate/self.sym_rate) - - def set_sps(self, sps): - self.sps = sps - self.set_hs(int(self.sps/2.0)) - self.gr_clock_recovery_mm_xx_0.set_omega(self.sps/2.0) - - def set_side(self, side): - self.side = side - self._side_config = ConfigParser.ConfigParser() - self._side_config.read(self.config_filename) - if not self._side_config.has_section('usrp_rx_hrpt'): - self._side_config.add_section('usrp_rx_hrpt') - self._side_config.set('usrp_rx_hrpt', 'side', str(self.side)) - self._side_config.write(open(self.config_filename, 'w')) + def get_pll_alpha(self): + return self.pll_alpha def set_pll_alpha(self, pll_alpha): self.pll_alpha = pll_alpha - self.pll.set_alpha(self.pll_alpha) - self.pll.set_beta(self.pll_alpha**2/4.0) self._pll_alpha_config = ConfigParser.ConfigParser() self._pll_alpha_config.read(self.config_filename) if not self._pll_alpha_config.has_section('usrp_rx_hrpt'): self._pll_alpha_config.add_section('usrp_rx_hrpt') self._pll_alpha_config.set('usrp_rx_hrpt', 'pll_alpha', str(self.pll_alpha)) self._pll_alpha_config.write(open(self.config_filename, 'w')) + self.pll.set_alpha(self.pll_alpha) + self.pll.set_beta(self.pll_alpha**2/4.0) + + def get_output_filename(self): + return self.output_filename def set_output_filename(self, output_filename): self.output_filename = output_filename @@ -193,17 +187,29 @@ class usrp_rx_hrpt_nogui(gr.top_block): self._output_filename_config.set('usrp_rx_hrpt', 'filename', str(self.output_filename)) self._output_filename_config.write(open(self.config_filename, 'w')) + def get_max_clock_offset(self): + return self.max_clock_offset + def set_max_clock_offset(self, max_clock_offset): self.max_clock_offset = max_clock_offset + def get_max_carrier_offset(self): + return self.max_carrier_offset + def set_max_carrier_offset(self, max_carrier_offset): self.max_carrier_offset = max_carrier_offset self.pll.set_max_offset(self.max_carrier_offset) + def get_hs(self): + return self.hs + def set_hs(self, hs): self.hs = hs self.gr_moving_average_xx_0.set_length_and_scale(self.hs, 1.0/self.hs) + def get_gain(self): + return self.gain + def set_gain(self, gain): self.gain = gain self._gain_config = ConfigParser.ConfigParser() @@ -212,7 +218,9 @@ class usrp_rx_hrpt_nogui(gr.top_block): self._gain_config.add_section('usrp_rx_hrpt') self._gain_config.set('usrp_rx_hrpt', 'gain', str(self.gain)) self._gain_config.write(open(self.config_filename, 'w')) - self.usrp_source.set_gain(self.gain) + + def get_freq(self): + return self.freq def set_freq(self, freq): self.freq = freq @@ -222,24 +230,37 @@ class usrp_rx_hrpt_nogui(gr.top_block): self._freq_config.add_section('usrp_rx_hrpt') self._freq_config.set('usrp_rx_hrpt', 'freq', str(self.freq)) self._freq_config.write(open(self.config_filename, 'w')) - self.usrp_source.set_frequency(self.freq) + self.uhd_usrp_source_0.set_center_freq(self.freq, 0) + + def get_clock_alpha(self): + return self.clock_alpha def set_clock_alpha(self, clock_alpha): self.clock_alpha = clock_alpha - self.gr_clock_recovery_mm_xx_0.set_gain_omega(self.clock_alpha**2/4.0) - self.gr_clock_recovery_mm_xx_0.set_gain_mu(self.clock_alpha) self._clock_alpha_config = ConfigParser.ConfigParser() self._clock_alpha_config.read(self.config_filename) if not self._clock_alpha_config.has_section('usrp_rx_hrpt'): self._clock_alpha_config.add_section('usrp_rx_hrpt') self._clock_alpha_config.set('usrp_rx_hrpt', 'clock_alpha', str(self.clock_alpha)) self._clock_alpha_config.write(open(self.config_filename, 'w')) + self.digital_clock_recovery_mm_xx_0.set_gain_omega(self.clock_alpha**2/4.0) + self.digital_clock_recovery_mm_xx_0.set_gain_mu(self.clock_alpha) + + def get_addr(self): + return self.addr + + def set_addr(self, addr): + self.addr = addr + self._addr_config = ConfigParser.ConfigParser() + self._addr_config.read(self.config_filename) + if not self._addr_config.has_section('usrp_rx_hrpt'): + self._addr_config.add_section('usrp_rx_hrpt') + self._addr_config.set('usrp_rx_hrpt', 'addr', str(self.addr)) + self._addr_config.write(open(self.config_filename, 'w')) if __name__ == '__main__': parser = OptionParser(option_class=eng_option, usage="%prog: [options]") (options, args) = parser.parse_args() - if gr.enable_realtime_scheduling() != gr.RT_OK: - print "Error: failed to enable realtime scheduling." tb = usrp_rx_hrpt_nogui() tb.start() raw_input('Press Enter to quit: ') diff --git a/gr-noaa/apps/usrp_rx_lrit.grc b/gr-noaa/apps/usrp_rx_lrit.grc deleted file mode 100644 index aca10039a..000000000 --- a/gr-noaa/apps/usrp_rx_lrit.grc +++ /dev/null @@ -1,1825 +0,0 @@ - - - Wed Dec 16 09:47:16 2009 - - options - - id - usrp_rx_lrit - - - _enabled - True - - - title - USRP LRIT Receiver - - - author - - - - description - - - - window_size - 4095, 4095 - - - generate_options - wx_gui - - - category - Custom - - - run_options - prompt - - - run - True - - - realtime_scheduling - - - - _coordinate - (10, 10) - - - _rotation - 0 - - - - variable - - id - sample_rate - - - _enabled - True - - - value - 64e6/decim - - - _coordinate - (245, 9) - - - _rotation - 0 - - - - variable - - id - symbol_rate - - - _enabled - True - - - value - 293e3 - - - _coordinate - (351, 9) - - - _rotation - 0 - - - - variable - - id - sps - - - _enabled - True - - - value - sample_rate/symbol_rate - - - _coordinate - (456, 9) - - - _rotation - 0 - - - - import - - id - import_0 - - - _enabled - True - - - import - import os - - - _coordinate - (9, 83) - - - _rotation - 0 - - - - variable - - id - config_filename - - - _enabled - True - - - value - os.environ['HOME']+'/.gnuradio/config.conf' - - - _coordinate - (10, 142) - - - _rotation - 0 - - - - variable_text_box - - id - freq - - - _enabled - True - - - label - Frequency - - - value - saved_freq - - - converver - float_converter - - - formatter - None - - - grid_pos - 0, 0, 1, 1 - - - notebook - - - - _coordinate - (247, 149) - - - _rotation - 0 - - - - variable_config - - id - saved_freq - - - _enabled - True - - - value - 1691e6 - - - type - real - - - config_file - config_filename - - - section - 'usrp_rx_lrit' - - - option - 'freq' - - - writeback - freq - - - _coordinate - (246, 299) - - - _rotation - 0 - - - - variable_config - - id - saved_offset - - - _enabled - True - - - value - 0 - - - type - real - - - config_file - config_filename - - - section - 'usrp_rx_lrit' - - - option - 'offset' - - - writeback - offset - - - _coordinate - (406, 300) - - - _rotation - 0 - - - - variable_slider - - id - offset - - - _enabled - True - - - label - Offset - - - value - saved_offset - - - min - -50e3 - - - max - 50e3 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - 0, 1, 1, 1 - - - notebook - - - - _coordinate - (390, 149) - - - _rotation - 0 - - - - variable_slider - - id - costas_alpha - - - _enabled - True - - - label - Costas Alpha - - - value - saved_costas_alpha - - - min - 0 - - - max - 0.5 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - 1, 1, 1, 1 - - - notebook - - - - _coordinate - (813, 152) - - - _rotation - 0 - - - - variable_slider - - id - gain_mu - - - _enabled - True - - - label - Gain Mu - - - value - saved_gain_mu - - - min - 0 - - - max - 0.5 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - 1, 2, 1, 1 - - - notebook - - - - _coordinate - (957, 151) - - - _rotation - 0 - - - - variable_config - - id - saved_gain - - - _enabled - True - - - value - 33 - - - type - real - - - config_file - config_filename - - - section - 'usrp_rx_lrit' - - - option - 'gain' - - - writeback - gain - - - _coordinate - (565, 300) - - - _rotation - 0 - - - - variable_config - - id - saved_decim - - - _enabled - True - - - value - 160 - - - type - int - - - config_file - config_filename - - - section - 'usrp_rx_lrit' - - - option - 'decim' - - - writeback - decim - - - _coordinate - (725, 300) - - - _rotation - 0 - - - - variable_text_box - - id - decim - - - _enabled - True - - - label - Decim - - - value - saved_decim - - - converver - int_converter - - - formatter - None - - - grid_pos - 0, 2, 1, 1 - - - notebook - - - - _coordinate - (672, 151) - - - _rotation - 0 - - - - variable_config - - id - saved_costas_alpha - - - _enabled - True - - - value - 0.005 - - - type - real - - - config_file - config_filename - - - section - 'usrp_rx_lrit' - - - option - 'costas_alpha' - - - writeback - costas_alpha - - - _coordinate - (885, 298) - - - _rotation - 0 - - - - variable_config - - id - saved_gain_mu - - - _enabled - True - - - value - 0.005 - - - type - real - - - config_file - config_filename - - - section - 'usrp_rx_lrit' - - - option - 'gain_mu' - - - writeback - gain_mu - - - _coordinate - (1046, 298) - - - _rotation - 0 - - - - variable_config - - id - side - - - _enabled - True - - - value - 'A' - - - type - string - - - config_file - config_filename - - - section - 'usrp_rx_lrit' - - - option - 'side' - - - writeback - side - - - _coordinate - (1102, 152) - - - _rotation - 0 - - - - gr_agc_xx - - id - gr_agc_xx_0 - - - _enabled - True - - - type - complex - - - rate - 1e-6 - - - reference - 1.0 - - - gain - 1.0/32767.0 - - - max_gain - 1.0 - - - _coordinate - (286, 729) - - - _rotation - 0 - - - - wxgui_scopesink2 - - id - rx_waveform - - - _enabled - True - - - type - complex - - - title - RX Waveform - - - samp_rate - sample_rate - - - v_scale - 0 - - - v_offset - 0 - - - t_scale - 20.0/sample_rate - - - ac_couple - False - - - xy_mode - False - - - num_inputs - 1 - - - win_size - - - - grid_pos - 1, 0, 1, 1 - - - notebook - displays, 0 - - - _coordinate - (281, 862) - - - _rotation - 0 - - - - wxgui_fftsink2 - - id - rx_spectrum - - - _enabled - True - - - type - complex - - - title - RX Spectrum - - - samp_rate - sample_rate - - - baseband_freq - freq - - - y_per_div - 10 - - - y_divs - 10 - - - ref_level - 50 - - - ref_scale - 2.0 - - - fft_size - 1024 - - - fft_rate - 30 - - - peak_hold - False - - - average - False - - - avg_alpha - 0 - - - win - None - - - win_size - - - - grid_pos - 0, 0, 1, 1 - - - notebook - displays, 0 - - - _coordinate - (280, 468) - - - _rotation - 0 - - - - root_raised_cosine_filter - - id - root_raised_cosine_filter_0 - - - _enabled - True - - - type - fir_filter_ccf - - - decim - 1 - - - interp - 1 - - - gain - 1 - - - samp_rate - sample_rate - - - sym_rate - symbol_rate - - - alpha - 0.25 - - - ntaps - int(11*sample_rate/symbol_rate) - - - _coordinate - (472, 713) - - - _rotation - 0 - - - - wxgui_scopesink2 - - id - rrc_waveform - - - _enabled - True - - - type - complex - - - title - RRC Waveform - - - samp_rate - sample_rate - - - v_scale - 0.5 - - - v_offset - 0 - - - t_scale - 20.0/sample_rate - - - ac_couple - False - - - xy_mode - False - - - num_inputs - 1 - - - win_size - - - - grid_pos - 1, 0, 1, 1 - - - notebook - displays, 1 - - - _coordinate - (768, 866) - - - _rotation - 0 - - - - wxgui_fftsink2 - - id - rrc_spectrum - - - _enabled - True - - - type - complex - - - title - RRC Spectrum - - - samp_rate - sample_rate - - - baseband_freq - freq+offset - - - y_per_div - 10 - - - y_divs - 10 - - - ref_level - -15 - - - ref_scale - 2.0 - - - fft_size - 1024 - - - fft_rate - 15 - - - peak_hold - False - - - average - False - - - avg_alpha - 0 - - - win - None - - - win_size - - - - grid_pos - 0, 0, 1, 1 - - - notebook - displays, 1 - - - _coordinate - (767, 499) - - - _rotation - 0 - - - - gr_costas_loop_cc - - id - costas - - - _enabled - True - - - alpha - costas_alpha - - - beta - (costas_alpha**2.0)/4.0 - - - max_freq - 50e-6*sps - - - min_freq - -50e-6*sps - - - order - 2 - - - _coordinate - (767, 721) - - - _rotation - 0 - - - - wxgui_fftsink2 - - id - costas_spectrum - - - _enabled - True - - - type - complex - - - title - PLL Spectrum - - - samp_rate - sample_rate - - - baseband_freq - freq+offset - - - y_per_div - 10 - - - y_divs - 10 - - - ref_level - -15 - - - ref_scale - 2.0 - - - fft_size - 1024 - - - fft_rate - 15 - - - peak_hold - False - - - average - False - - - avg_alpha - 0 - - - win - None - - - win_size - - - - grid_pos - 0, 0, 1, 1 - - - notebook - displays, 2 - - - _coordinate - (969, 502) - - - _rotation - 0 - - - - wxgui_fftsink2 - - id - mm_spectrum - - - _enabled - True - - - type - complex - - - title - Bit Sync Spectrum - - - samp_rate - symbol_rate - - - baseband_freq - 0 - - - y_per_div - 10 - - - y_divs - 10 - - - ref_level - -15 - - - ref_scale - 2.0 - - - fft_size - 1024 - - - fft_rate - 15 - - - peak_hold - False - - - average - False - - - avg_alpha - 0 - - - win - None - - - win_size - - - - grid_pos - 0, 0, 1, 1 - - - notebook - displays, 3 - - - _coordinate - (1225, 503) - - - _rotation - 0 - - - - wxgui_scopesink2 - - id - costas_waveform - - - _enabled - True - - - type - complex - - - title - PLL Waveform - - - samp_rate - sample_rate - - - v_scale - 0.5 - - - v_offset - 0 - - - t_scale - 20.0/sample_rate - - - ac_couple - False - - - xy_mode - False - - - num_inputs - 1 - - - win_size - - - - grid_pos - 1, 0, 1, 1 - - - notebook - displays, 2 - - - _coordinate - (968, 852) - - - _rotation - 0 - - - - gr_clock_recovery_mm_xx - - id - mm_sync - - - _enabled - True - - - type - complex - - - omega - sps - - - gain_omega - (gain_mu**2)/4.0 - - - mu - 0.5 - - - gain_mu - gain_mu - - - omega_relative_limit - 50e-6*sps - - - _coordinate - (969, 722) - - - _rotation - 0 - - - - wxgui_scopesink2 - - id - mm_const - - - _enabled - True - - - type - complex - - - title - Constellation - - - samp_rate - symbol_rate - - - v_scale - 0.5 - - - v_offset - 0 - - - t_scale - 20.0/symbol_rate - - - ac_couple - False - - - xy_mode - True - - - num_inputs - 1 - - - win_size - - - - grid_pos - 1, 0, 1, 1 - - - notebook - displays, 3 - - - _coordinate - (1225, 859) - - - _rotation - 0 - - - - notebook - - id - displays - - - _enabled - True - - - style - wx.NB_TOP - - - labels - ['USRP RX','RRC','PLL','Const'] - - - grid_pos - 2, 0, 1, 3 - - - notebook - - - - _coordinate - (10, 228) - - - _rotation - 0 - - - - variable_slider - - id - gain - - - _enabled - True - - - label - Gain - - - value - saved_gain - - - min - 0 - - - max - 115 - - - num_steps - 115 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - 1, 0, 1, 1 - - - notebook - - - - _coordinate - (532, 150) - - - _rotation - 0 - - - - gr_throttle - - id - gr_throttle_0 - - - _enabled - False - - - type - complex - - - samples_per_second - sample_rate - - - vlen - 1 - - - _coordinate - (63, 859) - - - _rotation - 0 - - - - gr_file_source - - id - gr_file_source_0 - - - _enabled - False - - - file - lrit.dat - - - type - complex - - - repeat - False - - - vlen - 1 - - - _coordinate - (36, 943) - - - _rotation - 0 - - - - usrp_simple_source_x - - id - usrp_simple_source_x_0 - - - _enabled - True - - - type - complex - - - format - - - - which - 0 - - - decimation - decim - - - frequency - freq+offset - - - lo_offset - float('inf') - - - gain - gain - - - side - side - - - rx_ant - RXA - - - hb_filters - - - - _coordinate - (19, 713) - - - _rotation - 0 - - - - gr_agc_xx_0 - root_raised_cosine_filter_0 - 0 - 0 - - - gr_throttle_0 - gr_agc_xx_0 - 0 - 0 - - - gr_file_source_0 - gr_throttle_0 - 0 - 0 - - - usrp_simple_source_x_0 - gr_agc_xx_0 - 0 - 0 - - - usrp_simple_source_x_0 - rx_spectrum - 0 - 0 - - - gr_throttle_0 - rx_spectrum - 0 - 0 - - - usrp_simple_source_x_0 - rx_waveform - 0 - 0 - - - gr_throttle_0 - rx_waveform - 0 - 0 - - - root_raised_cosine_filter_0 - rrc_waveform - 0 - 0 - - - root_raised_cosine_filter_0 - rrc_spectrum - 0 - 0 - - - root_raised_cosine_filter_0 - costas - 0 - 0 - - - costas - costas_spectrum - 0 - 0 - - - costas - costas_waveform - 0 - 0 - - - costas - mm_sync - 0 - 0 - - - mm_sync - mm_spectrum - 0 - 0 - - - mm_sync - mm_const - 0 - 0 - - diff --git a/gr-noaa/apps/usrp_rx_lrit.py b/gr-noaa/apps/usrp_rx_lrit.py deleted file mode 100755 index 9a3d70200..000000000 --- a/gr-noaa/apps/usrp_rx_lrit.py +++ /dev/null @@ -1,523 +0,0 @@ -#!/usr/bin/env python -################################################## -# Gnuradio Python Flow Graph -# Title: USRP LRIT Receiver -# Generated: Wed Dec 16 09:49:15 2009 -################################################## - -from gnuradio import eng_notation -from gnuradio import gr -from gnuradio import window -from gnuradio.eng_option import eng_option -from gnuradio.gr import firdes -from gnuradio.wxgui import fftsink2 -from gnuradio.wxgui import forms -from gnuradio.wxgui import scopesink2 -from grc_gnuradio import usrp as grc_usrp -from grc_gnuradio import wxgui as grc_wxgui -from optparse import OptionParser -import ConfigParser -import os -import wx - -class usrp_rx_lrit(grc_wxgui.top_block_gui): - - def __init__(self): - grc_wxgui.top_block_gui.__init__(self, title="USRP LRIT Receiver") - - ################################################## - # Variables - ################################################## - self.config_filename = config_filename = os.environ['HOME']+'/.gnuradio/config.conf' - self._saved_decim_config = ConfigParser.ConfigParser() - self._saved_decim_config.read(config_filename) - try: saved_decim = self._saved_decim_config.getint('usrp_rx_lrit', 'decim') - except: saved_decim = 160 - self.saved_decim = saved_decim - self.decim = decim = saved_decim - self.symbol_rate = symbol_rate = 293e3 - self._saved_offset_config = ConfigParser.ConfigParser() - self._saved_offset_config.read(config_filename) - try: saved_offset = self._saved_offset_config.getfloat('usrp_rx_lrit', 'offset') - except: saved_offset = 0 - self.saved_offset = saved_offset - self._saved_gain_mu_config = ConfigParser.ConfigParser() - self._saved_gain_mu_config.read(config_filename) - try: saved_gain_mu = self._saved_gain_mu_config.getfloat('usrp_rx_lrit', 'gain_mu') - except: saved_gain_mu = 0.005 - self.saved_gain_mu = saved_gain_mu - self._saved_gain_config = ConfigParser.ConfigParser() - self._saved_gain_config.read(config_filename) - try: saved_gain = self._saved_gain_config.getfloat('usrp_rx_lrit', 'gain') - except: saved_gain = 33 - self.saved_gain = saved_gain - self._saved_freq_config = ConfigParser.ConfigParser() - self._saved_freq_config.read(config_filename) - try: saved_freq = self._saved_freq_config.getfloat('usrp_rx_lrit', 'freq') - except: saved_freq = 1691e6 - self.saved_freq = saved_freq - self._saved_costas_alpha_config = ConfigParser.ConfigParser() - self._saved_costas_alpha_config.read(config_filename) - try: saved_costas_alpha = self._saved_costas_alpha_config.getfloat('usrp_rx_lrit', 'costas_alpha') - except: saved_costas_alpha = 0.005 - self.saved_costas_alpha = saved_costas_alpha - self.sample_rate = sample_rate = 64e6/decim - self.sps = sps = sample_rate/symbol_rate - self._side_config = ConfigParser.ConfigParser() - self._side_config.read(config_filename) - try: side = self._side_config.get('usrp_rx_lrit', 'side') - except: side = 'A' - self.side = side - self.offset = offset = saved_offset - self.gain_mu = gain_mu = saved_gain_mu - self.gain = gain = saved_gain - self.freq = freq = saved_freq - self.costas_alpha = costas_alpha = saved_costas_alpha - - ################################################## - # Notebooks - ################################################## - self.displays = wx.Notebook(self.GetWin(), style=wx.NB_TOP) - self.displays.AddPage(grc_wxgui.Panel(self.displays), "USRP RX") - self.displays.AddPage(grc_wxgui.Panel(self.displays), "RRC") - self.displays.AddPage(grc_wxgui.Panel(self.displays), "PLL") - self.displays.AddPage(grc_wxgui.Panel(self.displays), "Const") - self.GridAdd(self.displays, 2, 0, 1, 3) - - ################################################## - # Controls - ################################################## - self._decim_text_box = forms.text_box( - parent=self.GetWin(), - value=self.decim, - callback=self.set_decim, - label="Decim", - converter=forms.int_converter(), - ) - self.GridAdd(self._decim_text_box, 0, 2, 1, 1) - _offset_sizer = wx.BoxSizer(wx.VERTICAL) - self._offset_text_box = forms.text_box( - parent=self.GetWin(), - sizer=_offset_sizer, - value=self.offset, - callback=self.set_offset, - label="Offset", - converter=forms.float_converter(), - proportion=0, - ) - self._offset_slider = forms.slider( - parent=self.GetWin(), - sizer=_offset_sizer, - value=self.offset, - callback=self.set_offset, - minimum=-50e3, - maximum=50e3, - num_steps=100, - style=wx.SL_HORIZONTAL, - cast=float, - proportion=1, - ) - self.GridAdd(_offset_sizer, 0, 1, 1, 1) - _gain_mu_sizer = wx.BoxSizer(wx.VERTICAL) - self._gain_mu_text_box = forms.text_box( - parent=self.GetWin(), - sizer=_gain_mu_sizer, - value=self.gain_mu, - callback=self.set_gain_mu, - label="Gain Mu", - converter=forms.float_converter(), - proportion=0, - ) - self._gain_mu_slider = forms.slider( - parent=self.GetWin(), - sizer=_gain_mu_sizer, - value=self.gain_mu, - callback=self.set_gain_mu, - minimum=0, - maximum=0.5, - num_steps=100, - style=wx.SL_HORIZONTAL, - cast=float, - proportion=1, - ) - self.GridAdd(_gain_mu_sizer, 1, 2, 1, 1) - _gain_sizer = wx.BoxSizer(wx.VERTICAL) - self._gain_text_box = forms.text_box( - parent=self.GetWin(), - sizer=_gain_sizer, - value=self.gain, - callback=self.set_gain, - label="Gain", - converter=forms.float_converter(), - proportion=0, - ) - self._gain_slider = forms.slider( - parent=self.GetWin(), - sizer=_gain_sizer, - value=self.gain, - callback=self.set_gain, - minimum=0, - maximum=115, - num_steps=115, - style=wx.SL_HORIZONTAL, - cast=float, - proportion=1, - ) - self.GridAdd(_gain_sizer, 1, 0, 1, 1) - self._freq_text_box = forms.text_box( - parent=self.GetWin(), - value=self.freq, - callback=self.set_freq, - label="Frequency", - converter=forms.float_converter(), - ) - self.GridAdd(self._freq_text_box, 0, 0, 1, 1) - _costas_alpha_sizer = wx.BoxSizer(wx.VERTICAL) - self._costas_alpha_text_box = forms.text_box( - parent=self.GetWin(), - sizer=_costas_alpha_sizer, - value=self.costas_alpha, - callback=self.set_costas_alpha, - label="Costas Alpha", - converter=forms.float_converter(), - proportion=0, - ) - self._costas_alpha_slider = forms.slider( - parent=self.GetWin(), - sizer=_costas_alpha_sizer, - value=self.costas_alpha, - callback=self.set_costas_alpha, - minimum=0, - maximum=0.5, - num_steps=100, - style=wx.SL_HORIZONTAL, - cast=float, - proportion=1, - ) - self.GridAdd(_costas_alpha_sizer, 1, 1, 1, 1) - - ################################################## - # Blocks - ################################################## - self.costas = gr.costas_loop_cc(costas_alpha, (costas_alpha**2.0)/4.0, 50e-6*sps, -50e-6*sps, 2) - self.costas_spectrum = fftsink2.fft_sink_c( - self.displays.GetPage(2).GetWin(), - baseband_freq=freq+offset, - y_per_div=10, - y_divs=10, - ref_level=-15, - ref_scale=2.0, - sample_rate=sample_rate, - fft_size=1024, - fft_rate=15, - average=False, - avg_alpha=None, - title="PLL Spectrum", - peak_hold=False, - ) - self.displays.GetPage(2).GridAdd(self.costas_spectrum.win, 0, 0, 1, 1) - self.costas_waveform = scopesink2.scope_sink_c( - self.displays.GetPage(2).GetWin(), - title="PLL Waveform", - sample_rate=sample_rate, - v_scale=0.5, - v_offset=0, - t_scale=20.0/sample_rate, - ac_couple=False, - xy_mode=False, - num_inputs=1, - ) - self.displays.GetPage(2).GridAdd(self.costas_waveform.win, 1, 0, 1, 1) - self.gr_agc_xx_0 = gr.agc_cc(1e-6, 1.0, 1.0/32767.0, 1.0) - self.mm_const = scopesink2.scope_sink_c( - self.displays.GetPage(3).GetWin(), - title="Constellation", - sample_rate=symbol_rate, - v_scale=0.5, - v_offset=0, - t_scale=20.0/symbol_rate, - ac_couple=False, - xy_mode=True, - num_inputs=1, - ) - self.displays.GetPage(3).GridAdd(self.mm_const.win, 1, 0, 1, 1) - self.mm_spectrum = fftsink2.fft_sink_c( - self.displays.GetPage(3).GetWin(), - baseband_freq=0, - y_per_div=10, - y_divs=10, - ref_level=-15, - ref_scale=2.0, - sample_rate=symbol_rate, - fft_size=1024, - fft_rate=15, - average=False, - avg_alpha=None, - title="Bit Sync Spectrum", - peak_hold=False, - ) - self.displays.GetPage(3).GridAdd(self.mm_spectrum.win, 0, 0, 1, 1) - self.mm_sync = gr.clock_recovery_mm_cc(sps, (gain_mu**2)/4.0, 0.5, gain_mu, 50e-6*sps) - self.root_raised_cosine_filter_0 = gr.fir_filter_ccf(1, firdes.root_raised_cosine( - 1, sample_rate, symbol_rate, 0.25, int(11*sample_rate/symbol_rate))) - self.rrc_spectrum = fftsink2.fft_sink_c( - self.displays.GetPage(1).GetWin(), - baseband_freq=freq+offset, - y_per_div=10, - y_divs=10, - ref_level=-15, - ref_scale=2.0, - sample_rate=sample_rate, - fft_size=1024, - fft_rate=15, - average=False, - avg_alpha=None, - title="RRC Spectrum", - peak_hold=False, - ) - self.displays.GetPage(1).GridAdd(self.rrc_spectrum.win, 0, 0, 1, 1) - self.rrc_waveform = scopesink2.scope_sink_c( - self.displays.GetPage(1).GetWin(), - title="RRC Waveform", - sample_rate=sample_rate, - v_scale=0.5, - v_offset=0, - t_scale=20.0/sample_rate, - ac_couple=False, - xy_mode=False, - num_inputs=1, - ) - self.displays.GetPage(1).GridAdd(self.rrc_waveform.win, 1, 0, 1, 1) - self.rx_spectrum = fftsink2.fft_sink_c( - self.displays.GetPage(0).GetWin(), - baseband_freq=freq, - y_per_div=10, - y_divs=10, - ref_level=50, - ref_scale=2.0, - sample_rate=sample_rate, - fft_size=1024, - fft_rate=30, - average=False, - avg_alpha=None, - title="RX Spectrum", - peak_hold=False, - ) - self.displays.GetPage(0).GridAdd(self.rx_spectrum.win, 0, 0, 1, 1) - self.rx_waveform = scopesink2.scope_sink_c( - self.displays.GetPage(0).GetWin(), - title="RX Waveform", - sample_rate=sample_rate, - v_scale=0, - v_offset=0, - t_scale=20.0/sample_rate, - ac_couple=False, - xy_mode=False, - num_inputs=1, - ) - self.displays.GetPage(0).GridAdd(self.rx_waveform.win, 1, 0, 1, 1) - self.usrp_simple_source_x_0 = grc_usrp.simple_source_c(which=0, side=side, rx_ant="RXA") - self.usrp_simple_source_x_0.set_decim_rate(decim) - self.usrp_simple_source_x_0.set_frequency(freq+offset, verbose=True) - self.usrp_simple_source_x_0.set_gain(gain) - - ################################################## - # Connections - ################################################## - self.connect((self.gr_agc_xx_0, 0), (self.root_raised_cosine_filter_0, 0)) - self.connect((self.usrp_simple_source_x_0, 0), (self.gr_agc_xx_0, 0)) - self.connect((self.usrp_simple_source_x_0, 0), (self.rx_spectrum, 0)) - self.connect((self.usrp_simple_source_x_0, 0), (self.rx_waveform, 0)) - self.connect((self.root_raised_cosine_filter_0, 0), (self.rrc_waveform, 0)) - self.connect((self.root_raised_cosine_filter_0, 0), (self.rrc_spectrum, 0)) - self.connect((self.root_raised_cosine_filter_0, 0), (self.costas, 0)) - self.connect((self.costas, 0), (self.costas_spectrum, 0)) - self.connect((self.costas, 0), (self.costas_waveform, 0)) - self.connect((self.costas, 0), (self.mm_sync, 0)) - self.connect((self.mm_sync, 0), (self.mm_spectrum, 0)) - self.connect((self.mm_sync, 0), (self.mm_const, 0)) - - def set_config_filename(self, config_filename): - self.config_filename = config_filename - self._saved_freq_config = ConfigParser.ConfigParser() - self._saved_freq_config.read(self.config_filename) - if not self._saved_freq_config.has_section('usrp_rx_lrit'): - self._saved_freq_config.add_section('usrp_rx_lrit') - self._saved_freq_config.set('usrp_rx_lrit', 'freq', str(self.freq)) - self._saved_freq_config.write(open(self.config_filename, 'w')) - self._saved_offset_config = ConfigParser.ConfigParser() - self._saved_offset_config.read(self.config_filename) - if not self._saved_offset_config.has_section('usrp_rx_lrit'): - self._saved_offset_config.add_section('usrp_rx_lrit') - self._saved_offset_config.set('usrp_rx_lrit', 'offset', str(self.offset)) - self._saved_offset_config.write(open(self.config_filename, 'w')) - self._saved_gain_config = ConfigParser.ConfigParser() - self._saved_gain_config.read(self.config_filename) - if not self._saved_gain_config.has_section('usrp_rx_lrit'): - self._saved_gain_config.add_section('usrp_rx_lrit') - self._saved_gain_config.set('usrp_rx_lrit', 'gain', str(self.gain)) - self._saved_gain_config.write(open(self.config_filename, 'w')) - self._saved_decim_config = ConfigParser.ConfigParser() - self._saved_decim_config.read(self.config_filename) - if not self._saved_decim_config.has_section('usrp_rx_lrit'): - self._saved_decim_config.add_section('usrp_rx_lrit') - self._saved_decim_config.set('usrp_rx_lrit', 'decim', str(self.decim)) - self._saved_decim_config.write(open(self.config_filename, 'w')) - self._saved_costas_alpha_config = ConfigParser.ConfigParser() - self._saved_costas_alpha_config.read(self.config_filename) - if not self._saved_costas_alpha_config.has_section('usrp_rx_lrit'): - self._saved_costas_alpha_config.add_section('usrp_rx_lrit') - self._saved_costas_alpha_config.set('usrp_rx_lrit', 'costas_alpha', str(self.costas_alpha)) - self._saved_costas_alpha_config.write(open(self.config_filename, 'w')) - self._saved_gain_mu_config = ConfigParser.ConfigParser() - self._saved_gain_mu_config.read(self.config_filename) - if not self._saved_gain_mu_config.has_section('usrp_rx_lrit'): - self._saved_gain_mu_config.add_section('usrp_rx_lrit') - self._saved_gain_mu_config.set('usrp_rx_lrit', 'gain_mu', str(self.gain_mu)) - self._saved_gain_mu_config.write(open(self.config_filename, 'w')) - self._side_config = ConfigParser.ConfigParser() - self._side_config.read(self.config_filename) - if not self._side_config.has_section('usrp_rx_lrit'): - self._side_config.add_section('usrp_rx_lrit') - self._side_config.set('usrp_rx_lrit', 'side', str(self.side)) - self._side_config.write(open(self.config_filename, 'w')) - - def set_saved_decim(self, saved_decim): - self.saved_decim = saved_decim - self.set_decim(self.saved_decim) - - def set_decim(self, decim): - self.decim = decim - self.set_sample_rate(64e6/self.decim) - self._saved_decim_config = ConfigParser.ConfigParser() - self._saved_decim_config.read(self.config_filename) - if not self._saved_decim_config.has_section('usrp_rx_lrit'): - self._saved_decim_config.add_section('usrp_rx_lrit') - self._saved_decim_config.set('usrp_rx_lrit', 'decim', str(self.decim)) - self._saved_decim_config.write(open(self.config_filename, 'w')) - self._decim_text_box.set_value(self.decim) - self.usrp_simple_source_x_0.set_decim_rate(self.decim) - - def set_symbol_rate(self, symbol_rate): - self.symbol_rate = symbol_rate - self.set_sps(self.sample_rate/self.symbol_rate) - self.root_raised_cosine_filter_0.set_taps(firdes.root_raised_cosine(1, self.sample_rate, self.symbol_rate, 0.25, int(11*self.sample_rate/self.symbol_rate))) - self.mm_spectrum.set_sample_rate(self.symbol_rate) - self.mm_const.set_sample_rate(self.symbol_rate) - - def set_saved_offset(self, saved_offset): - self.saved_offset = saved_offset - self.set_offset(self.saved_offset) - - def set_saved_gain_mu(self, saved_gain_mu): - self.saved_gain_mu = saved_gain_mu - self.set_gain_mu(self.saved_gain_mu) - - def set_saved_gain(self, saved_gain): - self.saved_gain = saved_gain - self.set_gain(self.saved_gain) - - def set_saved_freq(self, saved_freq): - self.saved_freq = saved_freq - self.set_freq(self.saved_freq) - - def set_saved_costas_alpha(self, saved_costas_alpha): - self.saved_costas_alpha = saved_costas_alpha - self.set_costas_alpha(self.saved_costas_alpha) - - def set_sample_rate(self, sample_rate): - self.sample_rate = sample_rate - self.set_sps(self.sample_rate/self.symbol_rate) - self.rx_waveform.set_sample_rate(self.sample_rate) - self.rx_spectrum.set_sample_rate(self.sample_rate) - self.root_raised_cosine_filter_0.set_taps(firdes.root_raised_cosine(1, self.sample_rate, self.symbol_rate, 0.25, int(11*self.sample_rate/self.symbol_rate))) - self.rrc_waveform.set_sample_rate(self.sample_rate) - self.rrc_spectrum.set_sample_rate(self.sample_rate) - self.costas_spectrum.set_sample_rate(self.sample_rate) - self.costas_waveform.set_sample_rate(self.sample_rate) - - def set_sps(self, sps): - self.sps = sps - self.mm_sync.set_omega(self.sps) - - def set_side(self, side): - self.side = side - self._side_config = ConfigParser.ConfigParser() - self._side_config.read(self.config_filename) - if not self._side_config.has_section('usrp_rx_lrit'): - self._side_config.add_section('usrp_rx_lrit') - self._side_config.set('usrp_rx_lrit', 'side', str(self.side)) - self._side_config.write(open(self.config_filename, 'w')) - - def set_offset(self, offset): - self.offset = offset - self._saved_offset_config = ConfigParser.ConfigParser() - self._saved_offset_config.read(self.config_filename) - if not self._saved_offset_config.has_section('usrp_rx_lrit'): - self._saved_offset_config.add_section('usrp_rx_lrit') - self._saved_offset_config.set('usrp_rx_lrit', 'offset', str(self.offset)) - self._saved_offset_config.write(open(self.config_filename, 'w')) - self._offset_slider.set_value(self.offset) - self._offset_text_box.set_value(self.offset) - self.rrc_spectrum.set_baseband_freq(self.freq+self.offset) - self.costas_spectrum.set_baseband_freq(self.freq+self.offset) - self.usrp_simple_source_x_0.set_frequency(self.freq+self.offset) - - def set_gain_mu(self, gain_mu): - self.gain_mu = gain_mu - self._gain_mu_slider.set_value(self.gain_mu) - self._gain_mu_text_box.set_value(self.gain_mu) - self._saved_gain_mu_config = ConfigParser.ConfigParser() - self._saved_gain_mu_config.read(self.config_filename) - if not self._saved_gain_mu_config.has_section('usrp_rx_lrit'): - self._saved_gain_mu_config.add_section('usrp_rx_lrit') - self._saved_gain_mu_config.set('usrp_rx_lrit', 'gain_mu', str(self.gain_mu)) - self._saved_gain_mu_config.write(open(self.config_filename, 'w')) - self.mm_sync.set_gain_omega((self.gain_mu**2)/4.0) - self.mm_sync.set_gain_mu(self.gain_mu) - - def set_gain(self, gain): - self.gain = gain - self._saved_gain_config = ConfigParser.ConfigParser() - self._saved_gain_config.read(self.config_filename) - if not self._saved_gain_config.has_section('usrp_rx_lrit'): - self._saved_gain_config.add_section('usrp_rx_lrit') - self._saved_gain_config.set('usrp_rx_lrit', 'gain', str(self.gain)) - self._saved_gain_config.write(open(self.config_filename, 'w')) - self._gain_slider.set_value(self.gain) - self._gain_text_box.set_value(self.gain) - self.usrp_simple_source_x_0.set_gain(self.gain) - - def set_freq(self, freq): - self.freq = freq - self._freq_text_box.set_value(self.freq) - self._saved_freq_config = ConfigParser.ConfigParser() - self._saved_freq_config.read(self.config_filename) - if not self._saved_freq_config.has_section('usrp_rx_lrit'): - self._saved_freq_config.add_section('usrp_rx_lrit') - self._saved_freq_config.set('usrp_rx_lrit', 'freq', str(self.freq)) - self._saved_freq_config.write(open(self.config_filename, 'w')) - self.rx_spectrum.set_baseband_freq(self.freq) - self.rrc_spectrum.set_baseband_freq(self.freq+self.offset) - self.costas_spectrum.set_baseband_freq(self.freq+self.offset) - self.usrp_simple_source_x_0.set_frequency(self.freq+self.offset) - - def set_costas_alpha(self, costas_alpha): - self.costas_alpha = costas_alpha - self._costas_alpha_slider.set_value(self.costas_alpha) - self._costas_alpha_text_box.set_value(self.costas_alpha) - self._saved_costas_alpha_config = ConfigParser.ConfigParser() - self._saved_costas_alpha_config.read(self.config_filename) - if not self._saved_costas_alpha_config.has_section('usrp_rx_lrit'): - self._saved_costas_alpha_config.add_section('usrp_rx_lrit') - self._saved_costas_alpha_config.set('usrp_rx_lrit', 'costas_alpha', str(self.costas_alpha)) - self._saved_costas_alpha_config.write(open(self.config_filename, 'w')) - self.costas.set_alpha(self.costas_alpha) - self.costas.set_beta((self.costas_alpha**2.0)/4.0) - -if __name__ == '__main__': - parser = OptionParser(option_class=eng_option, usage="%prog: [options]") - (options, args) = parser.parse_args() - tb = usrp_rx_lrit() - tb.Run(True) - -- cgit