diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-10 08:31:43 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-10 08:31:43 -0700 |
| commit | b96a96e039ec033bcf577c0a4f5b1f24cee6feef (patch) | |
| tree | f1279702d6c1d0264ede8292da21b56d2c2025f0 /gr-digital/python | |
| parent | b7a38bf8e27d502cb27a37da1c9c187e1140d1ab (diff) | |
| parent | 77550c7b811c64ffdb9c84e521202608d23916bf (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-digital/python')
| -rwxr-xr-x | gr-digital/python/digital/qa_correlate_access_code.py | 20 | ||||
| -rwxr-xr-x | gr-digital/python/digital/qa_correlate_access_code_tag.py | 38 |
2 files changed, 53 insertions, 5 deletions
diff --git a/gr-digital/python/digital/qa_correlate_access_code.py b/gr-digital/python/digital/qa_correlate_access_code.py index d89b457117..0302e81313 100755 --- a/gr-digital/python/digital/qa_correlate_access_code.py +++ b/gr-digital/python/digital/qa_correlate_access_code.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2006,2007,2010,2011,2013 Free Software Foundation, Inc. +# Copyright 2006,2007,2010,2011,2013,2017 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -91,6 +91,24 @@ class test_correlate_access_code(gr_unittest.TestCase): result_data = dst.data() self.assertEqual(expected_result, result_data) + def test_004(self): + code = tuple(string_to_1_0_list(default_access_code)) + access_code = to_1_0_string(code) + pad = (0,) * 64 + #print code + #print access_code + src_bits = code + (1, 0, 1, 1) + pad + src_data = [2.0*x - 1.0 for x in src_bits] + expected_result_bits = code + (1, 0, 1, 1) + pad + expected_result = [2.0*x - 1.0 for x in expected_result_bits] + src = blocks.vector_source_f(src_data) + op = digital.correlate_access_code_tag_ff(access_code, 0, "test") + dst = blocks.vector_sink_f() + self.tb.connect(src, op, dst) + self.tb.run() + result_data = dst.data() + self.assertFloatTuplesAlmostEqual(expected_result, result_data, 5) + if __name__ == '__main__': gr_unittest.run(test_correlate_access_code, "test_correlate_access_code.xml") diff --git a/gr-digital/python/digital/qa_correlate_access_code_tag.py b/gr-digital/python/digital/qa_correlate_access_code_tag.py index f2663e4ecc..378333c286 100755 --- a/gr-digital/python/digital/qa_correlate_access_code_tag.py +++ b/gr-digital/python/digital/qa_correlate_access_code_tag.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2006,2007,2010,2011,2013 Free Software Foundation, Inc. +# Copyright 2006,2007,2010,2011,2013,2017 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -50,7 +50,7 @@ class test_correlate_access_code(gr_unittest.TestCase): src_data = (1, 0, 1, 1, 1, 1, 0, 1, 1) + pad + (0,) * 7 src = blocks.vector_source_b(src_data) op = digital.correlate_access_code_tag_bb("1011", 0, "sync") - dst = blocks.tag_debug(1, "sync") + dst = blocks.tag_debug(gr.sizeof_char, "sync") self.tb.connect(src, op, dst) self.tb.run() result_data = dst.current_tags() @@ -65,10 +65,40 @@ class test_correlate_access_code(gr_unittest.TestCase): #print code #print access_code src_data = code + (1, 0, 1, 1) + pad - expected_result = pad + code + (3, 0, 1, 1) src = blocks.vector_source_b(src_data) op = digital.correlate_access_code_tag_bb(access_code, 0, "sync") - dst = blocks.tag_debug(1, "sync") + dst = blocks.tag_debug(gr.sizeof_char, "sync") + self.tb.connect(src, op, dst) + self.tb.run() + result_data = dst.current_tags() + self.assertEqual(len(result_data), 1) + self.assertEqual(result_data[0].offset, len(code)) + + def test_003(self): + pad = (0,) * 64 + src_bits = (1, 0, 1, 1, 1, 1, 0, 1, 1) + pad + (0,) * 7 + src_data = [2.0*x - 1.0 for x in src_bits] + src = blocks.vector_source_f(src_data) + op = digital.correlate_access_code_tag_ff("1011", 0, "sync") + dst = blocks.tag_debug(gr.sizeof_float, "sync") + self.tb.connect(src, op, dst) + self.tb.run() + result_data = dst.current_tags() + self.assertEqual(len(result_data), 2) + self.assertEqual(result_data[0].offset, 4) + self.assertEqual(result_data[1].offset, 9) + + def test_004(self): + code = tuple(string_to_1_0_list(default_access_code)) + access_code = to_1_0_string(code) + pad = (0,) * 64 + #print code + #print access_code + src_bits = code + (1, 0, 1, 1) + pad + src_data = [2.0*x - 1.0 for x in src_bits] + src = blocks.vector_source_f(src_data) + op = digital.correlate_access_code_tag_ff(access_code, 0, "sync") + dst = blocks.tag_debug(gr.sizeof_float, "sync") self.tb.connect(src, op, dst) self.tb.run() result_data = dst.current_tags() |