diff options
| author | Tom Rondeau <tom@trondeau.com> | 2016-02-02 22:41:14 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2016-02-02 22:41:14 -0500 |
| commit | 0f4859c0a1c705199b74131e05605342c840bd31 (patch) | |
| tree | 58fa2226bbbc20564f32eebcd353c1520d35c55b /gr-digital/python/digital/qa_pfb_clock_sync.py | |
| parent | 11973c64437683cc99c48eae9eb4db8234f1ac42 (diff) | |
digital: addresses issue #890.
The set_taps was redone a while ago to better handle the differential
taps as well as the normal ones, but this made externally resetting
them impossible. Adding a new update_taps function to properly handle
this case so as to not change the API. We should fix this in 3.8.
Diffstat (limited to 'gr-digital/python/digital/qa_pfb_clock_sync.py')
| -rwxr-xr-x | gr-digital/python/digital/qa_pfb_clock_sync.py | 104 |
1 files changed, 91 insertions, 13 deletions
diff --git a/gr-digital/python/digital/qa_pfb_clock_sync.py b/gr-digital/python/digital/qa_pfb_clock_sync.py index 3c8074b154..e16a99338e 100755 --- a/gr-digital/python/digital/qa_pfb_clock_sync.py +++ b/gr-digital/python/digital/qa_pfb_clock_sync.py @@ -1,27 +1,28 @@ #!/usr/bin/env python # # Copyright 2011,2013 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -# +# import random import cmath +import time from gnuradio import gr, gr_unittest, filter, digital, blocks @@ -43,7 +44,7 @@ class test_pfb_clock_sync(gr_unittest.TestCase): init_phase = nfilts/2 max_rate_deviation = 0.5 osps = 1 - + ntaps = 11 * int(sps*nfilts) taps = filter.firdes.root_raised_cosine(nfilts, nfilts*sps, 1.0, excess_bw, ntaps) @@ -52,7 +53,7 @@ class test_pfb_clock_sync(gr_unittest.TestCase): nfilts, init_phase, max_rate_deviation, osps) - + data = 10000*[complex(1,0), complex(-1,0)] self.src = blocks.vector_source_c(data, False) @@ -69,7 +70,7 @@ class test_pfb_clock_sync(gr_unittest.TestCase): self.tb.connect(self.src, self.rrc_filter, self.test, self.snk) self.tb.run() - + expected_result = 10000*[complex(1,0), complex(-1,0)] dst_data = self.snk.data() @@ -82,7 +83,7 @@ class test_pfb_clock_sync(gr_unittest.TestCase): #for e,d in zip(expected_result, dst_data): # print e, d - + self.assertComplexTuplesAlmostEqual(expected_result, dst_data, 1) @@ -96,7 +97,7 @@ class test_pfb_clock_sync(gr_unittest.TestCase): init_phase = nfilts/2 max_rate_deviation = 0.5 osps = 1 - + ntaps = 11 * int(sps*nfilts) taps = filter.firdes.root_raised_cosine(nfilts, nfilts*sps, 1.0, excess_bw, ntaps) @@ -105,7 +106,7 @@ class test_pfb_clock_sync(gr_unittest.TestCase): nfilts, init_phase, max_rate_deviation, osps) - + data = 10000*[1, -1] self.src = blocks.vector_source_f(data, False) @@ -122,7 +123,7 @@ class test_pfb_clock_sync(gr_unittest.TestCase): self.tb.connect(self.src, self.rrc_filter, self.test, self.snk) self.tb.run() - + expected_result = 10000*[1, -1] dst_data = self.snk.data() @@ -135,9 +136,86 @@ class test_pfb_clock_sync(gr_unittest.TestCase): #for e,d in zip(expected_result, dst_data): # print e, d - + self.assertFloatTuplesAlmostEqual(expected_result, dst_data, 1) + def test03(self): + # Test resting of taps + excess_bw0 = 0.35 + excess_bw1 = 0.22 + + sps = 4 + loop_bw = cmath.pi/100.0 + nfilts = 32 + init_phase = nfilts/2 + max_rate_deviation = 0.5 + osps = 1 + + ntaps = 11 * int(sps*nfilts) + taps = filter.firdes.root_raised_cosine(nfilts, nfilts*sps, + 1.0, excess_bw0, ntaps) + + self.test = digital.pfb_clock_sync_ccf(sps, loop_bw, taps, + nfilts, init_phase, + max_rate_deviation, + osps) + + self.src = blocks.null_source(gr.sizeof_gr_complex) + self.snk = blocks.null_sink(gr.sizeof_gr_complex) + + self.tb.connect(self.src, self.test, self.snk) + self.tb.start() + time.sleep(0.1) + + taps = filter.firdes.root_raised_cosine(nfilts, nfilts*sps, + 1.0, excess_bw1, ntaps) + + self.test.update_taps(taps) + + self.tb.stop() + self.tb.wait() + + self.assertTrue(True) + + def test03_f(self): + # Test resting of taps + excess_bw0 = 0.35 + excess_bw1 = 0.22 + + sps = 4 + loop_bw = cmath.pi/100.0 + nfilts = 32 + init_phase = nfilts/2 + max_rate_deviation = 0.5 + osps = 1 + + ntaps = 11 * int(sps*nfilts) + taps = filter.firdes.root_raised_cosine(nfilts, nfilts*sps, + 1.0, excess_bw0, ntaps) + + self.test = digital.pfb_clock_sync_fff(sps, loop_bw, taps, + nfilts, init_phase, + max_rate_deviation, + osps) + + self.src = blocks.null_source(gr.sizeof_float) + self.snk = blocks.null_sink(gr.sizeof_float) + + self.tb.connect(self.src, self.test, self.snk) + self.tb.start() + time.sleep(0.1) + + taps = filter.firdes.root_raised_cosine(nfilts, nfilts*sps, + 1.0, excess_bw1, ntaps) + + self.test.update_taps(taps) + + self.tb.stop() + self.tb.wait() + + self.assertTrue(True) + + if __name__ == '__main__': gr_unittest.run(test_pfb_clock_sync, "test_pfb_clock_sync.xml") |