From e2216220f85d3e9d93db3946aa0e68e59309d1c2 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sun, 20 Sep 2009 09:49:10 -0700
Subject: Reorganization of directories

Moved apps into own directory
Added (empty) python directory
---
 gr-noaa/apps/usrp_rx_hrpt.py | 220 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 220 insertions(+)
 create mode 100755 gr-noaa/apps/usrp_rx_hrpt.py

(limited to 'gr-noaa/apps/usrp_rx_hrpt.py')

diff --git a/gr-noaa/apps/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py
new file mode 100755
index 000000000..40cc517fc
--- /dev/null
+++ b/gr-noaa/apps/usrp_rx_hrpt.py
@@ -0,0 +1,220 @@
+#!/usr/bin/env python
+##################################################
+# Gnuradio Python Flow Graph
+# Title: USRP HRPT Receiver
+# Generated: Tue Sep  8 21:03:12 2009
+##################################################
+
+from gnuradio import eng_notation
+from gnuradio import gr
+from gnuradio import noaa
+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 math
+import wx
+
+class usrp_rx_hrpt(grc_wxgui.top_block_gui):
+
+	def __init__(self):
+		grc_wxgui.top_block_gui.__init__(self, title="USRP HRPT Receiver")
+
+		##################################################
+		# Variables
+		##################################################
+		self.decim = decim = 16
+		self.sym_rate = sym_rate = 600*1109
+		self.sample_rate = sample_rate = 64e6/decim
+		self.sps = sps = sample_rate/sym_rate
+		self.sync_alpha = sync_alpha = 0.001
+		self.pll_alpha = pll_alpha = 0.001
+		self.max_sync_offset = max_sync_offset = 0.01
+		self.max_carrier_offset = max_carrier_offset = 2*math.pi*100e3/sample_rate
+		self.hs = hs = int(sps/2.0)
+
+		##################################################
+		# Notebooks
+		##################################################
+		self.displays = wx.Notebook(self.GetWin(), style=wx.NB_TOP)
+		self.displays.AddPage(grc_wxgui.Panel(self.displays), "RX")
+		self.displays.AddPage(grc_wxgui.Panel(self.displays), "PLL/SYNC")
+		self.GridAdd(self.displays, 1, 0, 1, 2)
+
+		##################################################
+		# Controls
+		##################################################
+		_sync_alpha_sizer = wx.BoxSizer(wx.VERTICAL)
+		self._sync_alpha_text_box = forms.text_box(
+			parent=self.GetWin(),
+			sizer=_sync_alpha_sizer,
+			value=self.sync_alpha,
+			callback=self.set_sync_alpha,
+			label="SYNC Alpha",
+			converter=forms.float_converter(),
+			proportion=0,
+		)
+		self._sync_alpha_slider = forms.slider(
+			parent=self.GetWin(),
+			sizer=_sync_alpha_sizer,
+			value=self.sync_alpha,
+			callback=self.set_sync_alpha,
+			minimum=0.0,
+			maximum=0.5,
+			num_steps=500,
+			style=wx.SL_HORIZONTAL,
+			cast=float,
+			proportion=1,
+		)
+		self.GridAdd(_sync_alpha_sizer, 0, 1, 1, 1)
+		_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=500,
+			style=wx.SL_HORIZONTAL,
+			cast=float,
+			proportion=1,
+		)
+		self.GridAdd(_pll_alpha_sizer, 0, 0, 1, 1)
+
+		##################################################
+		# Blocks
+		##################################################
+		self.agr = gr.agc_cc(1e-6, 1.0, 1.0, 1.0)
+		self.gr_char_to_float_0 = gr.char_to_float()
+		self.noaa_hrpt_deframer_0 = noaa.hrpt_deframer()
+		self.noaa_hrpt_pll_cf_0 = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
+		self.noaa_hrpt_sync_fb_0 = noaa.hrpt_sync_fb(0.001, 0.001**2/4.0, sps, max_sync_offset)
+		self.rx_fftsink = fftsink2.fft_sink_c(
+			self.displays.GetPage(0).GetWin(),
+			baseband_freq=1698e6,
+			y_per_div=5,
+			y_divs=8,
+			ref_level=-5,
+			ref_scale=2.0,
+			sample_rate=sample_rate,
+			fft_size=1024,
+			fft_rate=30,
+			average=True,
+			avg_alpha=0.1,
+			title="RX Spectrum",
+			peak_hold=False,
+		)
+		self.displays.GetPage(0).GridAdd(self.rx_fftsink.win, 0, 0, 1, 1)
+		self.src = gr.file_source(gr.sizeof_gr_complex*1, "poes-d16.dat", True)
+		self.throttle = gr.throttle(gr.sizeof_gr_complex*1, sample_rate)
+		self.wxgui_scopesink2_0 = scopesink2.scope_sink_c(
+			self.displays.GetPage(0).GetWin(),
+			title="RX Waveform",
+			sample_rate=sample_rate,
+			v_scale=0,
+			t_scale=20.0/sample_rate,
+			ac_couple=False,
+			xy_mode=False,
+			num_inputs=1,
+		)
+		self.displays.GetPage(0).GridAdd(self.wxgui_scopesink2_0.win, 1, 0, 1, 1)
+		self.wxgui_scopesink2_0_0 = scopesink2.scope_sink_f(
+			self.displays.GetPage(1).GetWin(),
+			title="Post-PLL",
+			sample_rate=sample_rate,
+			v_scale=0.5,
+			t_scale=20.0/sample_rate,
+			ac_couple=False,
+			xy_mode=False,
+			num_inputs=1,
+		)
+		self.displays.GetPage(1).GridAdd(self.wxgui_scopesink2_0_0.win, 0, 0, 1, 1)
+		self.wxgui_scopesink2_0_0_0_0 = scopesink2.scope_sink_f(
+			self.displays.GetPage(1).GetWin(),
+			title="Post-SYNC",
+			sample_rate=sym_rate,
+			v_scale=0.5,
+			t_scale=20.0/sym_rate,
+			ac_couple=False,
+			xy_mode=False,
+			num_inputs=1,
+		)
+		self.displays.GetPage(1).GridAdd(self.wxgui_scopesink2_0_0_0_0.win, 1, 0, 1, 1)
+
+		##################################################
+		# Connections
+		##################################################
+		self.connect((self.src, 0), (self.throttle, 0))
+		self.connect((self.throttle, 0), (self.agr, 0))
+		self.connect((self.agr, 0), (self.rx_fftsink, 0))
+		self.connect((self.agr, 0), (self.wxgui_scopesink2_0, 0))
+		self.connect((self.agr, 0), (self.noaa_hrpt_pll_cf_0, 0))
+		self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.wxgui_scopesink2_0_0, 0))
+		self.connect((self.noaa_hrpt_sync_fb_0, 0), (self.gr_char_to_float_0, 0))
+		self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.noaa_hrpt_sync_fb_0, 0))
+		self.connect((self.gr_char_to_float_0, 0), (self.wxgui_scopesink2_0_0_0_0, 0))
+		self.connect((self.noaa_hrpt_sync_fb_0, 0), (self.noaa_hrpt_deframer_0, 0))
+
+	def set_decim(self, decim):
+		self.decim = decim
+		self.set_sample_rate(64e6/self.decim)
+
+	def set_sym_rate(self, sym_rate):
+		self.sym_rate = sym_rate
+		self.set_sps(self.sample_rate/self.sym_rate)
+		self.wxgui_scopesink2_0_0_0_0.set_sample_rate(self.sym_rate)
+
+	def set_sample_rate(self, sample_rate):
+		self.sample_rate = sample_rate
+		self.set_sps(self.sample_rate/self.sym_rate)
+		self.set_max_carrier_offset(2*math.pi*100e3/self.sample_rate)
+		self.wxgui_scopesink2_0.set_sample_rate(self.sample_rate)
+		self.wxgui_scopesink2_0_0.set_sample_rate(self.sample_rate)
+		self.rx_fftsink.set_sample_rate(self.sample_rate)
+
+	def set_sps(self, sps):
+		self.sps = sps
+		self.set_hs(int(self.sps/2.0))
+
+	def set_sync_alpha(self, sync_alpha):
+		self.sync_alpha = sync_alpha
+		self._sync_alpha_slider.set_value(self.sync_alpha)
+		self._sync_alpha_text_box.set_value(self.sync_alpha)
+
+	def set_pll_alpha(self, pll_alpha):
+		self.pll_alpha = pll_alpha
+		self._pll_alpha_slider.set_value(self.pll_alpha)
+		self._pll_alpha_text_box.set_value(self.pll_alpha)
+		self.noaa_hrpt_pll_cf_0.set_alpha(self.pll_alpha)
+		self.noaa_hrpt_pll_cf_0.set_beta(self.pll_alpha**2/4.0)
+
+	def set_max_sync_offset(self, max_sync_offset):
+		self.max_sync_offset = max_sync_offset
+		self.noaa_hrpt_sync_fb_0.set_max_offset(self.max_sync_offset)
+
+	def set_max_carrier_offset(self, max_carrier_offset):
+		self.max_carrier_offset = max_carrier_offset
+		self.noaa_hrpt_pll_cf_0.set_max_offset(self.max_carrier_offset)
+
+	def set_hs(self, hs):
+		self.hs = hs
+
+if __name__ == '__main__':
+	parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
+	(options, args) = parser.parse_args()
+	tb = usrp_rx_hrpt()
+	tb.Run(True)
+
-- 
cgit 


From 2628e9cddc43d57a3346e240c8f7e58722bc61f1 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sun, 20 Sep 2009 12:47:34 -0700
Subject: Add HRPT word output to deframer

Put in half bit width matched filter
Change default sync_alpha to 0.05
---
 gr-noaa/apps/usrp_rx_hrpt.py | 46 ++++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 27 deletions(-)

(limited to 'gr-noaa/apps/usrp_rx_hrpt.py')

