Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital

Conflicts:
	gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.h
	gnuradio-core/src/lib/general/gr_constellation_decoder_cb.h
	gnuradio-core/src/lib/general/gr_costas_loop_cc.h
	gnuradio-core/src/lib/general/gr_lms_dfe_cc.h
	gnuradio-core/src/lib/general/gr_lms_dfe_ff.h
	gr-digital/lib/Makefile.am
	gr-digital/lib/digital_binary_slicer_fb.h
	gr-digital/lib/digital_clock_recovery_mm_cc.h
	gr-digital/lib/digital_clock_recovery_mm_ff.h
	gr-digital/lib/digital_correlate_access_code_bb.h
	gr-digital/lib/digital_crc32.h
	gr-digital/lib/digital_mpsk_receiver_cc.h
	gr-digital/python/Makefile.am
	gr-digital/python/__init__.py
	gr-digital/python/generic_mod_demod.py
	gr-digital/python/pkt.py
	gr-digital/python/psk2.py
	gr-digital/python/qam.py

1 files changed, 84 insertions, 0 deletions

diff --git a/gr-digital/python/qa_correlate_access_code.py b/gr-digital/python/qa_correlate_access_code.py
new file mode 100755
index 000000000..6b6f25051
--- /dev/null
+++ b/gr-digital/python/qa_correlate_access_code.py
@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+#
+# Copyright 2006,2007,2010,2011 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.
+# 
+
+from gnuradio import gr, gr_unittest
+import digital_swig
+import math
+
+default_access_code = '\xAC\xDD\xA4\xE2\xF2\x8C\x20\xFC'
+
+def string_to_1_0_list(s):
+    r = []
+    for ch in s:
+        x = ord(ch)
+        for i in range(8):
+            t = (x >> i) & 0x1
+            r.append(t)
+
+    return r
+
+def to_1_0_string(L):
+    return ''.join(map(lambda x: chr(x + ord('0')), L))
+
+class test_correlate_access_code(gr_unittest.TestCase):
+
+    def setUp(self):
+        self.tb = gr.top_block()
+
+    def tearDown(self):
+        self.tb = None
+
+    def test_001(self):
+        pad = (0,) * 64
+        #           0  0  0  1  0  0  0  1
+        src_data = (1, 0, 1, 1, 1, 1, 0, 1, 1) + pad + (0,) * 7
+        expected_result = pad + (1, 0, 1, 1, 3, 1, 0, 1, 1, 2) + (0,) * 6
+        src = gr.vector_source_b (src_data)
+        op = digital_swig.correlate_access_code_bb("1011", 0)
+        dst = gr.vector_sink_b ()
+        self.tb.connect (src, op, dst)
+        self.tb.run ()
+        result_data = dst.data ()
+        self.assertEqual (expected_result, result_data)
+
+
+    def test_002(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_data = code + (1, 0, 1, 1) + pad
+        expected_result = pad + code + (3, 0, 1, 1)
+        src = gr.vector_source_b (src_data)
+        op = digital_swig.correlate_access_code_bb(access_code, 0)
+        dst = gr.vector_sink_b ()
+        self.tb.connect (src, op, dst)
+        self.tb.run ()
+        result_data = dst.data ()
+        self.assertEqual (expected_result, result_data)
+        
+        
+
+if __name__ == '__main__':
+    gr_unittest.run(test_correlate_access_code, "test_correlate_access_code.xml")
+