diff options
| author | Tom Rondeau <tom@trondeau.com> | 2016-06-14 10:48:00 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-06-14 10:58:05 -0700 |
| commit | 817f61bbdd180a2854116c85ccf1020e561c523f (patch) | |
| tree | 883649968739a66c537e932c65c79e9387544a07 /gr-digital/python | |
| parent | c475f14e4604b9bca25c08f1d30a2e8ff9bbcf26 (diff) | |
digital: Complete overhaul of protocol handling
See documentation for details. In brief:
- digital_protocol_* classes added (replace packet header blocks)
- header_buffer class added
- Lots of QA
- default packet formatter: contains access code and payload length
fields.
- counter packet formatter: also contains the bits/sym in the payload
modulation and a packet number counter.
- Also adds QA code and the infrastructure for C++ QA code in
gr-digital.
- New block to use the packet formatter objects.
- The header and payload are transmitted as PDU messages out of different ports.
- header_buffer class for header formatting.
- Used by packet_formatter_x classes to more easily add and format
header data for transmission.
- New blocks that parse headers.
- Handles either hard or soft bits. Produces an info message to
instruct payload demod.
- 'receive mode' to header_buffer class.
- Designed to make extracting fields from the received header bits
easier for packet formatter classes. Use extract_field[N] to get
the different fields out of a collected set of header bits. *
Docs describing both functions with small examples for how to use
them.
- Don't force access code to be a multiple of 8
- need to verify everything else handles this correctly.
- Throw an exception in the ctor if setting the code failed and emit a
log message.
Committed-By: Martin Braun <martin.braun@ettus.com>
Diffstat (limited to 'gr-digital/python')
| -rw-r--r-- | gr-digital/python/digital/qa_packet_format.py | 135 |
1 files changed, 135 insertions, 0 deletions
diff --git a/gr-digital/python/digital/qa_packet_format.py b/gr-digital/python/digital/qa_packet_format.py new file mode 100644 index 0000000000..6440b80a5e --- /dev/null +++ b/gr-digital/python/digital/qa_packet_format.py @@ -0,0 +1,135 @@ +#!/usr/bin/env python +# +# Copyright 2015,2016 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, time, struct +import pmt +from gnuradio import gr, gr_unittest, digital, blocks +from gnuradio.digital import packet_utils + +class test_packet_format_fb(gr_unittest.TestCase): + + def setUp(self): + self.tb = gr.top_block() + + def tearDown(self): + self.tb = None + + def test_packet_format_async_default(self): + ac = packet_utils.default_access_code + hdr_format = digital.header_format_default(ac, 0) + + formatter = digital.protocol_formatter_async(hdr_format) + snk_hdr = blocks.message_debug() + snk_pld = blocks.message_debug() + + self.tb.msg_connect(formatter, 'header', snk_hdr, 'store') + self.tb.msg_connect(formatter, 'payload', snk_pld, 'store') + + + send_str = "Hello World" + send_pmt = pmt.make_u8vector(len(send_str), ord(' ')) + for i in range(len(send_str)): + pmt.u8vector_set(send_pmt, i, ord(send_str[i])) + msg = pmt.cons(pmt.PMT_NIL, send_pmt) + + port = pmt.intern("in") + formatter.to_basic_block()._post(port, msg) + + self.tb.start() + while (snk_hdr.num_messages() < 1) and (snk_pld.num_messages() < 1): + time.sleep(0.1) + self.tb.stop() + self.tb.wait() + + result_hdr_pmt = pmt.cdr(snk_hdr.get_message(0)) + result_pld_pmt = pmt.cdr(snk_pld.get_message(0)) + + result_hdr = pmt.u8vector_elements(result_hdr_pmt) + result_pld = pmt.u8vector_elements(result_pld_pmt) + header = "".join([chr(r) for r in result_hdr]) + payload = "".join([chr(r) for r in result_pld]) + + access_code = packet_utils.conv_1_0_string_to_packed_binary_string(packet_utils.default_access_code)[0] + rx_access_code = header[0:len(access_code)] + + length = len(send_str) + rx_length = struct.unpack_from("!H", header, len(access_code))[0] + + self.assertEqual(access_code, rx_access_code) + self.assertEqual(length, rx_length) + self.assertEqual(length, len(payload)) + self.assertEqual(send_str, payload[0:length]) + + + def test_packet_format_async_counter(self): + bps = 2 + ac = packet_utils.default_access_code + hdr_format = digital.header_format_counter(ac, 0, 2) + + formatter = digital.protocol_formatter_async(hdr_format) + snk_hdr = blocks.message_debug() + snk_pld = blocks.message_debug() + + self.tb.msg_connect(formatter, 'header', snk_hdr, 'store') + self.tb.msg_connect(formatter, 'payload', snk_pld, 'store') + + + send_str = "Hello World" + 1000*"xxx" + send_pmt = pmt.make_u8vector(len(send_str), ord(' ')) + for i in range(len(send_str)): + pmt.u8vector_set(send_pmt, i, ord(send_str[i])) + msg = pmt.cons(pmt.PMT_NIL, send_pmt) + + port = pmt.intern("in") + formatter.to_basic_block()._post(port, msg) + + self.tb.start() + while (snk_hdr.num_messages() < 1) and (snk_pld.num_messages() < 1): + time.sleep(0.1) + self.tb.stop() + self.tb.wait() + + result_hdr_pmt = pmt.cdr(snk_hdr.get_message(0)) + result_pld_pmt = pmt.cdr(snk_pld.get_message(0)) + + result_hdr = pmt.u8vector_elements(result_hdr_pmt) + result_pld = pmt.u8vector_elements(result_pld_pmt) + header = "".join([chr(r) for r in result_hdr]) + payload = "".join([chr(r) for r in result_pld]) + + access_code = packet_utils.conv_1_0_string_to_packed_binary_string(packet_utils.default_access_code)[0] + rx_access_code = header[0:len(access_code)] + + length = len(send_str) + rx_length = struct.unpack_from("!H", header, len(access_code))[0] + rx_bps = struct.unpack_from("!H", header, len(access_code)+4)[0] + rx_counter = struct.unpack_from("!H", header, len(access_code)+6)[0] + + self.assertEqual(access_code, rx_access_code) + self.assertEqual(length, rx_length) + self.assertEqual(bps, rx_bps) + self.assertEqual(0, rx_counter) + self.assertEqual(length, len(payload)) + self.assertEqual(send_str, payload[0:length]) + +if __name__ == '__main__': + gr_unittest.run(test_packet_format_fb, "test_packet_format_fb.xml") |