diff --git a/gr-noaa/apps/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py
index 40cc517fc..032db315d 100755
--- a/gr-noaa/apps/usrp_rx_hrpt.py
+++ b/gr-noaa/apps/usrp_rx_hrpt.py
@@ -2,7 +2,7 @@
 ##################################################
 # Gnuradio Python Flow Graph
 # Title: USRP HRPT Receiver
-# Generated: Tue Sep  8 21:03:12 2009
+# Generated: Sun Sep 20 12:45:30 2009
 ##################################################
 
 from gnuradio import eng_notation
@@ -30,7 +30,7 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		self.sym_rate = sym_rate = 600*1109
 		self.sample_rate = sample_rate = 64e6/decim
 		self.sps = sps = sample_rate/sym_rate
-		self.sync_alpha = sync_alpha = 0.001
+		self.sync_alpha = sync_alpha = 0.005
 		self.pll_alpha = pll_alpha = 0.001
 		self.max_sync_offset = max_sync_offset = 0.01
 		self.max_carrier_offset = max_carrier_offset = 2*math.pi*100e3/sample_rate
@@ -98,10 +98,11 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		# Blocks
 		##################################################
 		self.agr = gr.agc_cc(1e-6, 1.0, 1.0, 1.0)
-		self.gr_char_to_float_0 = gr.char_to_float()
+		self.gr_file_sink_1 = gr.file_sink(gr.sizeof_short*1, "frames.dat")
+		self.matched_filter = gr.moving_average_cc(hs, 1.0/hs, 4000)
 		self.noaa_hrpt_deframer_0 = noaa.hrpt_deframer()
 		self.noaa_hrpt_pll_cf_0 = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
-		self.noaa_hrpt_sync_fb_0 = noaa.hrpt_sync_fb(0.001, 0.001**2/4.0, sps, max_sync_offset)
+		self.noaa_hrpt_sync_fb_0 = noaa.hrpt_sync_fb(sync_alpha, sync_alpha**2/4.0, sps, max_sync_offset)
 		self.rx_fftsink = fftsink2.fft_sink_c(
 			self.displays.GetPage(0).GetWin(),
 			baseband_freq=1698e6,
@@ -118,7 +119,7 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 			peak_hold=False,
 		)
 		self.displays.GetPage(0).GridAdd(self.rx_fftsink.win, 0, 0, 1, 1)
-		self.src = gr.file_source(gr.sizeof_gr_complex*1, "poes-d16.dat", True)
+		self.src = gr.file_source(gr.sizeof_gr_complex*1, "poes-d16.dat", False)
 		self.throttle = gr.throttle(gr.sizeof_gr_complex*1, sample_rate)
 		self.wxgui_scopesink2_0 = scopesink2.scope_sink_c(
 			self.displays.GetPage(0).GetWin(),
@@ -142,31 +143,20 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 			num_inputs=1,
 		)
 		self.displays.GetPage(1).GridAdd(self.wxgui_scopesink2_0_0.win, 0, 0, 1, 1)
-		self.wxgui_scopesink2_0_0_0_0 = scopesink2.scope_sink_f(
-			self.displays.GetPage(1).GetWin(),
-			title="Post-SYNC",
-			sample_rate=sym_rate,
-			v_scale=0.5,
-			t_scale=20.0/sym_rate,
-			ac_couple=False,
-			xy_mode=False,
-			num_inputs=1,
-		)
-		self.displays.GetPage(1).GridAdd(self.wxgui_scopesink2_0_0_0_0.win, 1, 0, 1, 1)
 
 		##################################################
 		# Connections
 		##################################################
-		self.connect((self.src, 0), (self.throttle, 0))
-		self.connect((self.throttle, 0), (self.agr, 0))
-		self.connect((self.agr, 0), (self.rx_fftsink, 0))
-		self.connect((self.agr, 0), (self.wxgui_scopesink2_0, 0))
-		self.connect((self.agr, 0), (self.noaa_hrpt_pll_cf_0, 0))
-		self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.wxgui_scopesink2_0_0, 0))
-		self.connect((self.noaa_hrpt_sync_fb_0, 0), (self.gr_char_to_float_0, 0))
-		self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.noaa_hrpt_sync_fb_0, 0))
-		self.connect((self.gr_char_to_float_0, 0), (self.wxgui_scopesink2_0_0_0_0, 0))
+		self.connect((self.noaa_hrpt_deframer_0, 0), (self.gr_file_sink_1, 0))
 		self.connect((self.noaa_hrpt_sync_fb_0, 0), (self.noaa_hrpt_deframer_0, 0))
+		self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.noaa_hrpt_sync_fb_0, 0))
+		self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.wxgui_scopesink2_0_0, 0))
+		self.connect((self.agr, 0), (self.wxgui_scopesink2_0, 0))
+		self.connect((self.agr, 0), (self.rx_fftsink, 0))
+		self.connect((self.throttle, 0), (self.agr, 0))
+		self.connect((self.src, 0), (self.throttle, 0))
+		self.connect((self.agr, 0), (self.matched_filter, 0))
+		self.connect((self.matched_filter, 0), (self.noaa_hrpt_pll_cf_0, 0))
 
 	def set_decim(self, decim):
 		self.decim = decim
@@ -175,15 +165,14 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 	def set_sym_rate(self, sym_rate):
 		self.sym_rate = sym_rate
 		self.set_sps(self.sample_rate/self.sym_rate)
-		self.wxgui_scopesink2_0_0_0_0.set_sample_rate(self.sym_rate)
 
 	def set_sample_rate(self, sample_rate):
 		self.sample_rate = sample_rate
 		self.set_sps(self.sample_rate/self.sym_rate)
 		self.set_max_carrier_offset(2*math.pi*100e3/self.sample_rate)
-		self.wxgui_scopesink2_0.set_sample_rate(self.sample_rate)
 		self.wxgui_scopesink2_0_0.set_sample_rate(self.sample_rate)
 		self.rx_fftsink.set_sample_rate(self.sample_rate)
+		self.wxgui_scopesink2_0.set_sample_rate(self.sample_rate)
 
 	def set_sps(self, sps):
 		self.sps = sps
@@ -191,6 +180,8 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 
 	def set_sync_alpha(self, sync_alpha):
 		self.sync_alpha = sync_alpha
+		self.noaa_hrpt_sync_fb_0.set_alpha(self.sync_alpha)
+		self.noaa_hrpt_sync_fb_0.set_beta(self.sync_alpha**2/4.0)
 		self._sync_alpha_slider.set_value(self.sync_alpha)
 		self._sync_alpha_text_box.set_value(self.sync_alpha)
 
@@ -211,6 +202,7 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 
 	def set_hs(self, hs):
 		self.hs = hs
+		self.matched_filter.set_length_and_scale(self.hs, 1.0/self.hs)
 
 if __name__ == '__main__':
 	parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
-- 
cgit 


From 789435387ab3a886cd33304f4f47d60456765b70 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sun, 20 Sep 2009 19:10:10 -0700
Subject: Updated HRPT receiver to read files recorded as shorts

---
 gr-noaa/apps/usrp_rx_hrpt.py | 43 +++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

(limited to 'gr-noaa/apps/usrp_rx_hrpt.py')

diff --git a/gr-noaa/apps/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py
index 032db315d..6c50a348a 100755
--- a/gr-noaa/apps/usrp_rx_hrpt.py
+++ b/gr-noaa/apps/usrp_rx_hrpt.py
@@ -2,7 +2,7 @@
 ##################################################
 # Gnuradio Python Flow Graph
 # Title: USRP HRPT Receiver
-# Generated: Sun Sep 20 12:45:30 2009
+# Generated: Sun Sep 20 19:09:57 2009
 ##################################################
 
 from gnuradio import eng_notation
@@ -20,18 +20,23 @@ import wx
 
 class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 
-	def __init__(self):
+	def __init__(self, filename="", decim=16):
 		grc_wxgui.top_block_gui.__init__(self, title="USRP HRPT Receiver")
 
+		##################################################
+		# Parameters
+		##################################################
+		self.filename = filename
+		self.decim = decim
+
 		##################################################
 		# Variables
 		##################################################
-		self.decim = decim = 16
 		self.sym_rate = sym_rate = 600*1109
 		self.sample_rate = sample_rate = 64e6/decim
 		self.sps = sps = sample_rate/sym_rate
-		self.sync_alpha = sync_alpha = 0.005
-		self.pll_alpha = pll_alpha = 0.001
+		self.sync_alpha = sync_alpha = 0.1
+		self.pll_alpha = pll_alpha = 0.005
 		self.max_sync_offset = max_sync_offset = 0.01
 		self.max_carrier_offset = max_carrier_offset = 2*math.pi*100e3/sample_rate
 		self.hs = hs = int(sps/2.0)
@@ -98,7 +103,11 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		# Blocks
 		##################################################
 		self.agr = gr.agc_cc(1e-6, 1.0, 1.0, 1.0)
+		self.gr_deinterleave_0 = gr.deinterleave(gr.sizeof_float*1)
 		self.gr_file_sink_1 = gr.file_sink(gr.sizeof_short*1, "frames.dat")
+		self.gr_file_source_0 = gr.file_source(gr.sizeof_short*1, "filename", False)
+		self.gr_float_to_complex_0 = gr.float_to_complex(1)
+		self.gr_short_to_float_0 = gr.short_to_float()
 		self.matched_filter = gr.moving_average_cc(hs, 1.0/hs, 4000)
 		self.noaa_hrpt_deframer_0 = noaa.hrpt_deframer()
 		self.noaa_hrpt_pll_cf_0 = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
@@ -119,7 +128,6 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 			peak_hold=False,
 		)
 		self.displays.GetPage(0).GridAdd(self.rx_fftsink.win, 0, 0, 1, 1)
