From a02a0e43d49d3bbb9a76ab8333f1bf8e25c48556 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 22 Aug 2009 13:10:08 -0700 Subject: [PATCH] Update rx_poes script to filter prior to PLL. --- gr-noaa/grc/rx_poes.grc | 407 ++++++++++++++++++---------------------- 1 file changed, 184 insertions(+), 223 deletions(-) diff --git a/gr-noaa/grc/rx_poes.grc b/gr-noaa/grc/rx_poes.grc index f3a483e6..1001049a 100755 --- a/gr-noaa/grc/rx_poes.grc +++ b/gr-noaa/grc/rx_poes.grc @@ -1,6 +1,6 @@ - Sun Aug 9 17:39:05 2009 + Sat Aug 22 13:06:22 2009 options @@ -167,11 +167,34 @@ 0 + + import + + id + import_0 + + + _enabled + True + + + import + import math + + + _coordinate + (9, 202) + + + _rotation + 0 + + variable id - mf_taps + max_offset _enabled @@ -179,11 +202,11 @@ value - [0.5/hs,]*hs+[-0.5/hs,]*hs + 2*math.pi*100e3/sample_rate _coordinate - (573, 15) + (342, 95) _rotation @@ -191,26 +214,46 @@ - notebook + variable_slider id - displays + pll_alpha _enabled True + + label + PLL Alpha + + + value + 0.005 + + + min + 0.0 + + + max + 0.5 + + + num_steps + 500 + style - wx.NB_TOP + wx.SL_HORIZONTAL - labels - ['RX','Manchester'] + converver + float_converter grid_pos - 1, 0, 1, 1 + 0, 0, 1, 1 notebook @@ -218,7 +261,7 @@ _coordinate - (9, 99) + (192, 100) _rotation @@ -257,22 +300,38 @@ - import + gr_agc_xx id - import_0 + agr _enabled True - import - import math + type + complex + + + rate + 1e-6 + + + reference + 1.0 + + + gain + 1.0 + + + max_gain + 1.0 _coordinate - (9, 202) + (261, 494) _rotation @@ -280,34 +339,65 @@ - gr_file_source + gr_moving_average_xx id - src + gr_moving_average_xx_0 _enabled True - - file - /home/jcorgan/test/poes/poes-d16.dat - type complex - repeat + length + hs + + + scale + 1.0/hs + + + max_iter + 4000 + + + _coordinate + (429, 502) + + + _rotation + 0 + + + + noaa_carrier_pll_cc + + id + noaa_carrier_pll_cc_0 + + + _enabled True - vlen - 1 + alpha + pll_alpha + + + beta + pll_alpha**2/4.0 + + + max_offset + max_offset _coordinate - (34, 423) + (636, 502) _rotation @@ -366,30 +456,7 @@ _coordinate - (438, 612) - - - _rotation - 0 - - - - variable - - id - max_offset - - - _enabled - True - - - value - 2*math.pi*100e3/sample_rate - - - _coordinate - (307, 93) + (433, 612) _rotation @@ -464,7 +531,7 @@ _coordinate - (438, 244) + (433, 241) _rotation @@ -472,38 +539,22 @@ - gr_agc_xx + gr_complex_to_imag id - agr + gr_complex_to_imag_0 _enabled True - type - complex - - - rate - 1e-6 - - - reference - 1.0 - - - gain - 1.0 - - - max_gain - 1.0 + vlen + 1 _coordinate - (270, 494) + (877, 522) _rotation @@ -511,74 +562,34 @@ - wxgui_fftsink2 + notebook id - rx_fftsink_0 + displays _enabled True - type - float - - - title - Baseband Spectrum - - - samp_rate - sample_rate - - - baseband_freq - 0 - - - y_per_div - 10 - - - y_divs - 8 - - - ref_level - 10 - - - fft_size - 1024 - - - fft_rate - 30 - - - peak_hold - False - - - average - True + style + wx.NB_TOP - avg_alpha - 0.1 + labels + ['RX','Baseband'] grid_pos - 0, 0, 1, 1 + 1, 0, 1, 1 notebook - displays, 1 + _coordinate - (1069, 243) + (9, 99) _rotation @@ -589,7 +600,7 @@ wxgui_scopesink2 id - wxgui_scopesink2_0_0 + wxgui_scopesink2_0_1_0_1 _enabled @@ -601,7 +612,7 @@ title - Baseband Waveform + Manchester Symbols samp_rate @@ -609,11 +620,11 @@ v_scale - 0 + 0.5 t_scale - 20.0/sample_rate + 5.0/sym_rate ac_couple @@ -637,18 +648,18 @@ _coordinate - (1069, 624) + (856, 343) _rotation - 0 + 180 - gr_moving_average_xx + wxgui_scopesink2 id - gr_moving_average_xx_0 + wxgui_scopesink2_0_0 _enabled @@ -659,129 +670,79 @@ complex - length - hs - - - scale - 1.0/hs + title + Post-Filter/PLL - max_iter - 4000 + samp_rate + sample_rate - _coordinate - (437, 502) + v_scale + 0.5 - _rotation - 0 + t_scale + 20.0/sample_rate - - - gr_complex_to_imag - id - gr_complex_to_imag_0 + ac_couple + False - _enabled - True + xy_mode + False - vlen + num_inputs 1 - - _coordinate - (866, 522) - - - _rotation - 0 - - - - variable_slider - - id - pll_alpha - - - _enabled - True - - - label - PLL Alpha - - - value - 0.005 - - - min - 0.0 - - - max - 0.5 - - - num_steps - 500 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - grid_pos 0, 0, 1, 1 notebook - + displays, 1 _coordinate - (157, 94) + (634, 335) _rotation - 0 + 180 - noaa_carrier_pll_cc + gr_file_source id - noaa_carrier_pll_cc_0 + src _enabled True - alpha - pll_alpha + file + poes-d16.dat - beta - pll_alpha**2/4.0 + type + complex - max_offset - max_offset + repeat + True + + + vlen + 1 _coordinate - (645, 502) + (34, 423) _rotation @@ -789,14 +750,14 @@ - agr - wxgui_scopesink2_0 + src + throttle 0 0 - agr - rx_fftsink + noaa_carrier_pll_cc_0 + gr_complex_to_imag_0 0 0 @@ -806,12 +767,6 @@ 0 0 - - src - throttle - 0 - 0 - agr gr_moving_average_xx_0 @@ -819,14 +774,14 @@ 0 - gr_complex_to_imag_0 - rx_fftsink_0 + agr + rx_fftsink 0 0 - gr_complex_to_imag_0 - wxgui_scopesink2_0_0 + agr + wxgui_scopesink2_0 0 0 @@ -838,7 +793,13 @@ noaa_carrier_pll_cc_0 - gr_complex_to_imag_0 + wxgui_scopesink2_0_0 + 0 + 0 + + + gr_complex_to_imag_0 + wxgui_scopesink2_0_1_0_1 0 0 -- 2.30.2