-		self.src = gr.file_source(gr.sizeof_gr_complex*1, "poes-d16.dat", False)
 		self.throttle = gr.throttle(gr.sizeof_gr_complex*1, sample_rate)
 		self.wxgui_scopesink2_0 = scopesink2.scope_sink_c(
 			self.displays.GetPage(0).GetWin(),
@@ -147,16 +155,23 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		##################################################
 		# Connections
 		##################################################
+		self.connect((self.throttle, 0), (self.agr, 0))
 		self.connect((self.noaa_hrpt_deframer_0, 0), (self.gr_file_sink_1, 0))
 		self.connect((self.noaa_hrpt_sync_fb_0, 0), (self.noaa_hrpt_deframer_0, 0))
 		self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.noaa_hrpt_sync_fb_0, 0))
 		self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.wxgui_scopesink2_0_0, 0))
 		self.connect((self.agr, 0), (self.wxgui_scopesink2_0, 0))
 		self.connect((self.agr, 0), (self.rx_fftsink, 0))
-		self.connect((self.throttle, 0), (self.agr, 0))
-		self.connect((self.src, 0), (self.throttle, 0))
 		self.connect((self.agr, 0), (self.matched_filter, 0))
 		self.connect((self.matched_filter, 0), (self.noaa_hrpt_pll_cf_0, 0))
+		self.connect((self.gr_float_to_complex_0, 0), (self.throttle, 0))
+		self.connect((self.gr_short_to_float_0, 0), (self.gr_deinterleave_0, 0))
+		self.connect((self.gr_deinterleave_0, 1), (self.gr_float_to_complex_0, 1))
+		self.connect((self.gr_deinterleave_0, 0), (self.gr_float_to_complex_0, 0))
+		self.connect((self.gr_file_source_0, 0), (self.gr_short_to_float_0, 0))
+
+	def set_filename(self, filename):
+		self.filename = filename
 
 	def set_decim(self, decim):
 		self.decim = decim
@@ -168,11 +183,11 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 
 	def set_sample_rate(self, sample_rate):
 		self.sample_rate = sample_rate
-		self.set_sps(self.sample_rate/self.sym_rate)
-		self.set_max_carrier_offset(2*math.pi*100e3/self.sample_rate)
 		self.wxgui_scopesink2_0_0.set_sample_rate(self.sample_rate)
-		self.rx_fftsink.set_sample_rate(self.sample_rate)
 		self.wxgui_scopesink2_0.set_sample_rate(self.sample_rate)
+		self.rx_fftsink.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 set_sps(self, sps):
 		self.sps = sps
@@ -206,7 +221,11 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 
 if __name__ == '__main__':
 	parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
+	parser.add_option("-f", "--filename", dest="filename", type="string", default="",
+		help="Set Filename [default=%default]")
+	parser.add_option("-d", "--decim", dest="decim", type="intx", default=16,
+		help="Set Decimation [default=%default]")
 	(options, args) = parser.parse_args()
-	tb = usrp_rx_hrpt()
+	tb = usrp_rx_hrpt(filename=options.filename, decim=options.decim)
 	tb.Run(True)
 
-- 
cgit 


From f8fcb642dabca11870886c53dfdff66c86774db0 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sun, 20 Sep 2009 19:32:30 -0700
Subject: Added skeleton HRPT decoder block

---
 gr-noaa/apps/usrp_rx_hrpt.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'gr-noaa/apps/usrp_rx_hrpt.py')

diff --git a/gr-noaa/apps/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py
index 6c50a348a..b29af5654 100755
--- a/gr-noaa/apps/usrp_rx_hrpt.py
+++ b/gr-noaa/apps/usrp_rx_hrpt.py
@@ -2,7 +2,7 @@
 ##################################################
 # Gnuradio Python Flow Graph
 # Title: USRP HRPT Receiver
-# Generated: Sun Sep 20 19:09:57 2009
+# Generated: Sun Sep 20 19:30:17 2009
 ##################################################
 
 from gnuradio import eng_notation
@@ -105,10 +105,11 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		self.agr = gr.agc_cc(1e-6, 1.0, 1.0, 1.0)
 		self.gr_deinterleave_0 = gr.deinterleave(gr.sizeof_float*1)
 		self.gr_file_sink_1 = gr.file_sink(gr.sizeof_short*1, "frames.dat")
-		self.gr_file_source_0 = gr.file_source(gr.sizeof_short*1, "filename", False)
+		self.gr_file_source_0 = gr.file_source(gr.sizeof_short*1, filename, False)
 		self.gr_float_to_complex_0 = gr.float_to_complex(1)
 		self.gr_short_to_float_0 = gr.short_to_float()
 		self.matched_filter = gr.moving_average_cc(hs, 1.0/hs, 4000)
+		self.noaa_hrpt_decoder_0 = noaa.hrpt_decoder()
 		self.noaa_hrpt_deframer_0 = noaa.hrpt_deframer()
 		self.noaa_hrpt_pll_cf_0 = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
 		self.noaa_hrpt_sync_fb_0 = noaa.hrpt_sync_fb(sync_alpha, sync_alpha**2/4.0, sps, max_sync_offset)
@@ -169,6 +170,7 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		self.connect((self.gr_deinterleave_0, 1), (self.gr_float_to_complex_0, 1))
 		self.connect((self.gr_deinterleave_0, 0), (self.gr_float_to_complex_0, 0))
 		self.connect((self.gr_file_source_0, 0), (self.gr_short_to_float_0, 0))
+		self.connect((self.noaa_hrpt_deframer_0, 0), (self.noaa_hrpt_decoder_0, 0))
 
 	def set_filename(self, filename):
 		self.filename = filename
-- 
cgit 


From 7c4b43a1a4b3ff6c99fe96805f8d4518a22eb0a5 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Wed, 23 Sep 2009 11:40:19 -0700
Subject: Split HRPT script into live receive and post-processing

Cleanup debug info
Created 'demod_hrpt_file.py'
Updated 'usrp_rx_hrpt.py' with GUI, USRP, and config file
---
 gr-noaa/apps/usrp_rx_hrpt.py | 352 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 277 insertions(+), 75 deletions(-)

(limited to 'gr-noaa/apps/usrp_rx_hrpt.py')

diff --git a/gr-noaa/apps/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py
index b29af5654..7efbecd3a 100755
--- a/gr-noaa/apps/usrp_rx_hrpt.py
+++ b/gr-noaa/apps/usrp_rx_hrpt.py
@@ -2,7 +2,7 @@
 ##################################################
 # Gnuradio Python Flow Graph
 # Title: USRP HRPT Receiver
-# Generated: Sun Sep 20 19:30:17 2009
+# Generated: Wed Sep 23 11:32:04 2009
 ##################################################
 
 from gnuradio import eng_notation
@@ -13,41 +13,77 @@ 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 math
 import wx
 
 class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 
-	def __init__(self, filename="", decim=16):
+	def __init__(self):
 		grc_wxgui.top_block_gui.__init__(self, title="USRP HRPT Receiver")
 
-		##################################################
-		# Parameters
-		##################################################
-		self.filename = filename
-		self.decim = decim
-
 		##################################################
 		# Variables
 		##################################################
+		self.config_filename = config_filename = 'usrp_rx_hrpt.cfg'
+		self._decim_config = ConfigParser.ConfigParser()
+		self._decim_config.read(config_filename)
+		try: decim = self._decim_config.getfloat('usrp', 'decim')
+		except: decim = 16
+		self.decim = decim
 		self.sym_rate = sym_rate = 600*1109
 		self.sample_rate = sample_rate = 64e6/decim
 		self.sps = sps = sample_rate/sym_rate
-		self.sync_alpha = sync_alpha = 0.1
-		self.pll_alpha = pll_alpha = 0.005
+		self._side_config = ConfigParser.ConfigParser()
+		self._side_config.read(config_filename)
+		try: side = self._side_config.get('usrp', 'side')
+		except: side = 'A'
+		self.side = side
+		self._saved_sync_alpha_config = ConfigParser.ConfigParser()
+		self._saved_sync_alpha_config.read(config_filename)
+		try: saved_sync_alpha = self._saved_sync_alpha_config.getfloat('demod', 'sync_alpha')
+		except: saved_sync_alpha = 0.05
+		self.saved_sync_alpha = saved_sync_alpha
+		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('demod', 'pll_alpha')
+		except: saved_pll_alpha = 0.05
+		self.saved_pll_alpha = saved_pll_alpha
+		self._saved_gain_config = ConfigParser.ConfigParser()
+		self._saved_gain_config.read(config_filename)
+		try: saved_gain = self._saved_gain_config.getfloat('usrp', 'gain')
+		except: saved_gain = 35
+		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', 'freq')
+		except: saved_freq = 1698e6
+		self.saved_freq = saved_freq
+		self.sync_alpha = sync_alpha = saved_sync_alpha
+		self.side_text = side_text = side
+		self.pll_alpha = pll_alpha = saved_pll_alpha
+		self._output_filename_config = ConfigParser.ConfigParser()
+		self._output_filename_config.read(config_filename)
+		try: output_filename = self._output_filename_config.get('output', 'filename')
+		except: output_filename = 'frames.dat'
+		self.output_filename = output_filename
 		self.max_sync_offset = max_sync_offset = 0.01
 		self.max_carrier_offset = max_carrier_offset = 2*math.pi*100e3/sample_rate
 		self.hs = hs = int(sps/2.0)
+		self.gain = gain = saved_gain
+		self.freq = freq = saved_freq
+		self.decim_text = decim_text = decim
 
 		##################################################
 		# Notebooks
 		##################################################
 		self.displays = wx.Notebook(self.GetWin(), style=wx.NB_TOP)
 		self.displays.AddPage(grc_wxgui.Panel(self.displays), "RX")
-		self.displays.AddPage(grc_wxgui.Panel(self.displays), "PLL/SYNC")
-		self.GridAdd(self.displays, 1, 0, 1, 2)
+		self.displays.AddPage(grc_wxgui.Panel(self.displays), "Demod")
+		self.GridAdd(self.displays, 2, 0, 1, 4)
 
 		##################################################
 		# Controls
@@ -69,12 +105,20 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 			callback=self.set_sync_alpha,
 			minimum=0.0,
 			maximum=0.5,
-			num_steps=500,
+			num_steps=100,
 			style=wx.SL_HORIZONTAL,
 			cast=float,
 			proportion=1,
 		)
-		self.GridAdd(_sync_alpha_sizer, 0, 1, 1, 1)
+		self.GridAdd(_sync_alpha_sizer, 0, 3, 1, 1)
+		self._side_text_static_text = forms.static_text(
+			parent=self.GetWin(),
+			value=self.side_text,
+			callback=self.set_side_text,
+			label="USRP Side",
+			converter=forms.str_converter(),
+		)
+		self.GridAdd(self._side_text_static_text, 1, 0, 1, 1)
 		_pll_alpha_sizer = wx.BoxSizer(wx.VERTICAL)
 		self._pll_alpha_text_box = forms.text_box(
 			parent=self.GetWin(),
@@ -92,30 +136,75 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 			callback=self.set_pll_alpha,
 			minimum=0.0,
 			maximum=0.5,
-			num_steps=500,
+			num_steps=100,
+			style=wx.SL_HORIZONTAL,
+			cast=float,
+			proportion=1,
+		)
+		self.GridAdd(_pll_alpha_sizer, 0, 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="RX 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=100,
+			num_steps=100,
 			style=wx.SL_HORIZONTAL,
 			cast=float,
 			proportion=1,
 		)
-		self.GridAdd(_pll_alpha_sizer, 0, 0, 1, 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)
 
 		##################################################
 		# Blocks
 		##################################################
-		self.agr = gr.agc_cc(1e-6, 1.0, 1.0, 1.0)
-		self.gr_deinterleave_0 = gr.deinterleave(gr.sizeof_float*1)
-		self.gr_file_sink_1 = gr.file_sink(gr.sizeof_short*1, "frames.dat")
-		self.gr_file_source_0 = gr.file_source(gr.sizeof_short*1, filename, False)
-		self.gr_float_to_complex_0 = gr.float_to_complex(1)
-		self.gr_short_to_float_0 = gr.short_to_float()
+		self.agc = gr.agc_cc(1e-6, 1.0, 1.0, 1.0)
+		self.decoder = noaa.hrpt_decoder()
+		self.deframer = noaa.hrpt_deframer()
+		self.frame_sink = gr.file_sink(gr.sizeof_short*1, output_filename)
 		self.matched_filter = gr.moving_average_cc(hs, 1.0/hs, 4000)
-		self.noaa_hrpt_decoder_0 = noaa.hrpt_decoder()
-		self.noaa_hrpt_deframer_0 = noaa.hrpt_deframer()
-		self.noaa_hrpt_pll_cf_0 = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
-		self.noaa_hrpt_sync_fb_0 = noaa.hrpt_sync_fb(sync_alpha, sync_alpha**2/4.0, sps, max_sync_offset)
-		self.rx_fftsink = fftsink2.fft_sink_c(
+		self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
+		self.pll_scope = scopesink2.scope_sink_f(
+			self.displays.GetPage(1).GetWin(),
+			title="Post-PLL",
+			sample_rate=sample_rate,
+			v_scale=0.5,
+			t_scale=20.0/sample_rate,
+			ac_couple=False,
+			xy_mode=False,
+			num_inputs=1,
+		)
+		self.displays.GetPage(1).GridAdd(self.pll_scope.win, 0, 0, 1, 1)
+		self.rx_fft = fftsink2.fft_sink_c(
 			self.displays.GetPage(0).GetWin(),
-			baseband_freq=1698e6,
+			baseband_freq=freq,
 			y_per_div=5,
 			y_divs=8,
 			ref_level=-5,
@@ -128,9 +217,8 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 			title="RX Spectrum",
 			peak_hold=False,
 		)
-		self.displays.GetPage(0).GridAdd(self.rx_fftsink.win, 0, 0, 1, 1)
-		self.throttle = gr.throttle(gr.sizeof_gr_complex*1, sample_rate)
-		self.wxgui_scopesink2_0 = scopesink2.scope_sink_c(
+		self.displays.GetPage(0).GridAdd(self.rx_fft.win, 0, 0, 1, 1)
+		self.rx_scope = scopesink2.scope_sink_c(
 			self.displays.GetPage(0).GetWin(),
 			title="RX Waveform",
 			sample_rate=sample_rate,
@@ -140,44 +228,83 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 			xy_mode=False,
 			num_inputs=1,
 		)
-		self.displays.GetPage(0).GridAdd(self.wxgui_scopesink2_0.win, 1, 0, 1, 1)
-		self.wxgui_scopesink2_0_0 = scopesink2.scope_sink_f(
-			self.displays.GetPage(1).GetWin(),
-			title="Post-PLL",
-			sample_rate=sample_rate,
-			v_scale=0.5,
-			t_scale=20.0/sample_rate,
-			ac_couple=False,
-			xy_mode=False,
-			num_inputs=1,
-		)
-		self.displays.GetPage(1).GridAdd(self.wxgui_scopesink2_0_0.win, 0, 0, 1, 1)
+		self.displays.GetPage(0).GridAdd(self.rx_scope.win, 1, 0, 1, 1)
+		self.sync = noaa.hrpt_sync_fb(sync_alpha, sync_alpha**2/4.0, sps, max_sync_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)
 
 		##################################################
 		# Connections
 		##################################################
-		self.connect((self.throttle, 0), (self.agr, 0))
-		self.connect((self.noaa_hrpt_deframer_0, 0), (self.gr_file_sink_1, 0))
-		self.connect((self.noaa_hrpt_sync_fb_0, 0), (self.noaa_hrpt_deframer_0, 0))
-		self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.noaa_hrpt_sync_fb_0, 0))
-		self.connect((self.noaa_hrpt_pll_cf_0, 0), (self.wxgui_scopesink2_0_0, 0))
-		self.connect((self.agr, 0), (self.wxgui_scopesink2_0, 0))
-		self.connect((self.agr, 0), (self.rx_fftsink, 0))
-		self.connect((self.agr, 0), (self.matched_filter, 0))
-		self.connect((self.matched_filter, 0), (self.noaa_hrpt_pll_cf_0, 0))
-		self.connect((self.gr_float_to_complex_0, 0), (self.throttle, 0))
-		self.connect((self.gr_short_to_float_0, 0), (self.gr_deinterleave_0, 0))
-		self.connect((self.gr_deinterleave_0, 1), (self.gr_float_to_complex_0, 1))
-		self.connect((self.gr_deinterleave_0, 0), (self.gr_float_to_complex_0, 0))
-		self.connect((self.gr_file_source_0, 0), (self.gr_short_to_float_0, 0))
-		self.connect((self.noaa_hrpt_deframer_0, 0), (self.noaa_hrpt_decoder_0, 0))
-
-	def set_filename(self, filename):
-		self.filename = filename
+		self.connect((self.deframer, 0), (self.frame_sink, 0))
+		self.connect((self.sync, 0), (self.deframer, 0))
+		self.connect((self.pll, 0), (self.sync, 0))
+		self.connect((self.pll, 0), (self.pll_scope, 0))
+		self.connect((self.agc, 0), (self.rx_scope, 0))
+		self.connect((self.agc, 0), (self.rx_fft, 0))
+		self.connect((self.agc, 0), (self.matched_filter, 0))
+		self.connect((self.matched_filter, 0), (self.pll, 0))
+		self.connect((self.deframer, 0), (self.decoder, 0))
+		self.connect((self.usrp_source, 0), (self.agc, 0))
+
+	def set_config_filename(self, config_filename):
+		self.config_filename = config_filename
+		self._side_config = ConfigParser.ConfigParser()
+		self._side_config.read(self.config_filename)
+		if not self._side_config.has_section('usrp'):
+			self._side_config.add_section('usrp')
+		self._side_config.set('usrp', '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'):
+			self._decim_config.add_section('usrp')
+		self._decim_config.set('usrp', 'decim', str(self.decim))
+		self._decim_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'):
+			self._saved_freq_config.add_section('usrp')
+		self._saved_freq_config.set('usrp', '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'):
+			self._saved_gain_config.add_section('usrp')
+		self._saved_gain_config.set('usrp', 'gain', str(self.gain))
+		self._saved_gain_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('demod'):
+			self._saved_pll_alpha_config.add_section('demod')
+		self._saved_pll_alpha_config.set('demod', 'pll_alpha', str(self.pll_alpha))
+		self._saved_pll_alpha_config.write(open(self.config_filename, 'w'))
+		self._saved_sync_alpha_config = ConfigParser.ConfigParser()
+		self._saved_sync_alpha_config.read(self.config_filename)
+		if not self._saved_sync_alpha_config.has_section('demod'):
+			self._saved_sync_alpha_config.add_section('demod')
+		self._saved_sync_alpha_config.set('demod', 'sync_alpha', str(self.sync_alpha))
+		self._saved_sync_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('output'):
+			self._output_filename_config.add_section('output')
+		self._output_filename_config.set('output', 'filename', str(self.output_filename))
+		self._output_filename_config.write(open(self.config_filename, 'w'))
 
 	def set_decim(self, decim):
 		self.decim = decim
 		self.set_sample_rate(64e6/self.decim)
+		self._decim_config = ConfigParser.ConfigParser()
+		self._decim_config.read(self.config_filename)
+		if not self._decim_config.has_section('usrp'):
+			self._decim_config.add_section('usrp')
+		self._decim_config.set('usrp', 'decim', str(self.decim))
+		self._decim_config.write(open(self.config_filename, 'w'))
+		self.set_decim_text(self.decim)
+		self.usrp_source.set_decim_rate(self.decim)
 
 	def set_sym_rate(self, sym_rate):
 		self.sym_rate = sym_rate
@@ -185,49 +312,124 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 
 	def set_sample_rate(self, sample_rate):
 		self.sample_rate = sample_rate
-		self.wxgui_scopesink2_0_0.set_sample_rate(self.sample_rate)
-		self.wxgui_scopesink2_0.set_sample_rate(self.sample_rate)
-		self.rx_fftsink.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)
+		self.rx_scope.set_sample_rate(self.sample_rate)
+		self.rx_fft.set_sample_rate(self.sample_rate)
+		self.pll_scope.set_sample_rate(self.sample_rate)
 
 	def set_sps(self, sps):
 		self.sps = sps
 		self.set_hs(int(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'):
+			self._side_config.add_section('usrp')
+		self._side_config.set('usrp', 'side', str(self.side))
+		self._side_config.write(open(self.config_filename, 'w'))
+
+	def set_saved_sync_alpha(self, saved_sync_alpha):
+		self.saved_sync_alpha = saved_sync_alpha
+		self.set_sync_alpha(self.saved_sync_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 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_sync_alpha(self, sync_alpha):
 		self.sync_alpha = sync_alpha
-		self.noaa_hrpt_sync_fb_0.set_alpha(self.sync_alpha)
-		self.noaa_hrpt_sync_fb_0.set_beta(self.sync_alpha**2/4.0)
 		self._sync_alpha_slider.set_value(self.sync_alpha)
 		self._sync_alpha_text_box.set_value(self.sync_alpha)
+		self._saved_sync_alpha_config = ConfigParser.ConfigParser()
+		self._saved_sync_alpha_config.read(self.config_filename)
+		if not self._saved_sync_alpha_config.has_section('demod'):
+			self._saved_sync_alpha_config.add_section('demod')
+		self._saved_sync_alpha_config.set('demod', 'sync_alpha', str(self.sync_alpha))
+		self._saved_sync_alpha_config.write(open(self.config_filename, 'w'))
+		self.sync.set_alpha(self.sync_alpha)
+		self.sync.set_beta(self.sync_alpha**2/4.0)
+
+	def set_side_text(self, side_text):
+		self.side_text = side_text
+		self._side_text_static_text.set_value(self.side_text)
 
 	def set_pll_alpha(self, pll_alpha):
 		self.pll_alpha = pll_alpha
 		self._pll_alpha_slider.set_value(self.pll_alpha)
 		self._pll_alpha_text_box.set_value(self.pll_alpha)
-		self.noaa_hrpt_pll_cf_0.set_alpha(self.pll_alpha)
-		self.noaa_hrpt_pll_cf_0.set_beta(self.pll_alpha**2/4.0)
+		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('demod'):
+			self._saved_pll_alpha_config.add_section('demod')
+		self._saved_pll_alpha_config.set('demod', 'pll_alpha', str(self.pll_alpha))
+		self._saved_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 set_output_filename(self, output_filename):
+		self.output_filename = output_filename
+		self._output_filename_config = ConfigParser.ConfigParser()
+		self._output_filename_config.read(self.config_filename)
+		if not self._output_filename_config.has_section('output'):
+			self._output_filename_config.add_section('output')
+		self._output_filename_config.set('output', 'filename', str(self.output_filename))
+		self._output_filename_config.write(open(self.config_filename, 'w'))
 
 	def set_max_sync_offset(self, max_sync_offset):
 		self.max_sync_offset = max_sync_offset
-		self.noaa_hrpt_sync_fb_0.set_max_offset(self.max_sync_offset)
+		self.sync.set_max_offset(self.max_sync_offset)
 
 	def set_max_carrier_offset(self, max_carrier_offset):
 		self.max_carrier_offset = max_carrier_offset
-		self.noaa_hrpt_pll_cf_0.set_max_offset(self.max_carrier_offset)
+		self.pll.set_max_offset(self.max_carrier_offset)
 
 	def set_hs(self, hs):
 		self.hs = hs
 		self.matched_filter.set_length_and_scale(self.hs, 1.0/self.hs)
 
+	def set_gain(self, gain):
+		self.gain = gain
+		self._gain_slider.set_value(self.gain)
+		self._gain_text_box.set_value(self.gain)
+		self._saved_gain_config = ConfigParser.ConfigParser()
+		self._saved_gain_config.read(self.config_filename)
+		if not self._saved_gain_config.has_section('usrp'):
+			self._saved_gain_config.add_section('usrp')
+		self._saved_gain_config.set('usrp', 'gain', str(self.gain))
+		self._saved_gain_config.write(open(self.config_filename, 'w'))
+		self.usrp_source.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'):
+			self._saved_freq_config.add_section('usrp')
+		self._saved_freq_config.set('usrp', '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)
+
 if __name__ == '__main__':
 	parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
-	parser.add_option("-f", "--filename", dest="filename", type="string", default="",
-		help="Set Filename [default=%default]")
-	parser.add_option("-d", "--decim", dest="decim", type="intx", default=16,
-		help="Set Decimation [default=%default]")
 	(options, args) = parser.parse_args()
-	tb = usrp_rx_hrpt(filename=options.filename, decim=options.decim)
+	tb = usrp_rx_hrpt()
 	tb.Run(True)
 
-- 
cgit 


From ec8c8e0e9d68383279b0fb51a52adf04f11fd88a Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sun, 27 Sep 2009 10:15:04 -0700
Subject: General improvements in HRPT receiver

Added usrp_rx_hrpt_nogui script
Simplified usrp_rx_hrpt script for lower CPU usage
Changed matched filtering taps to be whole symbol
---
 gr-noaa/apps/usrp_rx_hrpt.py | 82 +++++++++++++-------------------------------
 1 file changed, 24 insertions(+), 58 deletions(-)

(limited to 'gr-noaa/apps/usrp_rx_hrpt.py')

diff --git a/gr-noaa/apps/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py
index 7efbecd3a..9b19d5e4f 100755
--- a/gr-noaa/apps/usrp_rx_hrpt.py
+++ b/gr-noaa/apps/usrp_rx_hrpt.py
@@ -2,7 +2,7 @@
 ##################################################
 # Gnuradio Python Flow Graph
 # Title: USRP HRPT Receiver
-# Generated: Wed Sep 23 11:32:04 2009
+# Generated: Sun Sep 27 10:06:41 2009
 ##################################################
 
 from gnuradio import eng_notation
@@ -10,7 +10,6 @@ from gnuradio import gr
 from gnuradio import noaa
 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
@@ -62,6 +61,7 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		try: saved_freq = self._saved_freq_config.getfloat('usrp', 'freq')
 		except: saved_freq = 1698e6
 		self.saved_freq = saved_freq
+		self.hs = hs = int(sps/2.0)
 		self.sync_alpha = sync_alpha = saved_sync_alpha
 		self.side_text = side_text = side
 		self.pll_alpha = pll_alpha = saved_pll_alpha
@@ -70,21 +70,13 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		try: output_filename = self._output_filename_config.get('output', 'filename')
 		except: output_filename = 'frames.dat'
 		self.output_filename = output_filename
+		self.mf_taps = mf_taps = [-0.5/hs,]*hs+[0.5/hs,]*hs
 		self.max_sync_offset = max_sync_offset = 0.01
 		self.max_carrier_offset = max_carrier_offset = 2*math.pi*100e3/sample_rate
-		self.hs = hs = int(sps/2.0)
 		self.gain = gain = saved_gain
 		self.freq = freq = saved_freq
 		self.decim_text = decim_text = decim
 
-		##################################################
-		# Notebooks
-		##################################################
-		self.displays = wx.Notebook(self.GetWin(), style=wx.NB_TOP)
-		self.displays.AddPage(grc_wxgui.Panel(self.displays), "RX")
-		self.displays.AddPage(grc_wxgui.Panel(self.displays), "Demod")
-		self.GridAdd(self.displays, 2, 0, 1, 4)
-
 		##################################################
 		# Controls
 		##################################################
@@ -189,11 +181,11 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		self.decoder = noaa.hrpt_decoder()
 		self.deframer = noaa.hrpt_deframer()
 		self.frame_sink = gr.file_sink(gr.sizeof_short*1, output_filename)
-		self.matched_filter = gr.moving_average_cc(hs, 1.0/hs, 4000)
+		self.gr_fir_filter_xxx_0 = gr.fir_filter_ccc(1, (mf_taps))
 		self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
 		self.pll_scope = scopesink2.scope_sink_f(
-			self.displays.GetPage(1).GetWin(),
-			title="Post-PLL",
+			self.GetWin(),
+			title="Demod Waveform",
 			sample_rate=sample_rate,
 			v_scale=0.5,
 			t_scale=20.0/sample_rate,
@@ -201,34 +193,7 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 			xy_mode=False,
 			num_inputs=1,
 		)
-		self.displays.GetPage(1).GridAdd(self.pll_scope.win, 0, 0, 1, 1)
-		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=30,
-			average=True,
-			avg_alpha=0.1,
-			title="RX Spectrum",
-			peak_hold=False,
-		)
-		self.displays.GetPage(0).GridAdd(self.rx_fft.win, 0, 0, 1, 1)
-		self.rx_scope = scopesink2.scope_sink_c(
-			self.displays.GetPage(0).GetWin(),
-			title="RX Waveform",
-			sample_rate=sample_rate,
-			v_scale=0,
-			t_scale=20.0/sample_rate,
-			ac_couple=False,
-			xy_mode=False,
-			num_inputs=1,
-		)
-		self.displays.GetPage(0).GridAdd(self.rx_scope.win, 1, 0, 1, 1)
+		self.GridAdd(self.pll_scope.win, 2, 0, 1, 4)
 		self.sync = noaa.hrpt_sync_fb(sync_alpha, sync_alpha**2/4.0, sps, max_sync_offset)
 		self.usrp_source = grc_usrp.simple_source_c(which=0, side=side, rx_ant="RXA")
 		self.usrp_source.set_decim_rate(decim)
@@ -238,16 +203,14 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		##################################################
 		# Connections
 		##################################################
-		self.connect((self.deframer, 0), (self.frame_sink, 0))
-		self.connect((self.sync, 0), (self.deframer, 0))
-		self.connect((self.pll, 0), (self.sync, 0))
-		self.connect((self.pll, 0), (self.pll_scope, 0))
-		self.connect((self.agc, 0), (self.rx_scope, 0))
-		self.connect((self.agc, 0), (self.rx_fft, 0))
-		self.connect((self.agc, 0), (self.matched_filter, 0))
-		self.connect((self.matched_filter, 0), (self.pll, 0))
-		self.connect((self.deframer, 0), (self.decoder, 0))
+		self.connect((self.gr_fir_filter_xxx_0, 0), (self.pll, 0))
+		self.connect((self.agc, 0), (self.gr_fir_filter_xxx_0, 0))
 		self.connect((self.usrp_source, 0), (self.agc, 0))
+		self.connect((self.deframer, 0), (self.decoder, 0))
+		self.connect((self.pll, 0), (self.pll_scope, 0))
+		self.connect((self.pll, 0), (self.sync, 0))
+		self.connect((self.sync, 0), (self.deframer, 0))
+		self.connect((self.deframer, 0), (self.frame_sink, 0))
 
 	def set_config_filename(self, config_filename):
 		self.config_filename = config_filename
@@ -314,8 +277,6 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		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_scope.set_sample_rate(self.sample_rate)
-		self.rx_fft.set_sample_rate(self.sample_rate)
 		self.pll_scope.set_sample_rate(self.sample_rate)
 
 	def set_sps(self, sps):
@@ -348,6 +309,10 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		self.saved_freq = saved_freq
 		self.set_freq(self.saved_freq)
 
+	def set_hs(self, hs):
+		self.hs = hs
+		self.set_mf_taps([-0.5/self.hs,]*self.hs+[0.5/self.hs,]*self.hs)
+
 	def set_sync_alpha(self, sync_alpha):
 		self.sync_alpha = sync_alpha
 		self._sync_alpha_slider.set_value(self.sync_alpha)
@@ -387,6 +352,10 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		self._output_filename_config.set('output', 'filename', str(self.output_filename))
 		self._output_filename_config.write(open(self.config_filename, 'w'))
 
+	def set_mf_taps(self, mf_taps):
+		self.mf_taps = mf_taps
+		self.gr_fir_filter_xxx_0.set_taps((self.mf_taps))
+
 	def set_max_sync_offset(self, max_sync_offset):
 		self.max_sync_offset = max_sync_offset
 		self.sync.set_max_offset(self.max_sync_offset)
@@ -395,10 +364,6 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		self.max_carrier_offset = max_carrier_offset
 		self.pll.set_max_offset(self.max_carrier_offset)
 
-	def set_hs(self, hs):
-		self.hs = hs
-		self.matched_filter.set_length_and_scale(self.hs, 1.0/self.hs)
-
 	def set_gain(self, gain):
 		self.gain = gain
 		self._gain_slider.set_value(self.gain)
@@ -421,7 +386,6 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 		self._saved_freq_config.set('usrp', '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
@@ -430,6 +394,8 @@ class usrp_rx_hrpt(grc_wxgui.top_block_gui):
 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()
 	tb.Run(True)
 
-- 
cgit 


From db2f60baf542ac35151eb7084e274701861bacc5 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sun, 27 Sep 2009 13:34:20 -0700
Subject: Renamed simplified HRPT script to allow restoring original

---
 gr-noaa/apps/usrp_rx_hrpt.py | 401 -------------------------------------------
 1 file changed, 401 deletions(-)
 delete mode 100755 gr-noaa/apps/usrp_rx_hrpt.py

(limited to 'gr-noaa/apps/usrp_rx_hrpt.py')

diff --git a/gr-noaa/apps/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py
deleted file mode 100755
index 9b19d5e4f..000000000
--- a/gr-noaa/apps/usrp_rx_hrpt.py
+++ /dev/null
@@ -1,401 +0,0 @@
-#!/usr/bin/env python
-##################################################
-# Gnuradio Python Flow Graph
-# Title: USRP HRPT Receiver
-# Generated: Sun Sep 27 10:06:41 2009
-##################################################
-
-from gnuradio import eng_notation
-from gnuradio import gr
-from gnuradio import noaa
-from gnuradio.eng_option import eng_option
-from gnuradio.gr import firdes
-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 math
-import wx
-
-class usrp_rx_hrpt(grc_wxgui.top_block_gui):
-
-	def __init__(self):
-		grc_wxgui.top_block_gui.__init__(self, title="USRP HRPT Receiver")
-
-		##################################################
-		# Variables
-		##################################################
-		self.config_filename = config_filename = 'usrp_rx_hrpt.cfg'
-		self._decim_config = ConfigParser.ConfigParser()
-		self._decim_config.read(config_filename)
-		try: decim = self._decim_config.getfloat('usrp', 'decim')
-		except: decim = 16
-		self.decim = decim
-		self.sym_rate = sym_rate = 600*1109
-		self.sample_rate = sample_rate = 64e6/decim
-		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', 'side')
-		except: side = 'A'
-		self.side = side
-		self._saved_sync_alpha_config = ConfigParser.ConfigParser()
-		self._saved_sync_alpha_config.read(config_filename)
-		try: saved_sync_alpha = self._saved_sync_alpha_config.getfloat('demod', 'sync_alpha')
-		except: saved_sync_alpha = 0.05
-		self.saved_sync_alpha = saved_sync_alpha
-		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('demod', 'pll_alpha')
-		except: saved_pll_alpha = 0.05
-		self.saved_pll_alpha = saved_pll_alpha
-		self._saved_gain_config = ConfigParser.ConfigParser()
-		self._saved_gain_config.read(config_filename)
-		try: saved_gain = self._saved_gain_config.getfloat('usrp', 'gain')
-		except: saved_gain = 35
-		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', 'freq')
-		except: saved_freq = 1698e6
-		self.saved_freq = saved_freq
-		self.hs = hs = int(sps/2.0)
-		self.sync_alpha = sync_alpha = saved_sync_alpha
-		self.side_text = side_text = side
-		self.pll_alpha = pll_alpha = saved_pll_alpha
-		self._output_filename_config = ConfigParser.ConfigParser()
-		self._output_filename_config.read(config_filename)
-		try: output_filename = self._output_filename_config.get('output', 'filename')
-		except: output_filename = 'frames.dat'
-		self.output_filename = output_filename
-		self.mf_taps = mf_taps = [-0.5/hs,]*hs+[0.5/hs,]*hs
-		self.max_sync_offset = max_sync_offset = 0.01
-		self.max_carrier_offset = max_carrier_offset = 2*math.pi*100e3/sample_rate
-		self.gain = gain = saved_gain
-		self.freq = freq = saved_freq
-		self.decim_text = decim_text = decim
-
-		##################################################
-		# Controls
-		##################################################
-		_sync_alpha_sizer = wx.BoxSizer(wx.VERTICAL)
-		self._sync_alpha_text_box = forms.text_box(
-			parent=self.GetWin(),
-			sizer=_sync_alpha_sizer,
-			value=self.sync_alpha,
-			callback=self.set_sync_alpha,
-			label="SYNC Alpha",
-			converter=forms.float_converter(),
-			proportion=0,
-		)
-		self._sync_alpha_slider = forms.slider(
-			parent=self.GetWin(),
-			sizer=_sync_alpha_sizer,
-			value=self.sync_alpha,
-			callback=self.set_sync_alpha,
-			minimum=0.0,
-			maximum=0.5,
-			num_steps=100,
-			style=wx.SL_HORIZONTAL,
-			cast=float,
-			proportion=1,
-		)
-		self.GridAdd(_sync_alpha_sizer, 0, 3, 1, 1)
-		self._side_text_static_text = forms.static_text(
-			parent=self.GetWin(),
-			value=self.side_text,
-			callback=self.set_side_text,
-			label="USRP Side",
-			converter=forms.str_converter(),
-		)
-		self.GridAdd(self._side_text_static_text, 1, 0, 1, 1)
-		_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, 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="RX 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=100,
-			num_steps=100,
-			style=wx.SL_HORIZONTAL,
-			cast=float,
-			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)
-
-		##################################################
-		# Blocks
-		##################################################
-		self.agc = gr.agc_cc(1e-6, 1.0, 1.0, 1.0)
-		self.decoder = noaa.hrpt_decoder()
-		self.deframer = noaa.hrpt_deframer()
-		self.frame_sink = gr.file_sink(gr.sizeof_short*1, output_filename)
-		self.gr_fir_filter_xxx_0 = gr.fir_filter_ccc(1, (mf_taps))
-		self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
-		self.pll_scope = scopesink2.scope_sink_f(
-			self.GetWin(),
-			title="Demod Waveform",
-			sample_rate=sample_rate,
-			v_scale=0.5,
-			t_scale=20.0/sample_rate,
-			ac_couple=False,
-			xy_mode=False,
-			num_inputs=1,
-		)
-		self.GridAdd(self.pll_scope.win, 2, 0, 1, 4)
-		self.sync = noaa.hrpt_sync_fb(sync_alpha, sync_alpha**2/4.0, sps, max_sync_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)
-
-		##################################################
-		# Connections
-		##################################################
-		self.connect((self.gr_fir_filter_xxx_0, 0), (self.pll, 0))
-		self.connect((self.agc, 0), (self.gr_fir_filter_xxx_0, 0))
-		self.connect((self.usrp_source, 0), (self.agc, 0))
-		self.connect((self.deframer, 0), (self.decoder, 0))
-		self.connect((self.pll, 0), (self.pll_scope, 0))
-		self.connect((self.pll, 0), (self.sync, 0))
-		self.connect((self.sync, 0), (self.deframer, 0))
-		self.connect((self.deframer, 0), (self.frame_sink, 0))
-
-	def set_config_filename(self, config_filename):
-		self.config_filename = config_filename
-		self._side_config = ConfigParser.ConfigParser()
-		self._side_config.read(self.config_filename)
-		if not self._side_config.has_section('usrp'):
-			self._side_config.add_section('usrp')
-		self._side_config.set('usrp', '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'):
-			self._decim_config.add_section('usrp')
-		self._decim_config.set('usrp', 'decim', str(self.decim))
-		self._decim_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'):
-			self._saved_freq_config.add_section('usrp')
-		self._saved_freq_config.set('usrp', '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'):
-			self._saved_gain_config.add_section('usrp')
-		self._saved_gain_config.set('usrp', 'gain', str(self.gain))
-		self._saved_gain_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('demod'):
-			self._saved_pll_alpha_config.add_section('demod')
-		self._saved_pll_alpha_config.set('demod', 'pll_alpha', str(self.pll_alpha))
-		self._saved_pll_alpha_config.write(open(self.config_filename, 'w'))
-		self._saved_sync_alpha_config = ConfigParser.ConfigParser()
-		self._saved_sync_alpha_config.read(self.config_filename)
-		if not self._saved_sync_alpha_config.has_section('demod'):
-			self._saved_sync_alpha_config.add_section('demod')
-		self._saved_sync_alpha_config.set('demod', 'sync_alpha', str(self.sync_alpha))
-		self._saved_sync_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('output'):
-			self._output_filename_config.add_section('output')
-		self._output_filename_config.set('output', 'filename', str(self.output_filename))
-		self._output_filename_config.write(open(self.config_filename, 'w'))
-
-	def set_decim(self, decim):
-		self.decim = decim
-		self.set_sample_rate(64e6/self.decim)
-		self._decim_config = ConfigParser.ConfigParser()
-		self._decim_config.read(self.config_filename)
-		if not self._decim_config.has_section('usrp'):
-			self._decim_config.add_section('usrp')
-		self._decim_config.set('usrp', 'decim', str(self.decim))
-		self._decim_config.write(open(self.config_filename, 'w'))
-		self.set_decim_text(self.decim)
-		self.usrp_source.set_decim_rate(self.decim)
-
-	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)
-		self.pll_scope.set_sample_rate(self.sample_rate)
-
-	def set_sps(self, sps):
-		self.sps = sps
-		self.set_hs(int(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'):
-			self._side_config.add_section('usrp')
-		self._side_config.set('usrp', 'side', str(self.side))
-		self._side_config.write(open(self.config_filename, 'w'))
-
-	def set_saved_sync_alpha(self, saved_sync_alpha):
-		self.saved_sync_alpha = saved_sync_alpha
-		self.set_sync_alpha(self.saved_sync_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 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_hs(self, hs):
-		self.hs = hs
-		self.set_mf_taps([-0.5/self.hs,]*self.hs+[0.5/self.hs,]*self.hs)
-
-	def set_sync_alpha(self, sync_alpha):
-		self.sync_alpha = sync_alpha
-		self._sync_alpha_slider.set_value(self.sync_alpha)
-		self._sync_alpha_text_box.set_value(self.sync_alpha)
-		self._saved_sync_alpha_config = ConfigParser.ConfigParser()
-		self._saved_sync_alpha_config.read(self.config_filename)
-		if not self._saved_sync_alpha_config.has_section('demod'):
-			self._saved_sync_alpha_config.add_section('demod')
-		self._saved_sync_alpha_config.set('demod', 'sync_alpha', str(self.sync_alpha))
-		self._saved_sync_alpha_config.write(open(self.config_filename, 'w'))
-		self.sync.set_alpha(self.sync_alpha)
-		self.sync.set_beta(self.sync_alpha**2/4.0)
-
-	def set_side_text(self, side_text):
-		self.side_text = side_text
-		self._side_text_static_text.set_value(self.side_text)
-
-	def set_pll_alpha(self, pll_alpha):
-		self.pll_alpha = pll_alpha
-		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('demod'):
-			self._saved_pll_alpha_config.add_section('demod')
-		self._saved_pll_alpha_config.set('demod', 'pll_alpha', str(self.pll_alpha))
-		self._saved_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 set_output_filename(self, output_filename):
-		self.output_filename = output_filename
-		self._output_filename_config = ConfigParser.ConfigParser()
-		self._output_filename_config.read(self.config_filename)
-		if not self._output_filename_config.has_section('output'):
-			self._output_filename_config.add_section('output')
-		self._output_filename_config.set('output', 'filename', str(self.output_filename))
-		self._output_filename_config.write(open(self.config_filename, 'w'))
-
-	def set_mf_taps(self, mf_taps):
-		self.mf_taps = mf_taps
-		self.gr_fir_filter_xxx_0.set_taps((self.mf_taps))
-
-	def set_max_sync_offset(self, max_sync_offset):
-		self.max_sync_offset = max_sync_offset
-		self.sync.set_max_offset(self.max_sync_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 set_gain(self, gain):
-		self.gain = gain
-		self._gain_slider.set_value(self.gain)
-		self._gain_text_box.set_value(self.gain)
-		self._saved_gain_config = ConfigParser.ConfigParser()
-		self._saved_gain_config.read(self.config_filename)
-		if not self._saved_gain_config.has_section('usrp'):
-			self._saved_gain_config.add_section('usrp')
-		self._saved_gain_config.set('usrp', 'gain', str(self.gain))
-		self._saved_gain_config.write(open(self.config_filename, 'w'))
-		self.usrp_source.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'):
-			self._saved_freq_config.add_section('usrp')
-		self._saved_freq_config.set('usrp', 'freq', str(self.freq))
-		self._saved_freq_config.write(open(self.config_filename, 'w'))
-		self.usrp_source.set_frequency(self.freq)
-
-	def set_decim_text(self, decim_text):
-		self.decim_text = decim_text
-		self._decim_text_static_text.set_value(self.decim_text)
-
-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()
-	tb.Run(True)
-
-- 
cgit 


From 745a36295016a08bcf8e81e0246b53cd1a487716 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Sun, 27 Sep 2009 13:46:00 -0700
Subject: Restored original HRPT GUI script and documented various script
 choices.

---
 gr-noaa/apps/usrp_rx_hrpt.py | 440 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 440 insertions(+)
 create mode 100755 gr-noaa/apps/usrp_rx_hrpt.py

(limited to 'gr-noaa/apps/usrp_rx_hrpt.py')

diff --git a/gr-noaa/apps/usrp_rx_hrpt.py b/gr-noaa/apps/usrp_rx_hrpt.py
new file mode 100755
index 000000000..ae70f25c8
--- /dev/null
+++ b/gr-noaa/apps/usrp_rx_hrpt.py
@@ -0,0 +1,440 @@
+#!/usr/bin/env python
+##################################################
+# Gnuradio Python Flow Graph
+# Title: USRP HRPT Receiver
+# Generated: Sun Sep 27 13:37:23 2009
+##################################################
+
+from gnuradio import eng_notation
+from gnuradio import gr
+from gnuradio import noaa
+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 math
+import wx
+
+class usrp_rx_hrpt(grc_wxgui.top_block_gui):
+
+	def __init__(self):
+		grc_wxgui.top_block_gui.__init__(self, title="USRP HRPT Receiver")
+
+		##################################################
+		# Variables
+		##################################################
+		self.config_filename = config_filename = 'usrp_rx_hrpt.cfg'
+		self._decim_config = ConfigParser.ConfigParser()
+		self._decim_config.read(config_filename)
+		try: decim = self._decim_config.getfloat('usrp', 'decim')
+		except: decim = 16
+		self.decim = decim
+		self.sym_rate = sym_rate = 600*1109
+		self.sample_rate = sample_rate = 64e6/decim
+		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', 'side')
+		except: side = 'A'
+		self.side = side
+		self._saved_sync_alpha_config = ConfigParser.ConfigParser()
+		self._saved_sync_alpha_config.read(config_filename)
+		try: saved_sync_alpha = self._saved_sync_alpha_config.getfloat('demod', 'sync_alpha')
+		except: saved_sync_alpha = 0.05
+		self.saved_sync_alpha = saved_sync_alpha
+		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('demod', 'pll_alpha')
+		except: saved_pll_alpha = 0.05
+		self.saved_pll_alpha = saved_pll_alpha
+		self._saved_gain_config = ConfigParser.ConfigParser()
+		self._saved_gain_config.read(config_filename)
+		try: saved_gain = self._saved_gain_config.getfloat('usrp', 'gain')
+		except: saved_gain = 35
+		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', 'freq')
+		except: saved_freq = 1698e6
+		self.saved_freq = saved_freq
+		self.hs = hs = int(sps/2.0)
+		self.sync_alpha = sync_alpha = saved_sync_alpha
+		self.side_text = side_text = side
+		self.pll_alpha = pll_alpha = saved_pll_alpha
+		self._output_filename_config = ConfigParser.ConfigParser()
+		self._output_filename_config.read(config_filename)
+		try: output_filename = self._output_filename_config.get('output', 'filename')
+		except: output_filename = 'frames.dat'
+		self.output_filename = output_filename
+		self.mf_taps = mf_taps = [-0.5/hs,]*hs+[0.5/hs]*hs
+		self.max_sync_offset = max_sync_offset = 0.01
+		self.max_carrier_offset = max_carrier_offset = 2*math.pi*100e3/sample_rate
+		self.gain = gain = saved_gain
+		self.freq = freq = saved_freq
+		self.decim_text = decim_text = decim
+
+		##################################################
+		# Notebooks
+		##################################################
+		self.displays = wx.Notebook(self.GetWin(), style=wx.NB_TOP)
+		self.displays.AddPage(grc_wxgui.Panel(self.displays), "RX")
+		self.displays.AddPage(grc_wxgui.Panel(self.displays), "Demod")
+		self.GridAdd(self.displays, 2, 0, 1, 4)
+
+		##################################################
+		# Controls
+		##################################################
+		_sync_alpha_sizer = wx.BoxSizer(wx.VERTICAL)
+		self._sync_alpha_text_box = forms.text_box(
+			parent=self.GetWin(),
+			sizer=_sync_alpha_sizer,
+			value=self.sync_alpha,
+			callback=self.set_sync_alpha,
+			label="SYNC Alpha",
+			converter=forms.float_converter(),
+			proportion=0,
+		)
+		self._sync_alpha_slider = forms.slider(
+			parent=self.GetWin(),
+			sizer=_sync_alpha_sizer,
+			value=self.sync_alpha,
+			callback=self.set_sync_alpha,
+			minimum=0.0,
+			maximum=0.5,
+			num_steps=100,
+			style=wx.SL_HORIZONTAL,
+			cast=float,
+			proportion=1,
+		)
+		self.GridAdd(_sync_alpha_sizer, 0, 3, 1, 1)
+		self._side_text_static_text = forms.static_text(
+			parent=self.GetWin(),
+			value=self.side_text,
+			callback=self.set_side_text,
+			label="USRP Side",
+			converter=forms.str_converter(),
+		)
+		self.GridAdd(self._side_text_static_text, 1, 0, 1, 1)
+		_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, 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="RX 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=100,
+			num_steps=100,
+			style=wx.SL_HORIZONTAL,
+			cast=float,
+			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)
+
+		##################################################
+		# Blocks
+		##################################################
+		self.agc = gr.agc_cc(1e-6, 1.0, 1.0, 1.0)
+		self.decoder = noaa.hrpt_decoder()
+		self.deframer = noaa.hrpt_deframer()
+		self.frame_sink = gr.file_sink(gr.sizeof_short*1, output_filename)
+		self.gr_fir_filter_xxx_0 = gr.fir_filter_ccc(1, (mf_taps))
+		self.pll = noaa.hrpt_pll_cf(pll_alpha, pll_alpha**2/4.0, max_carrier_offset)
+		self.pll_scope = scopesink2.scope_sink_f(
+			self.displays.GetPage(1).GetWin(),
+			title="Demod Waveform",
+			sample_rate=sample_rate,
+			v_scale=0.5,
+			t_scale=20.0/sample_rate,
+			ac_couple=False,
+			xy_mode=False,
+			num_inputs=1,
+		)
+		self.displays.GetPage(1).GridAdd(self.pll_scope.win, 0, 0, 1, 1)
+		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,
+		)
+		self.displays.GetPage(0).GridAdd(self.rx_fft.win, 0, 0, 1, 1)
+		self.rx_scope = scopesink2.scope_sink_c(
+			self.displays.GetPage(0).GetWin(),
+			title="RX Waveform",
+			sample_rate=sample_rate,
+			v_scale=0,
+			t_scale=20.0/sample_rate,
+			ac_couple=False,
+			xy_mode=False,
+			num_inputs=1,
+		)
+		self.displays.GetPage(0).GridAdd(self.rx_scope.win, 1, 0, 1, 1)
+		self.sync = noaa.hrpt_sync_fb(sync_alpha, sync_alpha**2/4.0, sps, max_sync_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)
+
+		##################################################
+		# Connections
+		##################################################
+		self.connect((self.deframer, 0), (self.frame_sink, 0))
+		self.connect((self.sync, 0), (self.deframer, 0))
+		self.connect((self.pll, 0), (self.sync, 0))
+		self.connect((self.pll, 0), (self.pll_scope, 0))
+		self.connect((self.agc, 0), (self.rx_scope, 0))
+		self.connect((self.agc, 0), (self.rx_fft, 0))
+		self.connect((self.deframer, 0), (self.decoder, 0))
+		self.connect((self.agc, 0), (self.gr_fir_filter_xxx_0, 0))
+		self.connect((self.gr_fir_filter_xxx_0, 0), (self.pll, 0))
+		self.connect((self.usrp_source, 0), (self.agc, 0))
+
+	def set_config_filename(self, config_filename):
+		self.config_filename = config_filename
+		self._side_config = ConfigParser.ConfigParser()
+		self._side_config.read(self.config_filename)
+		if not self._side_config.has_section('usrp'):
+			self._side_config.add_section('usrp')
+		self._side_config.set('usrp', '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'):
+			self._decim_config.add_section('usrp')
+		self._decim_config.set('usrp', 'decim', str(self.decim))
+		self._decim_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'):
+			self._saved_freq_config.add_section('usrp')
+		self._saved_freq_config.set('usrp', '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'):
+			self._saved_gain_config.add_section('usrp')
+		self._saved_gain_config.set('usrp', 'gain', str(self.gain))
+		self._saved_gain_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('demod'):
+			self._saved_pll_alpha_config.add_section('demod')
+		self._saved_pll_alpha_config.set('demod', 'pll_alpha', str(self.pll_alpha))
+		self._saved_pll_alpha_config.write(open(self.config_filename, 'w'))
+		self._saved_sync_alpha_config = ConfigParser.ConfigParser()
+		self._saved_sync_alpha_config.read(self.config_filename)
+		if not self._saved_sync_alpha_config.has_section('demod'):
+			self._saved_sync_alpha_config.add_section('demod')
+		self._saved_sync_alpha_config.set('demod', 'sync_alpha', str(self.sync_alpha))
+		self._saved_sync_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('output'):
+			self._output_filename_config.add_section('output')
+		self._output_filename_config.set('output', 'filename', str(self.output_filename))
+		self._output_filename_config.write(open(self.config_filename, 'w'))
+
+	def set_decim(self, decim):
+		self.decim = decim
+		self.set_sample_rate(64e6/self.decim)
+		self._decim_config = ConfigParser.ConfigParser()
+		self._decim_config.read(self.config_filename)
+		if not self._decim_config.has_section('usrp'):
+			self._decim_config.add_section('usrp')
+		self._decim_config.set('usrp', 'decim', str(self.decim))
+		self._decim_config.write(open(self.config_filename, 'w'))
+		self.set_decim_text(self.decim)
+		self.usrp_source.set_decim_rate(self.decim)
+
+	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)
+		self.rx_scope.set_sample_rate(self.sample_rate)
+		self.rx_fft.set_sample_rate(self.sample_rate)
+		self.pll_scope.set_sample_rate(self.sample_rate)
+
+	def set_sps(self, sps):
+		self.sps = sps
+		self.set_hs(int(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'):
+			self._side_config.add_section('usrp')
+		self._side_config.set('usrp', 'side', str(self.side))
+		self._side_config.write(open(self.config_filename, 'w'))
+
+	def set_saved_sync_alpha(self, saved_sync_alpha):
+		self.saved_sync_alpha = saved_sync_alpha
+		self.set_sync_alpha(self.saved_sync_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 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_hs(self, hs):
+		self.hs = hs
+		self.set_mf_taps([-0.5/self.hs,]*self.hs+[0.5/self.hs]*self.hs)
+
+	def set_sync_alpha(self, sync_alpha):
+		self.sync_alpha = sync_alpha
+		self._sync_alpha_slider.set_value(self.sync_alpha)
+		self._sync_alpha_text_box.set_value(self.sync_alpha)
+		self._saved_sync_alpha_config = ConfigParser.ConfigParser()
+		self._saved_sync_alpha_config.read(self.config_filename)
+		if not self._saved_sync_alpha_config.has_section('demod'):
+			self._saved_sync_alpha_config.add_section('demod')
+		self._saved_sync_alpha_config.set('demod', 'sync_alpha', str(self.sync_alpha))
+		self._saved_sync_alpha_config.write(open(self.config_filename, 'w'))
+		self.sync.set_alpha(self.sync_alpha)
+		self.sync.set_beta(self.sync_alpha**2/4.0)
+
+	def set_side_text(self, side_text):
+		self.side_text = side_text
+		self._side_text_static_text.set_value(self.side_text)
+
+	def set_pll_alpha(self, pll_alpha):
+		self.pll_alpha = pll_alpha
+		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('demod'):
+			self._saved_pll_alpha_config.add_section('demod')
+		self._saved_pll_alpha_config.set('demod', 'pll_alpha', str(self.pll_alpha))
+		self._saved_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 set_output_filename(self, output_filename):
+		self.output_filename = output_filename
+		self._output_filename_config = ConfigParser.ConfigParser()
+		self._output_filename_config.read(self.config_filename)
+		if not self._output_filename_config.has_section('output'):
+			self._output_filename_config.add_section('output')
+		self._output_filename_config.set('output', 'filename', str(self.output_filename))
+		self._output_filename_config.write(open(self.config_filename, 'w'))
+
+	def set_mf_taps(self, mf_taps):
+		self.mf_taps = mf_taps
+		self.gr_fir_filter_xxx_0.set_taps((self.mf_taps))
+
+	def set_max_sync_offset(self, max_sync_offset):
+		self.max_sync_offset = max_sync_offset
+		self.sync.set_max_offset(self.max_sync_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 set_gain(self, gain):
+		self.gain = gain
+		self._gain_slider.set_value(self.gain)
+		self._gain_text_box.set_value(self.gain)
+		self._saved_gain_config = ConfigParser.ConfigParser()
+		self._saved_gain_config.read(self.config_filename)
+		if not self._saved_gain_config.has_section('usrp'):
+			self._saved_gain_config.add_section('usrp')
+		self._saved_gain_config.set('usrp', 'gain', str(self.gain))
+		self._saved_gain_config.write(open(self.config_filename, 'w'))
+		self.usrp_source.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'):
+			self._saved_freq_config.add_section('usrp')
+		self._saved_freq_config.set('usrp', '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)
+
+if __name__ == '__main__':
+	parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
+	(options, args) = parser.parse_args()
+	tb = usrp_rx_hrpt()
+	tb.Run(True)
+
-- 
cgit