[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 22/24: digital: refactoring formatting/pars
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 22/24: digital: refactoring formatting/parsing code. |
|
Date: |
Tue, 14 Jun 2016 00:41:02 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch packet2
in repository gnuradio.
commit b5bccfd2fbeb615cc8db496f35a4e5828c6d8675
Author: Tom Rondeau <address@hidden>
Date: Thu Apr 28 18:01:57 2016 -0400
digital: refactoring formatting/parsing code.
* packet_formatter_* -> header_format_*
* packet_format_async -> protocol_formatter_async
* packet_format_bb -> protocol_formatter_bb
* packet_parse_b -> protocol_parser_bb
---
gr-digital/doc/packet_comms.dox | 18 +--
gr-digital/examples/ofdm/tx_ofdm.grc | 20 +--
gr-digital/examples/packet/formatter_crc.grc | 72 ++++-----
gr-digital/examples/packet/formatter_ofdm.grc | 84 +++++-----
.../examples/packet/packet_loopback_hier.grc | 180 +++++++++++++--------
gr-digital/examples/packet/packet_rx.grc | 124 +++++++-------
gr-digital/examples/packet/packet_tx.grc | 42 ++---
.../examples/packet/transmitter_sim_hier.grc | 44 +++--
gr-digital/examples/packet/tx_stage3.grc | 30 ++--
gr-digital/examples/packet/tx_stage4.grc | 116 +++++++------
gr-digital/examples/packet/tx_stage5.grc | 116 +++++++------
gr-digital/examples/packet/tx_stage6.grc | 116 +++++++------
gr-digital/examples/packet/tx_stage6a.grc | 116 +++++++------
gr-digital/examples/packet/uhd_packet_rx.grc | 164 +++++++++++--------
gr-digital/examples/packet/uhd_packet_rx_tun.grc | 164 +++++++++++--------
gr-digital/examples/packet/uhd_packet_tx.grc | 144 ++++++++++-------
gr-digital/examples/packet/uhd_packet_tx_tun.grc | 148 ++++++++++-------
gr-digital/grc/digital_block_tree.xml | 8 +-
...nc.xml => digital_protocol_formatter_async.xml} | 12 +-
...at_bb.xml => digital_protocol_formatter_bb.xml} | 12 +-
...t_parse_b.xml => digital_protocol_parser_b.xml} | 12 +-
...ault.xml => variable_header_format_default.xml} | 12 +-
gr-digital/include/gnuradio/digital/CMakeLists.txt | 16 +-
.../include/gnuradio/digital/header_buffer.h | 28 ++--
...acket_formatter_base.h => header_format_base.h} | 30 ++--
...formatter_counter.h => header_format_counter.h} | 22 +--
...{packet_formatter_crc.h => header_format_crc.h} | 20 +--
...formatter_default.h => header_format_default.h} | 26 +--
...acket_formatter_ofdm.h => header_format_ofdm.h} | 20 +--
...t_format_async.h => protocol_formatter_async.h} | 45 +++---
...{packet_format_bb.h => protocol_formatter_bb.h} | 40 ++---
.../{packet_parse_b.h => protocol_parser_b.h} | 34 ++--
gr-digital/lib/CMakeLists.txt | 18 +--
...ket_formatter_base.cc => header_format_base.cc} | 14 +-
...rmatter_counter.cc => header_format_counter.cc} | 36 ++---
...acket_formatter_crc.cc => header_format_crc.cc} | 42 ++---
...rmatter_default.cc => header_format_default.cc} | 58 +++----
...ket_formatter_ofdm.cc => header_format_ofdm.cc} | 70 ++++----
...nc_impl.cc => protocol_formatter_async_impl.cc} | 26 +--
...sync_impl.h => protocol_formatter_async_impl.h} | 20 +--
...at_bb_impl.cc => protocol_formatter_bb_impl.cc} | 46 +++---
...rmat_bb_impl.h => protocol_formatter_bb_impl.h} | 23 +--
...t_parse_b_impl.cc => protocol_parser_b_impl.cc} | 26 +--
...ket_parse_b_impl.h => protocol_parser_b_impl.h} | 18 +--
gr-digital/lib/qa_digital.cc | 4 +-
...qa_packet_formatters.cc => qa_header_format.cc} | 32 ++--
.../{qa_packet_formatters.h => qa_header_format.h} | 12 +-
gr-digital/python/digital/qa_packet_format.py | 16 +-
gr-digital/swig/digital_swig.i | 38 ++---
gr-digital/swig/packet_header.i | 26 +--
50 files changed, 1402 insertions(+), 1158 deletions(-)
diff --git a/gr-digital/doc/packet_comms.dox b/gr-digital/doc/packet_comms.dox
index 30a5073..9b9f59f 100644
--- a/gr-digital/doc/packet_comms.dox
+++ b/gr-digital/doc/packet_comms.dox
@@ -37,10 +37,10 @@ transmitted frame:
also often add a known word to the front to help with
synchronization and identification. We use the Packet Header
Formatter block for this, which is completely defined by a packet
- formatter object. See the gr::digital::packet_formatter_base class
+ formatter object. See the gr::digital::header_format_base class
to understand more about how these formatters are created and used.
- The \ref gr::digital::packet_format_async "Packet Header Formatter"
+ The \ref gr::digital::protocol_formatter_async "Protocol Formatter"
has two output paths, both emitted as PDUs from message ports. The
first message port is "header" that emits the header created for the
payload based on the formatter object. The second message port is
@@ -227,10 +227,10 @@ the transmit processing.
threshold. That parameter is used in the receiver to know how many
bits can be wrong in the access code and still pass.
- Disabling the \ref gr::digital::packet_formatter_default
+ Disabling the \ref gr::digital::header_format_default
"default header definition" and enabling the other 'formatter' to
change the protocol. This other protocol definition is the \ref
- gr::digital::packet_formatter_counter "counter header". It adds the
+ gr::digital::header_format_counter "counter header". It adds the
access code and payload length fields as the header like the default
formatter. This formatter includes two other fields as well: the
number of bits/symbol used in the payload modulator (as a 16-bit
@@ -515,7 +515,7 @@ coding, and modulation of the header. Generally speaking,
these are
all controlled through three different objects:
- formatter: An object that described the header structure, derived
- from gr::digital::packet_formatter_base.
+ from gr::digital::header_format_base.
- hdr_const: An object that describes the bit and symbol mapping,
derived from gr::digital::constellation.
@@ -592,14 +592,14 @@ output of the FEC decoder block is a bit stream where
each item is
either a 1 or a 0.
The last step in the header processing stage is to parse that bit
-stream back into the header. The \ref gr::digital::packet_parse_b
+stream back into the header. The \ref gr::digital::protocol_parser_b
"Packet Parser" block does this by receiving a bit stream, passing it
-to the \ref gr::digital::packet_formatter_base::parse "parse" function
-of the packet formatter object, and emitting a message with the
+to the \ref gr::digital::header_format_base::parse "parse" function of
+the packet formatter object, and emitting a message with the
information about the parsed data.
The packet parsing is explained in detail in the \ref
-gr::digital::packet_formatter_base "Packet Formatter Base" class. The
+gr::digital::header_format_base "Packet Formatter Base" class. The
parse function packs together the received bits into the different
header fields, checks that the header is correct, and the constructs a
PMT dictionary of the header information, such as the payload length
diff --git a/gr-digital/examples/ofdm/tx_ofdm.grc
b/gr-digital/examples/ofdm/tx_ofdm.grc
index 308d768..3c8aca2 100644
--- a/gr-digital/examples/ofdm/tx_ofdm.grc
+++ b/gr-digital/examples/ofdm/tx_ofdm.grc
@@ -128,11 +128,11 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_format</value>
</param>
<param>
<key>value</key>
- <value>digital.packet_formatter_ofdm(occupied_carriers, 1,
length_tag_key,)</value>
+ <value>digital.header_format_ofdm(occupied_carriers, 1,
length_tag_key,)</value>
</param>
</block>
<block>
@@ -1373,7 +1373,7 @@
</param>
</block>
<block>
- <key>digital_packet_format_bb</key>
+ <key>digital_protocol_formatter_bb</key>
<param>
<key>alias</key>
<value></value>
@@ -1388,15 +1388,15 @@
</param>
<param>
<key>_enabled</key>
- <value>1</value>
+ <value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
+ <key>format</key>
+ <value>hdr_format</value>
</param>
<param>
<key>_coordinate</key>
- <value>(664, 157)</value>
+ <value>(656, 157)</value>
</param>
<param>
<key>_rotation</key>
@@ -1404,7 +1404,7 @@
</param>
<param>
<key>id</key>
- <value>digital_packet_format_bb_0</value>
+ <value>digital_protocol_formatter_bb_0</value>
</param>
<param>
<key>len_tag_key</key>
@@ -2500,7 +2500,7 @@
</connection>
<connection>
<source_block_id>digital_crc32_bb_0</source_block_id>
- <sink_block_id>digital_packet_format_bb_0</sink_block_id>
+ <sink_block_id>digital_protocol_formatter_bb_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -2523,7 +2523,7 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_bb_0</source_block_id>
+ <source_block_id>digital_protocol_formatter_bb_0</source_block_id>
<sink_block_id>blocks_repack_bits_bb_0_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
diff --git a/gr-digital/examples/packet/formatter_crc.grc
b/gr-digital/examples/packet/formatter_crc.grc
index 3e5f98b..f65d4d0 100644
--- a/gr-digital/examples/packet/formatter_crc.grc
+++ b/gr-digital/examples/packet/formatter_crc.grc
@@ -101,11 +101,11 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_format</value>
</param>
<param>
<key>value</key>
- <value>digital.packet_formatter_crc(len_key, num_key)</value>
+ <value>digital.header_format_crc(len_key, num_key)</value>
</param>
</block>
<block>
@@ -129,11 +129,11 @@ as the formatters keep state.</value>
</param>
<param>
<key>id</key>
- <value>formatter_bb</value>
+ <value>hdr_format_bb</value>
</param>
<param>
<key>value</key>
- <value>digital.packet_formatter_crc(len_key, num_key)</value>
+ <value>digital.header_format_crc(len_key, num_key)</value>
</param>
</block>
<block>
@@ -507,7 +507,7 @@ as the formatters keep state.</value>
</param>
<param>
<key>endianness</key>
- <value>gr.GR_LSB_FIRST</value>
+ <value>gr.GR_MSB_FIRST</value>
</param>
<param>
<key>_coordinate</key>
@@ -566,7 +566,7 @@ as the formatters keep state.</value>
</param>
<param>
<key>endianness</key>
- <value>gr.GR_LSB_FIRST</value>
+ <value>gr.GR_MSB_FIRST</value>
</param>
<param>
<key>_coordinate</key>
@@ -696,7 +696,7 @@ as the formatters keep state.</value>
</param>
</block>
<block>
- <key>digital_packet_format_async</key>
+ <key>digital_protocol_formatter_async</key>
<param>
<key>alias</key>
<value></value>
@@ -711,15 +711,15 @@ as the formatters keep state.</value>
</param>
<param>
<key>_enabled</key>
- <value>1</value>
+ <value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
+ <key>format</key>
+ <value>hdr_format</value>
</param>
<param>
<key>_coordinate</key>
- <value>(624, 289)</value>
+ <value>(616, 289)</value>
</param>
<param>
<key>_rotation</key>
@@ -727,7 +727,7 @@ as the formatters keep state.</value>
</param>
<param>
<key>id</key>
- <value>digital_packet_format_async</value>
+ <value>digital_protocol_formatter_async_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -739,7 +739,7 @@ as the formatters keep state.</value>
</param>
</block>
<block>
- <key>digital_packet_format_bb</key>
+ <key>digital_protocol_formatter_bb</key>
<param>
<key>alias</key>
<value></value>
@@ -754,11 +754,11 @@ as the formatters keep state.</value>
</param>
<param>
<key>_enabled</key>
- <value>1</value>
+ <value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter_bb</value>
+ <key>format</key>
+ <value>hdr_format_bb</value>
</param>
<param>
<key>_coordinate</key>
@@ -770,7 +770,7 @@ as the formatters keep state.</value>
</param>
<param>
<key>id</key>
- <value>digital_packet_format_bb_0</value>
+ <value>digital_protocol_formatter_bb_0</value>
</param>
<param>
<key>len_tag_key</key>
@@ -786,7 +786,7 @@ as the formatters keep state.</value>
</param>
</block>
<block>
- <key>digital_packet_parse_b</key>
+ <key>digital_protocol_parser_b</key>
<param>
<key>alias</key>
<value></value>
@@ -801,11 +801,11 @@ as the formatters keep state.</value>
</param>
<param>
<key>_enabled</key>
- <value>1</value>
+ <value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
+ <key>format</key>
+ <value>hdr_format</value>
</param>
<param>
<key>_coordinate</key>
@@ -817,7 +817,7 @@ as the formatters keep state.</value>
</param>
<param>
<key>id</key>
- <value>digital_packet_parse_b_0</value>
+ <value>digital_protocol_parser_b_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -829,7 +829,7 @@ as the formatters keep state.</value>
</param>
</block>
<block>
- <key>digital_packet_parse_b</key>
+ <key>digital_protocol_parser_b</key>
<param>
<key>alias</key>
<value></value>
@@ -844,11 +844,11 @@ as the formatters keep state.</value>
</param>
<param>
<key>_enabled</key>
- <value>1</value>
+ <value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter_bb</value>
+ <key>format</key>
+ <value>hdr_format_bb</value>
</param>
<param>
<key>_coordinate</key>
@@ -860,7 +860,7 @@ as the formatters keep state.</value>
</param>
<param>
<key>id</key>
- <value>digital_packet_parse_b_0_0</value>
+ <value>digital_protocol_parser_b_0_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -885,7 +885,7 @@ as the formatters keep state.</value>
</connection>
<connection>
<source_block_id>blocks_pdu_to_tagged_stream_0_0</source_block_id>
- <sink_block_id>digital_packet_format_bb_0</sink_block_id>
+ <sink_block_id>digital_protocol_formatter_bb_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -897,7 +897,7 @@ as the formatters keep state.</value>
</connection>
<connection>
<source_block_id>blocks_repack_bits_bb_0</source_block_id>
- <sink_block_id>digital_packet_parse_b_0</sink_block_id>
+ <sink_block_id>digital_protocol_parser_b_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -909,7 +909,7 @@ as the formatters keep state.</value>
</connection>
<connection>
<source_block_id>blocks_repack_bits_bb_0_0</source_block_id>
- <sink_block_id>digital_packet_parse_b_0_0</sink_block_id>
+ <sink_block_id>digital_protocol_parser_b_0_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -921,36 +921,36 @@ as the formatters keep state.</value>
</connection>
<connection>
<source_block_id>digital_crc32_async_bb_1</source_block_id>
- <sink_block_id>digital_packet_format_async</sink_block_id>
+ <sink_block_id>digital_protocol_formatter_async_0</sink_block_id>
<source_key>out</source_key>
<sink_key>in</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_message_debug_0</sink_block_id>
<source_key>header</source_key>
<sink_key>print_pdu</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_pdu_to_tagged_stream_0</sink_block_id>
<source_key>header</source_key>
<sink_key>pdus</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_bb_0</source_block_id>
+ <source_block_id>digital_protocol_formatter_bb_0</source_block_id>
<sink_block_id>blocks_repack_bits_bb_0_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_parse_b_0</source_block_id>
+ <source_block_id>digital_protocol_parser_b_0</source_block_id>
<sink_block_id>blocks_message_debug_0_0</sink_block_id>
<source_key>info</source_key>
<sink_key>print</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_parse_b_0_0</source_block_id>
+ <source_block_id>digital_protocol_parser_b_0_0</source_block_id>
<sink_block_id>blocks_message_debug_0_0_0</sink_block_id>
<source_key>info</source_key>
<sink_key>print</sink_key>
diff --git a/gr-digital/examples/packet/formatter_ofdm.grc
b/gr-digital/examples/packet/formatter_ofdm.grc
index 2a44c27..cec6692 100644
--- a/gr-digital/examples/packet/formatter_ofdm.grc
+++ b/gr-digital/examples/packet/formatter_ofdm.grc
@@ -93,7 +93,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(168, 13)</value>
+ <value>(584, 13)</value>
</param>
<param>
<key>_rotation</key>
@@ -101,19 +101,18 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>frame_key</value>
</param>
<param>
<key>value</key>
- <value>digital.packet_formatter_ofdm(occupied_carriers, 1, len_key,
frame_key, num_key, header_mod.bits_per_symbol(),
payload_mod.bits_per_symbol(), scramble)</value>
+ <value>"frame_len"</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
- <value>Need another for this path
-as the formatters keep state.</value>
+ <value></value>
</param>
<param>
<key>_enabled</key>
@@ -121,7 +120,7 @@ as the formatters keep state.</value>
</param>
<param>
<key>_coordinate</key>
- <value>(296, 477)</value>
+ <value>(168, 13)</value>
</param>
<param>
<key>_rotation</key>
@@ -129,18 +128,19 @@ as the formatters keep state.</value>
</param>
<param>
<key>id</key>
- <value>formatter_bb</value>
+ <value>hdr_format</value>
</param>
<param>
<key>value</key>
- <value>digital.packet_formatter_ofdm(occupied_carriers, 1, len_key,
frame_key, num_key, header_mod.bits_per_symbol(),
payload_mod.bits_per_symbol(), scramble)</value>
+ <value>digital.header_format_ofdm(occupied_carriers, 1, len_key,
frame_key, num_key, header_mod.bits_per_symbol(),
payload_mod.bits_per_symbol(), scramble)</value>
</param>
</block>
<block>
<key>variable</key>
<param>
<key>comment</key>
- <value></value>
+ <value>Need another for this path
+as the formatters keep state.</value>
</param>
<param>
<key>_enabled</key>
@@ -148,7 +148,7 @@ as the formatters keep state.</value>
</param>
<param>
<key>_coordinate</key>
- <value>(584, 13)</value>
+ <value>(296, 477)</value>
</param>
<param>
<key>_rotation</key>
@@ -156,11 +156,11 @@ as the formatters keep state.</value>
</param>
<param>
<key>id</key>
- <value>frame_key</value>
+ <value>hdr_format_bb</value>
</param>
<param>
<key>value</key>
- <value>"frame_len"</value>
+ <value>digital.header_format_ofdm(occupied_carriers, 1, len_key,
frame_key, num_key, header_mod.bits_per_symbol(),
payload_mod.bits_per_symbol(), scramble)</value>
</param>
</block>
<block>
@@ -895,7 +895,7 @@ as the formatters keep state.</value>
</param>
</block>
<block>
- <key>digital_packet_format_async</key>
+ <key>digital_protocol_formatter_async</key>
<param>
<key>alias</key>
<value></value>
@@ -910,15 +910,15 @@ as the formatters keep state.</value>
</param>
<param>
<key>_enabled</key>
- <value>1</value>
+ <value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
+ <key>format</key>
+ <value>hdr_format</value>
</param>
<param>
<key>_coordinate</key>
- <value>(624, 289)</value>
+ <value>(616, 289)</value>
</param>
<param>
<key>_rotation</key>
@@ -926,7 +926,7 @@ as the formatters keep state.</value>
</param>
<param>
<key>id</key>
- <value>digital_packet_format_async</value>
+ <value>digital_protocol_formatter_async_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -938,7 +938,7 @@ as the formatters keep state.</value>
</param>
</block>
<block>
- <key>digital_packet_format_bb</key>
+ <key>digital_protocol_formatter_bb</key>
<param>
<key>alias</key>
<value></value>
@@ -953,11 +953,11 @@ as the formatters keep state.</value>
</param>
<param>
<key>_enabled</key>
- <value>1</value>
+ <value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter_bb</value>
+ <key>format</key>
+ <value>hdr_format_bb</value>
</param>
<param>
<key>_coordinate</key>
@@ -969,7 +969,7 @@ as the formatters keep state.</value>
</param>
<param>
<key>id</key>
- <value>digital_packet_format_bb_0</value>
+ <value>digital_protocol_formatter_bb_0</value>
</param>
<param>
<key>len_tag_key</key>
@@ -985,7 +985,7 @@ as the formatters keep state.</value>
</param>
</block>
<block>
- <key>digital_packet_parse_b</key>
+ <key>digital_protocol_parser_b</key>
<param>
<key>alias</key>
<value></value>
@@ -1000,11 +1000,11 @@ as the formatters keep state.</value>
</param>
<param>
<key>_enabled</key>
- <value>1</value>
+ <value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
+ <key>format</key>
+ <value>hdr_format</value>
</param>
<param>
<key>_coordinate</key>
@@ -1016,7 +1016,7 @@ as the formatters keep state.</value>
</param>
<param>
<key>id</key>
- <value>digital_packet_parse_b_0</value>
+ <value>digital_protocol_parser_b_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -1028,7 +1028,7 @@ as the formatters keep state.</value>
</param>
</block>
<block>
- <key>digital_packet_parse_b</key>
+ <key>digital_protocol_parser_b</key>
<param>
<key>alias</key>
<value></value>
@@ -1043,11 +1043,11 @@ as the formatters keep state.</value>
</param>
<param>
<key>_enabled</key>
- <value>1</value>
+ <value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter_bb</value>
+ <key>format</key>
+ <value>hdr_format_bb</value>
</param>
<param>
<key>_coordinate</key>
@@ -1059,7 +1059,7 @@ as the formatters keep state.</value>
</param>
<param>
<key>id</key>
- <value>digital_packet_parse_b_0_0</value>
+ <value>digital_protocol_parser_b_0_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -1084,7 +1084,7 @@ as the formatters keep state.</value>
</connection>
<connection>
<source_block_id>blocks_pdu_to_tagged_stream_0_0</source_block_id>
- <sink_block_id>digital_packet_format_bb_0</sink_block_id>
+ <sink_block_id>digital_protocol_formatter_bb_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -1096,7 +1096,7 @@ as the formatters keep state.</value>
</connection>
<connection>
<source_block_id>blocks_repack_bits_bb_0</source_block_id>
- <sink_block_id>digital_packet_parse_b_0</sink_block_id>
+ <sink_block_id>digital_protocol_parser_b_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -1108,7 +1108,7 @@ as the formatters keep state.</value>
</connection>
<connection>
<source_block_id>blocks_repack_bits_bb_0_0</source_block_id>
- <sink_block_id>digital_packet_parse_b_0_0</sink_block_id>
+ <sink_block_id>digital_protocol_parser_b_0_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -1120,36 +1120,36 @@ as the formatters keep state.</value>
</connection>
<connection>
<source_block_id>digital_crc32_async_bb_1</source_block_id>
- <sink_block_id>digital_packet_format_async</sink_block_id>
+ <sink_block_id>digital_protocol_formatter_async_0</sink_block_id>
<source_key>out</source_key>
<sink_key>in</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_message_debug_0</sink_block_id>
<source_key>header</source_key>
<sink_key>print_pdu</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_pdu_to_tagged_stream_0</sink_block_id>
<source_key>header</source_key>
<sink_key>pdus</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_bb_0</source_block_id>
+ <source_block_id>digital_protocol_formatter_bb_0</source_block_id>
<sink_block_id>blocks_repack_bits_bb_0_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_parse_b_0</source_block_id>
+ <source_block_id>digital_protocol_parser_b_0</source_block_id>
<sink_block_id>blocks_message_debug_0_0</sink_block_id>
<source_key>info</source_key>
<sink_key>print</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_parse_b_0_0</source_block_id>
+ <source_block_id>digital_protocol_parser_b_0_0</source_block_id>
<sink_block_id>blocks_message_debug_0_0_0</sink_block_id>
<source_key>info</source_key>
<sink_key>print</sink_key>
diff --git a/gr-digital/examples/packet/packet_loopback_hier.grc
b/gr-digital/examples/packet/packet_loopback_hier.grc
index 1ea8308..9af2d46 100644
--- a/gr-digital/examples/packet/packet_loopback_hier.grc
+++ b/gr-digital/examples/packet/packet_loopback_hier.grc
@@ -92,6 +92,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -139,6 +143,10 @@
<value>digital.psk_4()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -186,6 +194,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -234,7 +246,7 @@
</param>
<param>
<key>_enabled</key>
- <value>True</value>
+ <value>1</value>
</param>
<param>
<key>_coordinate</key>
@@ -470,7 +482,7 @@
</param>
<param>
<key>framebits</key>
- <value>formatter.header_nbits()</value>
+ <value>hdr_format.header_nbits()</value>
</param>
<param>
<key>_coordinate</key>
@@ -513,7 +525,7 @@
</param>
<param>
<key>framebits</key>
- <value>formatter.header_nbits()</value>
+ <value>hdr_format.header_nbits()</value>
</param>
<param>
<key>_coordinate</key>
@@ -799,22 +811,26 @@
</param>
</block>
<block>
- <key>variable_packet_formatter_default</key>
- <param>
- <key>access_code</key>
- <value>digital.packet_utils.default_access_code</value>
- </param>
+ <key>variable_qtgui_range</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
- <key>_enabled</key>
+ <key>value</key>
<value>0</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>_coordinate</key>
- <value>(728, 11)</value>
+ <value>(984, 275)</value>
+ </param>
+ <param>
+ <key>gui_hint</key>
+ <value>0,1,1,1</value>
</param>
<param>
<key>_rotation</key>
@@ -822,61 +838,58 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>freq_offset</value>
</param>
<param>
- <key>threshold</key>
- <value>3</value>
+ <key>label</key>
+ <value>Freq. Offset</value>
</param>
- </block>
- <block>
- <key>variable</key>
<param>
- <key>comment</key>
- <value></value>
+ <key>min_len</key>
+ <value>200</value>
</param>
<param>
- <key>_enabled</key>
- <value>1</value>
+ <key>orient</key>
+ <value>Qt.Horizontal</value>
</param>
<param>
- <key>_coordinate</key>
- <value>(728, 91)</value>
+ <key>start</key>
+ <value>-0.5</value>
</param>
<param>
- <key>_rotation</key>
- <value>0</value>
+ <key>step</key>
+ <value>0.0001</value>
</param>
<param>
- <key>id</key>
- <value>formatter</value>
+ <key>stop</key>
+ <value>0.5</value>
</param>
<param>
- <key>value</key>
-
<value>digital.packet_formatter_counter(digital.packet_utils.default_access_code,
3, Const_PLD.bits_per_symbol())</value>
+ <key>rangeType</key>
+ <value>float</value>
+ </param>
+ <param>
+ <key>widget</key>
+ <value>counter_slider</value>
</param>
</block>
<block>
- <key>variable_qtgui_range</key>
+ <key>variable_header_format_default</key>
<param>
- <key>comment</key>
- <value></value>
+ <key>access_code</key>
+ <value>digital.packet_utils.default_access_code</value>
</param>
<param>
- <key>value</key>
- <value>0</value>
+ <key>comment</key>
+ <value></value>
</param>
<param>
<key>_enabled</key>
- <value>True</value>
+ <value>0</value>
</param>
<param>
<key>_coordinate</key>
- <value>(984, 275)</value>
- </param>
- <param>
- <key>gui_hint</key>
- <value>0,1,1,1</value>
+ <value>(728, 14)</value>
</param>
<param>
<key>_rotation</key>
@@ -884,39 +897,38 @@
</param>
<param>
<key>id</key>
- <value>freq_offset</value>
- </param>
- <param>
- <key>label</key>
- <value>Freq. Offset</value>
+ <value>hdr_format</value>
</param>
<param>
- <key>min_len</key>
- <value>200</value>
+ <key>threshold</key>
+ <value>3</value>
</param>
+ </block>
+ <block>
+ <key>variable</key>
<param>
- <key>orient</key>
- <value>Qt.Horizontal</value>
+ <key>comment</key>
+ <value></value>
</param>
<param>
- <key>start</key>
- <value>-0.5</value>
+ <key>_enabled</key>
+ <value>1</value>
</param>
<param>
- <key>step</key>
- <value>0.0001</value>
+ <key>_coordinate</key>
+ <value>(728, 91)</value>
</param>
<param>
- <key>stop</key>
- <value>0.5</value>
+ <key>_rotation</key>
+ <value>0</value>
</param>
<param>
- <key>rangeType</key>
- <value>float</value>
+ <key>id</key>
+ <value>hdr_format</value>
</param>
<param>
- <key>widget</key>
- <value>counter_slider</value>
+ <key>value</key>
+
<value>digital.header_format_counter(digital.packet_utils.default_access_code,
3, Const_PLD.bits_per_symbol())</value>
</param>
</block>
<block>
@@ -1391,7 +1403,7 @@
</param>
<param>
<key>_enabled</key>
- <value>True</value>
+ <value>1</value>
</param>
<param>
<key>_coordinate</key>
@@ -1485,7 +1497,7 @@
</param>
<param>
<key>_enabled</key>
- <value>True</value>
+ <value>1</value>
</param>
<param>
<key>_coordinate</key>
@@ -1583,7 +1595,7 @@
</param>
<param>
<key>_enabled</key>
- <value>True</value>
+ <value>1</value>
</param>
<param>
<key>eb</key>
@@ -1602,6 +1614,10 @@
<value>dec_hdr</value>
</param>
<param>
+ <key>hdr_format</key>
+ <value>hdr_format</value>
+ </param>
+ <param>
<key>hdr_const</key>
<value>Const_HDR</value>
</param>
@@ -1618,10 +1634,6 @@
<value>0</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
- </param>
- <param>
<key>pld_dec</key>
<value>dec</value>
</param>
@@ -1669,6 +1681,10 @@
<value>enc_hdr</value>
</param>
<param>
+ <key>hdr_format</key>
+ <value>hdr_format</value>
+ </param>
+ <param>
<key>hdr_const</key>
<value>Const_HDR</value>
</param>
@@ -1685,10 +1701,6 @@
<value>0</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
- </param>
- <param>
<key>pld_enc</key>
<value>enc</value>
</param>
@@ -1712,6 +1724,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -2055,6 +2071,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -2402,6 +2422,10 @@
<value>1.0</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>bw</key>
<value>1</value>
</param>
@@ -2697,6 +2721,10 @@
<value>1.0</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>bw</key>
<value>1</value>
</param>
@@ -2988,6 +3016,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -3347,6 +3379,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -3706,6 +3742,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -4296,7 +4336,7 @@
</param>
<param>
<key>_enabled</key>
- <value>True</value>
+ <value>1</value>
</param>
<param>
<key>_coordinate</key>
diff --git a/gr-digital/examples/packet/packet_rx.grc
b/gr-digital/examples/packet/packet_rx.grc
index 9e0d365..bce0b58 100644
--- a/gr-digital/examples/packet/packet_rx.grc
+++ b/gr-digital/examples/packet/packet_rx.grc
@@ -805,7 +805,7 @@ FEC is Repetition (x3)</value>
</param>
<param>
<key>header_len</key>
- <value>(formatter.header_nbits() * int(1.0/hdr_dec.rate())) /
hdr_const.bits_per_symbol()</value>
+ <value>(hdr_format.header_nbits() * int(1.0/hdr_dec.rate())) /
hdr_const.bits_per_symbol()</value>
</param>
<param>
<key>id</key>
@@ -853,7 +853,7 @@ FEC is Repetition (x3)</value>
</param>
</block>
<block>
- <key>digital_packet_parse_b</key>
+ <key>digital_pfb_clock_sync_xxx</key>
<param>
<key>alias</key>
<value></value>
@@ -871,32 +871,60 @@ FEC is Repetition (x3)</value>
<value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
+ <key>filter_size</key>
+ <value>nfilts</value>
</param>
<param>
<key>_coordinate</key>
- <value>(1056, 123)</value>
+ <value>(592, 187)</value>
</param>
<param>
<key>_rotation</key>
- <value>180</value>
+ <value>0</value>
</param>
<param>
<key>id</key>
- <value>digital_packet_parse_b_0</value>
+ <value>digital_pfb_clock_sync_xxx_0</value>
+ </param>
+ <param>
+ <key>init_phase</key>
+ <value>nfilts/2</value>
+ </param>
+ <param>
+ <key>loop_bw</key>
+ <value>6.28/400.0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
+ <key>max_dev</key>
+ <value>1.5</value>
+ </param>
+ <param>
<key>minoutbuf</key>
<value>0</value>
</param>
+ <param>
+ <key>osps</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>sps</key>
+ <value>sps</value>
+ </param>
+ <param>
+ <key>taps</key>
+ <value>psf_taps</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>ccf</value>
+ </param>
</block>
<block>
- <key>digital_pfb_clock_sync_xxx</key>
+ <key>digital_protocol_parser_b</key>
<param>
<key>alias</key>
<value></value>
@@ -914,57 +942,29 @@ FEC is Repetition (x3)</value>
<value>True</value>
</param>
<param>
- <key>filter_size</key>
- <value>nfilts</value>
+ <key>format</key>
+ <value>hdr_format</value>
</param>
<param>
<key>_coordinate</key>
- <value>(592, 187)</value>
+ <value>(1024, 124)</value>
</param>
<param>
<key>_rotation</key>
- <value>0</value>
+ <value>180</value>
</param>
<param>
<key>id</key>
- <value>digital_pfb_clock_sync_xxx_0</value>
- </param>
- <param>
- <key>init_phase</key>
- <value>nfilts/2</value>
- </param>
- <param>
- <key>loop_bw</key>
- <value>6.28/400.0</value>
+ <value>digital_protocol_parser_b_0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
- <key>max_dev</key>
- <value>1.5</value>
- </param>
- <param>
<key>minoutbuf</key>
<value>0</value>
</param>
- <param>
- <key>osps</key>
- <value>1</value>
- </param>
- <param>
- <key>sps</key>
- <value>sps</value>
- </param>
- <param>
- <key>taps</key>
- <value>psf_taps</value>
- </param>
- <param>
- <key>type</key>
- <value>ccf</value>
- </param>
</block>
<block>
<key>parameter</key>
@@ -1088,7 +1088,7 @@ FEC is Repetition (x3)</value>
</param>
<param>
<key>_coordinate</key>
- <value>(1352, 123)</value>
+ <value>(1352, 124)</value>
</param>
<param>
<key>_rotation</key>
@@ -1131,7 +1131,7 @@ FEC is Repetition (x3)</value>
</param>
<param>
<key>_coordinate</key>
- <value>(904, 11)</value>
+ <value>(544, 11)</value>
</param>
<param>
<key>_rotation</key>
@@ -1139,11 +1139,11 @@ FEC is Repetition (x3)</value>
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_const</value>
</param>
<param>
<key>label</key>
- <value>Packet Formatter</value>
+ <value>Header constellation</value>
</param>
<param>
<key>short_id</key>
@@ -1155,7 +1155,7 @@ FEC is Repetition (x3)</value>
</param>
<param>
<key>value</key>
-
<value>digital.packet_formatter_default(digital.packet_utils.default_access_code,
0)</value>
+ <value>digital.constellation_calcdist((digital.psk_2()[0]),
(digital.psk_2()[1]), 2, 1).base()</value>
</param>
</block>
<block>
@@ -1174,7 +1174,7 @@ FEC is Repetition (x3)</value>
</param>
<param>
<key>_coordinate</key>
- <value>(544, 11)</value>
+ <value>(192, 11)</value>
</param>
<param>
<key>_rotation</key>
@@ -1182,11 +1182,11 @@ FEC is Repetition (x3)</value>
</param>
<param>
<key>id</key>
- <value>hdr_const</value>
+ <value>hdr_dec</value>
</param>
<param>
<key>label</key>
- <value>Header constellation</value>
+ <value>Header FEC Decoder</value>
</param>
<param>
<key>short_id</key>
@@ -1198,7 +1198,7 @@ FEC is Repetition (x3)</value>
</param>
<param>
<key>value</key>
- <value>digital.constellation_calcdist((digital.psk_2()[0]),
(digital.psk_2()[1]), 2, 1).base()</value>
+ <value> fec.dummy_decoder.make(8000)</value>
</param>
</block>
<block>
@@ -1217,7 +1217,7 @@ FEC is Repetition (x3)</value>
</param>
<param>
<key>_coordinate</key>
- <value>(192, 11)</value>
+ <value>(904, 11)</value>
</param>
<param>
<key>_rotation</key>
@@ -1225,11 +1225,11 @@ FEC is Repetition (x3)</value>
</param>
<param>
<key>id</key>
- <value>hdr_dec</value>
+ <value>hdr_format</value>
</param>
<param>
<key>label</key>
- <value>Header FEC Decoder</value>
+ <value>Header Formatter</value>
</param>
<param>
<key>short_id</key>
@@ -1241,7 +1241,7 @@ FEC is Repetition (x3)</value>
</param>
<param>
<key>value</key>
- <value> fec.dummy_decoder.make(8000)</value>
+
<value>digital.header_format_default(digital.packet_utils.default_access_code,
0)</value>
</param>
</block>
<block>
@@ -1385,7 +1385,7 @@ FEC is Repetition (x3)</value>
</param>
<param>
<key>_coordinate</key>
- <value>(968, 355)</value>
+ <value>(968, 372)</value>
</param>
<param>
<key>_rotation</key>
@@ -1851,12 +1851,6 @@ FEC is Repetition (x3)</value>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_parse_b_0</source_block_id>
- <sink_block_id>digital_header_payload_demux_0</sink_block_id>
- <source_key>info</source_key>
- <sink_key>header_data</sink_key>
- </connection>
- <connection>
<source_block_id>digital_pfb_clock_sync_xxx_0</source_block_id>
<sink_block_id>digital_header_payload_demux_0</sink_block_id>
<source_key>0</source_key>
@@ -1869,6 +1863,12 @@ FEC is Repetition (x3)</value>
<sink_key>0</sink_key>
</connection>
<connection>
+ <source_block_id>digital_protocol_parser_b_0</source_block_id>
+ <sink_block_id>digital_header_payload_demux_0</sink_block_id>
+ <source_key>info</source_key>
+ <sink_key>header_data</sink_key>
+ </connection>
+ <connection>
<source_block_id>fec_async_decoder_0</source_block_id>
<sink_block_id>digital_crc32_async_bb_0</sink_block_id>
<source_key>out</source_key>
@@ -1882,7 +1882,7 @@ FEC is Repetition (x3)</value>
</connection>
<connection>
<source_block_id>fec_generic_decoder_0</source_block_id>
- <sink_block_id>digital_packet_parse_b_0</sink_block_id>
+ <sink_block_id>digital_protocol_parser_b_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
diff --git a/gr-digital/examples/packet/packet_tx.grc
b/gr-digital/examples/packet/packet_tx.grc
index 08fd9ea..66772ee 100644
--- a/gr-digital/examples/packet/packet_tx.grc
+++ b/gr-digital/examples/packet/packet_tx.grc
@@ -182,7 +182,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(536, 251)</value>
+ <value>(536, 252)</value>
</param>
<param>
<key>_rotation</key>
@@ -799,7 +799,7 @@
</param>
</block>
<block>
- <key>digital_packet_format_async</key>
+ <key>digital_protocol_formatter_async</key>
<param>
<key>alias</key>
<value></value>
@@ -817,12 +817,12 @@
<value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
+ <key>format</key>
+ <value>hdr_format</value>
</param>
<param>
<key>_coordinate</key>
- <value>(64, 225)</value>
+ <value>(56, 225)</value>
</param>
<param>
<key>_rotation</key>
@@ -830,7 +830,7 @@
</param>
<param>
<key>id</key>
- <value>digital_packet_format_async_1</value>
+ <value>digital_protocol_formatter_async_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -975,7 +975,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(904, 11)</value>
+ <value>(552, 11)</value>
</param>
<param>
<key>_rotation</key>
@@ -983,11 +983,11 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_const</value>
</param>
<param>
<key>label</key>
- <value>Packet Formatter</value>
+ <value>Header constellation</value>
</param>
<param>
<key>short_id</key>
@@ -999,7 +999,7 @@
</param>
<param>
<key>value</key>
-
<value>digital.packet_formatter_default(digital.packet_utils.default_access_code,
0)</value>
+ <value>digital.constellation_calcdist((digital.psk_2()[0]),
(digital.psk_2()[1]), 2, 1).base()</value>
</param>
</block>
<block>
@@ -1018,7 +1018,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(552, 11)</value>
+ <value>(192, 11)</value>
</param>
<param>
<key>_rotation</key>
@@ -1026,11 +1026,11 @@
</param>
<param>
<key>id</key>
- <value>hdr_const</value>
+ <value>hdr_enc</value>
</param>
<param>
<key>label</key>
- <value>Header constellation</value>
+ <value>Header FEC encoder</value>
</param>
<param>
<key>short_id</key>
@@ -1042,7 +1042,7 @@
</param>
<param>
<key>value</key>
- <value>digital.constellation_calcdist((digital.psk_2()[0]),
(digital.psk_2()[1]), 2, 1).base()</value>
+ <value> fec.dummy_encoder_make(8000)</value>
</param>
</block>
<block>
@@ -1061,7 +1061,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(192, 11)</value>
+ <value>(904, 11)</value>
</param>
<param>
<key>_rotation</key>
@@ -1069,11 +1069,11 @@
</param>
<param>
<key>id</key>
- <value>hdr_enc</value>
+ <value>hdr_format</value>
</param>
<param>
<key>label</key>
- <value>Header FEC encoder</value>
+ <value>Header Formatter</value>
</param>
<param>
<key>short_id</key>
@@ -1085,7 +1085,7 @@
</param>
<param>
<key>value</key>
- <value> fec.dummy_encoder_make(8000)</value>
+
<value>digital.header_format_default(digital.packet_utils.default_access_code,
0)</value>
</param>
</block>
<block>
@@ -1737,20 +1737,20 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async_1</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>fec_async_encoder_0_0</sink_block_id>
<source_key>header</source_key>
<sink_key>in</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async_1</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_pdu_to_tagged_stream_0</sink_block_id>
<source_key>payload</source_key>
<sink_key>pdus</sink_key>
</connection>
<connection>
<source_block_id>fec_async_encoder_0</source_block_id>
- <sink_block_id>digital_packet_format_async_1</sink_block_id>
+ <sink_block_id>digital_protocol_formatter_async_0</sink_block_id>
<source_key>out</source_key>
<sink_key>in</sink_key>
</connection>
diff --git a/gr-digital/examples/packet/transmitter_sim_hier.grc
b/gr-digital/examples/packet/transmitter_sim_hier.grc
index ed19881..1ec7ebe 100644
--- a/gr-digital/examples/packet/transmitter_sim_hier.grc
+++ b/gr-digital/examples/packet/transmitter_sim_hier.grc
@@ -92,6 +92,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -139,6 +143,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -186,6 +194,10 @@
<value>digital.psk_4()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -599,10 +611,10 @@
</param>
</block>
<block>
- <key>variable_packet_formatter_default</key>
+ <key>variable_header_format_default</key>
<param>
<key>access_code</key>
- <value>0</value>
+ <value>digital.packet_utils.default_access_code</value>
</param>
<param>
<key>comment</key>
@@ -610,11 +622,11 @@
</param>
<param>
<key>_enabled</key>
- <value>True</value>
+ <value>1</value>
</param>
<param>
<key>_coordinate</key>
- <value>(680, 11)</value>
+ <value>(720, 14)</value>
</param>
<param>
<key>_rotation</key>
@@ -622,11 +634,11 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_format</value>
</param>
<param>
<key>threshold</key>
- <value>0</value>
+ <value>3</value>
</param>
</block>
<block>
@@ -1096,6 +1108,10 @@
<value>enc_hdr</value>
</param>
<param>
+ <key>hdr_format</key>
+
<value>digital.header_format_default(digital.packet_utils.default_access_code,
0)</value>
+ </param>
+ <param>
<key>hdr_const</key>
<value>Const_HDR</value>
</param>
@@ -1112,10 +1128,6 @@
<value>0</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
- </param>
- <param>
<key>pld_enc</key>
<value>enc</value>
</param>
@@ -1139,6 +1151,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -1486,6 +1502,10 @@
<value>1.0</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>bw</key>
<value>1</value>
</param>
@@ -1777,6 +1797,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
diff --git a/gr-digital/examples/packet/tx_stage3.grc
b/gr-digital/examples/packet/tx_stage3.grc
index 5f7c161..1e83fdc 100644
--- a/gr-digital/examples/packet/tx_stage3.grc
+++ b/gr-digital/examples/packet/tx_stage3.grc
@@ -93,7 +93,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(256, 275)</value>
+ <value>(256, 285)</value>
</param>
<param>
<key>_rotation</key>
@@ -109,7 +109,7 @@
</param>
</block>
<block>
- <key>variable_packet_formatter_default</key>
+ <key>variable_header_format_default</key>
<param>
<key>access_code</key>
<value>digital.packet_utils.default_access_code</value>
@@ -124,7 +124,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(32, 211)</value>
+ <value>(24, 206)</value>
</param>
<param>
<key>_rotation</key>
@@ -132,7 +132,7 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_format</value>
</param>
<param>
<key>threshold</key>
@@ -159,11 +159,11 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_format</value>
</param>
<param>
<key>value</key>
-
<value>digital.packet_formatter_counter(digital.packet_utils.default_access_code,
thresh, bps)</value>
+
<value>digital.header_format_counter(digital.packet_utils.default_access_code,
thresh, bps)</value>
</param>
</block>
<block>
@@ -178,7 +178,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(32, 291)</value>
+ <value>(24, 285)</value>
</param>
<param>
<key>_rotation</key>
@@ -370,7 +370,7 @@
</param>
</block>
<block>
- <key>digital_packet_format_async</key>
+ <key>digital_protocol_formatter_async</key>
<param>
<key>alias</key>
<value></value>
@@ -388,12 +388,12 @@
<value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
+ <key>format</key>
+ <value>hdr_format</value>
</param>
<param>
<key>_coordinate</key>
- <value>(624, 105)</value>
+ <value>(616, 105)</value>
</param>
<param>
<key>_rotation</key>
@@ -401,7 +401,7 @@
</param>
<param>
<key>id</key>
- <value>digital_packet_format_async_1</value>
+ <value>digital_protocol_formatter_async_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -426,18 +426,18 @@
</connection>
<connection>
<source_block_id>digital_crc32_async_bb_1</source_block_id>
- <sink_block_id>digital_packet_format_async_1</sink_block_id>
+ <sink_block_id>digital_protocol_formatter_async_0</sink_block_id>
<source_key>out</source_key>
<sink_key>in</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async_1</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_message_debug_0</sink_block_id>
<source_key>header</source_key>
<sink_key>print_pdu</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async_1</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_message_debug_0</sink_block_id>
<source_key>payload</source_key>
<sink_key>print_pdu</sink_key>
diff --git a/gr-digital/examples/packet/tx_stage4.grc
b/gr-digital/examples/packet/tx_stage4.grc
index fc56f47..7acfd73 100644
--- a/gr-digital/examples/packet/tx_stage4.grc
+++ b/gr-digital/examples/packet/tx_stage4.grc
@@ -109,22 +109,30 @@
</param>
</block>
<block>
- <key>variable_packet_formatter_default</key>
- <param>
- <key>access_code</key>
- <value>digital.packet_utils.default_access_code</value>
- </param>
+ <key>variable_constellation</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
- <key>_enabled</key>
+ <key>const_points</key>
+ <value>digital.psk_2()[0]</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
+ <key>dims</key>
<value>1</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>_coordinate</key>
- <value>(400, 11)</value>
+ <value>(816, 11)</value>
</param>
<param>
<key>_rotation</key>
@@ -132,26 +140,42 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_const</value>
</param>
<param>
- <key>threshold</key>
- <value>thresh</value>
+ <key>rot_sym</key>
+ <value>2</value>
+ </param>
+ <param>
+ <key>soft_dec_lut</key>
+ <value>'auto'</value>
+ </param>
+ <param>
+ <key>precision</key>
+ <value>8</value>
+ </param>
+ <param>
+ <key>sym_map</key>
+ <value>digital.psk_2()[1]</value>
</param>
</block>
<block>
- <key>variable</key>
+ <key>variable_header_format_default</key>
+ <param>
+ <key>access_code</key>
+ <value>digital.packet_utils.default_access_code</value>
+ </param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
- <value>0</value>
+ <value>1</value>
</param>
<param>
<key>_coordinate</key>
- <value>(624, 11)</value>
+ <value>(400, 6)</value>
</param>
<param>
<key>_rotation</key>
@@ -159,34 +183,26 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_format</value>
</param>
<param>
- <key>value</key>
-
<value>digital.packet_formatter_counter(digital.packet_utils.default_access_code,
thresh, bps)</value>
+ <key>threshold</key>
+ <value>thresh</value>
</param>
</block>
<block>
- <key>variable_constellation</key>
+ <key>variable</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
- <key>const_points</key>
- <value>digital.psk_2()[0]</value>
- </param>
- <param>
- <key>dims</key>
- <value>1</value>
- </param>
- <param>
<key>_enabled</key>
- <value>True</value>
+ <value>0</value>
</param>
<param>
<key>_coordinate</key>
- <value>(816, 11)</value>
+ <value>(592, 5)</value>
</param>
<param>
<key>_rotation</key>
@@ -194,23 +210,11 @@
</param>
<param>
<key>id</key>
- <value>hdr_const</value>
- </param>
- <param>
- <key>rot_sym</key>
- <value>2</value>
- </param>
- <param>
- <key>soft_dec_lut</key>
- <value>'auto'</value>
+ <value>hdr_format</value>
</param>
<param>
- <key>precision</key>
- <value>8</value>
- </param>
- <param>
- <key>sym_map</key>
- <value>digital.psk_2()[1]</value>
+ <key>value</key>
+
<value>digital.header_format_counter(digital.packet_utils.default_access_code,
thresh, bps)</value>
</param>
</block>
<block>
@@ -224,6 +228,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -908,7 +916,7 @@
</param>
</block>
<block>
- <key>digital_packet_format_async</key>
+ <key>digital_protocol_formatter_async</key>
<param>
<key>alias</key>
<value></value>
@@ -926,12 +934,12 @@
<value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
+ <key>format</key>
+ <value>hdr_format</value>
</param>
<param>
<key>_coordinate</key>
- <value>(64, 249)</value>
+ <value>(56, 233)</value>
</param>
<param>
<key>_rotation</key>
@@ -939,7 +947,7 @@
</param>
<param>
<key>id</key>
- <value>digital_packet_format_async_1</value>
+ <value>digital_protocol_formatter_async_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -1015,6 +1023,10 @@
<value>1.0</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>bw</key>
<value>1</value>
</param>
@@ -1306,6 +1318,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -1889,7 +1905,7 @@
</connection>
<connection>
<source_block_id>digital_crc32_async_bb_1</source_block_id>
- <sink_block_id>digital_packet_format_async_1</sink_block_id>
+ <sink_block_id>digital_protocol_formatter_async_0</sink_block_id>
<source_key>out</source_key>
<sink_key>in</sink_key>
</connection>
@@ -1906,13 +1922,13 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async_1</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_pdu_to_tagged_stream_0_0</sink_block_id>
<source_key>header</source_key>
<sink_key>pdus</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async_1</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_pdu_to_tagged_stream_0</sink_block_id>
<source_key>payload</source_key>
<sink_key>pdus</sink_key>
diff --git a/gr-digital/examples/packet/tx_stage5.grc
b/gr-digital/examples/packet/tx_stage5.grc
index 5efd4ee..b6a46eb 100644
--- a/gr-digital/examples/packet/tx_stage5.grc
+++ b/gr-digital/examples/packet/tx_stage5.grc
@@ -109,22 +109,30 @@
</param>
</block>
<block>
- <key>variable_packet_formatter_default</key>
- <param>
- <key>access_code</key>
- <value>digital.packet_utils.default_access_code</value>
- </param>
+ <key>variable_constellation</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
- <key>_enabled</key>
+ <key>const_points</key>
+ <value>digital.psk_2()[0]</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
+ <key>dims</key>
<value>1</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>_coordinate</key>
- <value>(400, 11)</value>
+ <value>(816, 11)</value>
</param>
<param>
<key>_rotation</key>
@@ -132,26 +140,42 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_const</value>
</param>
<param>
- <key>threshold</key>
- <value>thresh</value>
+ <key>rot_sym</key>
+ <value>2</value>
+ </param>
+ <param>
+ <key>soft_dec_lut</key>
+ <value>'auto'</value>
+ </param>
+ <param>
+ <key>precision</key>
+ <value>8</value>
+ </param>
+ <param>
+ <key>sym_map</key>
+ <value>digital.psk_2()[1]</value>
</param>
</block>
<block>
- <key>variable</key>
+ <key>variable_header_format_default</key>
+ <param>
+ <key>access_code</key>
+ <value>digital.packet_utils.default_access_code</value>
+ </param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
- <value>0</value>
+ <value>1</value>
</param>
<param>
<key>_coordinate</key>
- <value>(624, 11)</value>
+ <value>(400, 6)</value>
</param>
<param>
<key>_rotation</key>
@@ -159,34 +183,26 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_format</value>
</param>
<param>
- <key>value</key>
-
<value>digital.packet_formatter_counter(digital.packet_utils.default_access_code,
thresh, bps)</value>
+ <key>threshold</key>
+ <value>thresh</value>
</param>
</block>
<block>
- <key>variable_constellation</key>
+ <key>variable</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
- <key>const_points</key>
- <value>digital.psk_2()[0]</value>
- </param>
- <param>
- <key>dims</key>
- <value>1</value>
- </param>
- <param>
<key>_enabled</key>
- <value>True</value>
+ <value>0</value>
</param>
<param>
<key>_coordinate</key>
- <value>(816, 11)</value>
+ <value>(592, 5)</value>
</param>
<param>
<key>_rotation</key>
@@ -194,23 +210,11 @@
</param>
<param>
<key>id</key>
- <value>hdr_const</value>
- </param>
- <param>
- <key>rot_sym</key>
- <value>2</value>
- </param>
- <param>
- <key>soft_dec_lut</key>
- <value>'auto'</value>
+ <value>hdr_format</value>
</param>
<param>
- <key>precision</key>
- <value>8</value>
- </param>
- <param>
- <key>sym_map</key>
- <value>digital.psk_2()[1]</value>
+ <key>value</key>
+
<value>digital.header_format_counter(digital.packet_utils.default_access_code,
thresh, bps)</value>
</param>
</block>
<block>
@@ -224,6 +228,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -971,7 +979,7 @@
</param>
</block>
<block>
- <key>digital_packet_format_async</key>
+ <key>digital_protocol_formatter_async</key>
<param>
<key>alias</key>
<value></value>
@@ -989,12 +997,12 @@
<value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
+ <key>format</key>
+ <value>hdr_format</value>
</param>
<param>
<key>_coordinate</key>
- <value>(64, 249)</value>
+ <value>(56, 233)</value>
</param>
<param>
<key>_rotation</key>
@@ -1002,7 +1010,7 @@
</param>
<param>
<key>id</key>
- <value>digital_packet_format_async_1</value>
+ <value>digital_protocol_formatter_async_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -1078,6 +1086,10 @@
<value>1.0</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>bw</key>
<value>1</value>
</param>
@@ -1369,6 +1381,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -1958,7 +1974,7 @@
</connection>
<connection>
<source_block_id>digital_crc32_async_bb_1</source_block_id>
- <sink_block_id>digital_packet_format_async_1</sink_block_id>
+ <sink_block_id>digital_protocol_formatter_async_0</sink_block_id>
<source_key>out</source_key>
<sink_key>in</sink_key>
</connection>
@@ -1975,13 +1991,13 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async_1</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_pdu_to_tagged_stream_0_0</sink_block_id>
<source_key>header</source_key>
<sink_key>pdus</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async_1</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_pdu_to_tagged_stream_0</sink_block_id>
<source_key>payload</source_key>
<sink_key>pdus</sink_key>
diff --git a/gr-digital/examples/packet/tx_stage6.grc
b/gr-digital/examples/packet/tx_stage6.grc
index af0546e..4e2806f 100644
--- a/gr-digital/examples/packet/tx_stage6.grc
+++ b/gr-digital/examples/packet/tx_stage6.grc
@@ -163,22 +163,30 @@
</param>
</block>
<block>
- <key>variable_packet_formatter_default</key>
- <param>
- <key>access_code</key>
- <value>digital.packet_utils.default_access_code</value>
- </param>
+ <key>variable_constellation</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
- <key>_enabled</key>
+ <key>const_points</key>
+ <value>digital.psk_2()[0]</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
+ <key>dims</key>
<value>1</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>_coordinate</key>
- <value>(400, 11)</value>
+ <value>(816, 11)</value>
</param>
<param>
<key>_rotation</key>
@@ -186,26 +194,42 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_const</value>
</param>
<param>
- <key>threshold</key>
- <value>thresh</value>
+ <key>rot_sym</key>
+ <value>2</value>
+ </param>
+ <param>
+ <key>soft_dec_lut</key>
+ <value>'auto'</value>
+ </param>
+ <param>
+ <key>precision</key>
+ <value>8</value>
+ </param>
+ <param>
+ <key>sym_map</key>
+ <value>digital.psk_2()[1]</value>
</param>
</block>
<block>
- <key>variable</key>
+ <key>variable_header_format_default</key>
+ <param>
+ <key>access_code</key>
+ <value>digital.packet_utils.default_access_code</value>
+ </param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
- <value>0</value>
+ <value>1</value>
</param>
<param>
<key>_coordinate</key>
- <value>(624, 11)</value>
+ <value>(400, 6)</value>
</param>
<param>
<key>_rotation</key>
@@ -213,34 +237,26 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_format</value>
</param>
<param>
- <key>value</key>
-
<value>digital.packet_formatter_counter(digital.packet_utils.default_access_code,
thresh, bps)</value>
+ <key>threshold</key>
+ <value>thresh</value>
</param>
</block>
<block>
- <key>variable_constellation</key>
+ <key>variable</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
- <key>const_points</key>
- <value>digital.psk_2()[0]</value>
- </param>
- <param>
- <key>dims</key>
- <value>1</value>
- </param>
- <param>
<key>_enabled</key>
- <value>True</value>
+ <value>0</value>
</param>
<param>
<key>_coordinate</key>
- <value>(816, 11)</value>
+ <value>(592, 5)</value>
</param>
<param>
<key>_rotation</key>
@@ -248,23 +264,11 @@
</param>
<param>
<key>id</key>
- <value>hdr_const</value>
- </param>
- <param>
- <key>rot_sym</key>
- <value>2</value>
- </param>
- <param>
- <key>soft_dec_lut</key>
- <value>'auto'</value>
+ <value>hdr_format</value>
</param>
<param>
- <key>precision</key>
- <value>8</value>
- </param>
- <param>
- <key>sym_map</key>
- <value>digital.psk_2()[1]</value>
+ <key>value</key>
+
<value>digital.header_format_counter(digital.packet_utils.default_access_code,
thresh, bps)</value>
</param>
</block>
<block>
@@ -305,6 +309,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -1149,7 +1157,7 @@
</param>
</block>
<block>
- <key>digital_packet_format_async</key>
+ <key>digital_protocol_formatter_async</key>
<param>
<key>alias</key>
<value></value>
@@ -1167,12 +1175,12 @@
<value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
+ <key>format</key>
+ <value>hdr_format</value>
</param>
<param>
<key>_coordinate</key>
- <value>(64, 249)</value>
+ <value>(56, 225)</value>
</param>
<param>
<key>_rotation</key>
@@ -1180,7 +1188,7 @@
</param>
<param>
<key>id</key>
- <value>digital_packet_format_async_1</value>
+ <value>digital_protocol_formatter_async_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -1319,6 +1327,10 @@
<value>1.0</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>bw</key>
<value>sps</value>
</param>
@@ -1610,6 +1622,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -2193,7 +2209,7 @@
</connection>
<connection>
<source_block_id>digital_crc32_async_bb_1</source_block_id>
- <sink_block_id>digital_packet_format_async_1</sink_block_id>
+ <sink_block_id>digital_protocol_formatter_async_0</sink_block_id>
<source_key>out</source_key>
<sink_key>in</sink_key>
</connection>
@@ -2210,13 +2226,13 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async_1</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_pdu_to_tagged_stream_0_0</sink_block_id>
<source_key>header</source_key>
<sink_key>pdus</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async_1</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_pdu_to_tagged_stream_0</sink_block_id>
<source_key>payload</source_key>
<sink_key>pdus</sink_key>
diff --git a/gr-digital/examples/packet/tx_stage6a.grc
b/gr-digital/examples/packet/tx_stage6a.grc
index 972cedc..7c5565c 100644
--- a/gr-digital/examples/packet/tx_stage6a.grc
+++ b/gr-digital/examples/packet/tx_stage6a.grc
@@ -163,22 +163,30 @@
</param>
</block>
<block>
- <key>variable_packet_formatter_default</key>
- <param>
- <key>access_code</key>
- <value>digital.packet_utils.default_access_code</value>
- </param>
+ <key>variable_constellation</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
- <key>_enabled</key>
+ <key>const_points</key>
+ <value>digital.psk_2()[0]</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
+ <key>dims</key>
<value>1</value>
</param>
<param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
<key>_coordinate</key>
- <value>(400, 11)</value>
+ <value>(816, 11)</value>
</param>
<param>
<key>_rotation</key>
@@ -186,26 +194,42 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_const</value>
</param>
<param>
- <key>threshold</key>
- <value>thresh</value>
+ <key>rot_sym</key>
+ <value>2</value>
+ </param>
+ <param>
+ <key>soft_dec_lut</key>
+ <value>'auto'</value>
+ </param>
+ <param>
+ <key>precision</key>
+ <value>8</value>
+ </param>
+ <param>
+ <key>sym_map</key>
+ <value>digital.psk_2()[1]</value>
</param>
</block>
<block>
- <key>variable</key>
+ <key>variable_header_format_default</key>
+ <param>
+ <key>access_code</key>
+ <value>digital.packet_utils.default_access_code</value>
+ </param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>_enabled</key>
- <value>0</value>
+ <value>1</value>
</param>
<param>
<key>_coordinate</key>
- <value>(624, 11)</value>
+ <value>(400, 6)</value>
</param>
<param>
<key>_rotation</key>
@@ -213,34 +237,26 @@
</param>
<param>
<key>id</key>
- <value>formatter</value>
+ <value>hdr_format</value>
</param>
<param>
- <key>value</key>
-
<value>digital.packet_formatter_counter(digital.packet_utils.default_access_code,
thresh, bps)</value>
+ <key>threshold</key>
+ <value>thresh</value>
</param>
</block>
<block>
- <key>variable_constellation</key>
+ <key>variable</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
- <key>const_points</key>
- <value>digital.psk_2()[0]</value>
- </param>
- <param>
- <key>dims</key>
- <value>1</value>
- </param>
- <param>
<key>_enabled</key>
- <value>True</value>
+ <value>0</value>
</param>
<param>
<key>_coordinate</key>
- <value>(816, 11)</value>
+ <value>(592, 5)</value>
</param>
<param>
<key>_rotation</key>
@@ -248,23 +264,11 @@
</param>
<param>
<key>id</key>
- <value>hdr_const</value>
- </param>
- <param>
- <key>rot_sym</key>
- <value>2</value>
- </param>
- <param>
- <key>soft_dec_lut</key>
- <value>'auto'</value>
+ <value>hdr_format</value>
</param>
<param>
- <key>precision</key>
- <value>8</value>
- </param>
- <param>
- <key>sym_map</key>
- <value>digital.psk_2()[1]</value>
+ <key>value</key>
+
<value>digital.header_format_counter(digital.packet_utils.default_access_code,
thresh, bps)</value>
</param>
</block>
<block>
@@ -305,6 +309,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -1192,7 +1200,7 @@
</param>
</block>
<block>
- <key>digital_packet_format_async</key>
+ <key>digital_protocol_formatter_async</key>
<param>
<key>alias</key>
<value></value>
@@ -1210,12 +1218,12 @@
<value>True</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
+ <key>format</key>
+ <value>hdr_format</value>
</param>
<param>
<key>_coordinate</key>
- <value>(64, 249)</value>
+ <value>(56, 225)</value>
</param>
<param>
<key>_rotation</key>
@@ -1223,7 +1231,7 @@
</param>
<param>
<key>id</key>
- <value>digital_packet_format_async_1</value>
+ <value>digital_protocol_formatter_async_0</value>
</param>
<param>
<key>maxoutbuf</key>
@@ -1417,6 +1425,10 @@
<value>1.0</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>bw</key>
<value>sps</value>
</param>
@@ -1708,6 +1720,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -2291,7 +2307,7 @@
</connection>
<connection>
<source_block_id>digital_crc32_async_bb_1</source_block_id>
- <sink_block_id>digital_packet_format_async_1</sink_block_id>
+ <sink_block_id>digital_protocol_formatter_async_0</sink_block_id>
<source_key>out</source_key>
<sink_key>in</sink_key>
</connection>
@@ -2308,13 +2324,13 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async_1</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_pdu_to_tagged_stream_0_0</sink_block_id>
<source_key>header</source_key>
<sink_key>pdus</sink_key>
</connection>
<connection>
- <source_block_id>digital_packet_format_async_1</source_block_id>
+ <source_block_id>digital_protocol_formatter_async_0</source_block_id>
<sink_block_id>blocks_pdu_to_tagged_stream_0</sink_block_id>
<source_key>payload</source_key>
<sink_key>pdus</sink_key>
diff --git a/gr-digital/examples/packet/uhd_packet_rx.grc
b/gr-digital/examples/packet/uhd_packet_rx.grc
index 3734010..8d902a5 100644
--- a/gr-digital/examples/packet/uhd_packet_rx.grc
+++ b/gr-digital/examples/packet/uhd_packet_rx.grc
@@ -92,6 +92,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -139,6 +143,10 @@
<value>digital.psk_4()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -186,6 +194,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -521,64 +533,6 @@
</param>
</block>
<block>
- <key>variable_packet_formatter_default</key>
- <param>
- <key>access_code</key>
- <value>digital.packet_utils.default_access_code</value>
- </param>
- <param>
- <key>comment</key>
- <value></value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(728, 11)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- <param>
- <key>id</key>
- <value>formatter</value>
- </param>
- <param>
- <key>threshold</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>variable</key>
- <param>
- <key>comment</key>
- <value></value>
- </param>
- <param>
- <key>_enabled</key>
- <value>False</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(728, 91)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- <param>
- <key>id</key>
- <value>formatter</value>
- </param>
- <param>
- <key>value</key>
-
<value>digital.packet_formatter_counter(digital.packet_utils.default_access_code,
Const_PLD.bits_per_symbol())</value>
- </param>
- </block>
- <block>
<key>variable_qtgui_range</key>
<param>
<key>comment</key>
@@ -705,6 +659,64 @@
</param>
</block>
<block>
+ <key>variable_header_format_default</key>
+ <param>
+ <key>access_code</key>
+ <value>digital.packet_utils.default_access_code</value>
+ </param>
+ <param>
+ <key>comment</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(760, 14)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>id</key>
+ <value>hdr_format</value>
+ </param>
+ <param>
+ <key>threshold</key>
+ <value>3</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>comment</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(760, 85)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>id</key>
+ <value>hdr_format</value>
+ </param>
+ <param>
+ <key>value</key>
+
<value>digital.header_format_counter(digital.packet_utils.default_access_code,
3, Const_PLD.bits_per_symbol())</value>
+ </param>
+ </block>
+ <block>
<key>variable</key>
<param>
<key>comment</key>
@@ -1249,6 +1261,10 @@ to the receiver.</value>
<value>dec_hdr</value>
</param>
<param>
+ <key>hdr_format</key>
+
<value>digital.header_format_default(digital.packet_utils.default_access_code,
0)</value>
+ </param>
+ <param>
<key>hdr_const</key>
<value>Const_HDR</value>
</param>
@@ -1265,10 +1281,6 @@ to the receiver.</value>
<value>0</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
- </param>
- <param>
<key>pld_dec</key>
<value>dec</value>
</param>
@@ -1292,6 +1304,10 @@ to the receiver.</value>
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -1635,6 +1651,10 @@ to the receiver.</value>
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -1978,6 +1998,10 @@ to the receiver.</value>
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -2337,6 +2361,10 @@ to the receiver.</value>
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -4024,12 +4052,6 @@ to the receiver.</value>
</connection>
<connection>
<source_block_id>packet_rx_0</source_block_id>
- <sink_block_id>qtgui_time_sink_x_1_0_0_1</sink_block_id>
- <source_key>2</source_key>
- <sink_key>0</sink_key>
- </connection>
- <connection>
- <source_block_id>packet_rx_0</source_block_id>
<sink_block_id>blocks_message_debug_0_0_0</sink_block_id>
<source_key>pkt out</source_key>
<sink_key>print_pdu</sink_key>
@@ -4041,6 +4063,12 @@ to the receiver.</value>
<sink_key>0</sink_key>
</connection>
<connection>
+ <source_block_id>packet_rx_0</source_block_id>
+ <sink_block_id>qtgui_time_sink_x_1_0_0_1</sink_block_id>
+ <source_key>2</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
<source_block_id>uhd_usrp_source_0</source_block_id>
<sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
<source_key>0</source_key>
diff --git a/gr-digital/examples/packet/uhd_packet_rx_tun.grc
b/gr-digital/examples/packet/uhd_packet_rx_tun.grc
index 03d96f6..c64cd95 100644
--- a/gr-digital/examples/packet/uhd_packet_rx_tun.grc
+++ b/gr-digital/examples/packet/uhd_packet_rx_tun.grc
@@ -92,6 +92,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -139,6 +143,10 @@
<value>digital.psk_4()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -186,6 +194,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -521,64 +533,6 @@
</param>
</block>
<block>
- <key>variable_packet_formatter_default</key>
- <param>
- <key>access_code</key>
- <value>digital.packet_utils.default_access_code</value>
- </param>
- <param>
- <key>comment</key>
- <value></value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(728, 11)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- <param>
- <key>id</key>
- <value>formatter</value>
- </param>
- <param>
- <key>threshold</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>variable</key>
- <param>
- <key>comment</key>
- <value></value>
- </param>
- <param>
- <key>_enabled</key>
- <value>False</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(728, 91)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- <param>
- <key>id</key>
- <value>formatter</value>
- </param>
- <param>
- <key>value</key>
-
<value>digital.packet_formatter_counter(digital.packet_utils.default_access_code,
Const_PLD.bits_per_symbol())</value>
- </param>
- </block>
- <block>
<key>variable_qtgui_range</key>
<param>
<key>comment</key>
@@ -705,6 +659,64 @@
</param>
</block>
<block>
+ <key>variable_header_format_default</key>
+ <param>
+ <key>access_code</key>
+ <value>digital.packet_utils.default_access_code</value>
+ </param>
+ <param>
+ <key>comment</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(760, 14)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>id</key>
+ <value>hdr_format</value>
+ </param>
+ <param>
+ <key>threshold</key>
+ <value>3</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>comment</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(760, 85)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>id</key>
+ <value>hdr_format</value>
+ </param>
+ <param>
+ <key>value</key>
+
<value>digital.header_format_counter(digital.packet_utils.default_access_code,
3, Const_PLD.bits_per_symbol())</value>
+ </param>
+ </block>
+ <block>
<key>variable</key>
<param>
<key>comment</key>
@@ -1297,6 +1309,10 @@
<value>dec_hdr</value>
</param>
<param>
+ <key>hdr_format</key>
+
<value>digital.header_format_default(digital.packet_utils.default_access_code,
0)</value>
+ </param>
+ <param>
<key>hdr_const</key>
<value>Const_HDR</value>
</param>
@@ -1313,10 +1329,6 @@
<value>0</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
- </param>
- <param>
<key>pld_dec</key>
<value>dec</value>
</param>
@@ -1340,6 +1352,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -1683,6 +1699,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -2026,6 +2046,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -2385,6 +2409,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -4072,12 +4100,6 @@
</connection>
<connection>
<source_block_id>packet_rx_0</source_block_id>
- <sink_block_id>qtgui_time_sink_x_1_0_0_1</sink_block_id>
- <source_key>2</source_key>
- <sink_key>0</sink_key>
- </connection>
- <connection>
- <source_block_id>packet_rx_0</source_block_id>
<sink_block_id>blocks_message_debug_0</sink_block_id>
<source_key>pkt out</source_key>
<sink_key>print_pdu</sink_key>
@@ -4095,6 +4117,12 @@
<sink_key>0</sink_key>
</connection>
<connection>
+ <source_block_id>packet_rx_0</source_block_id>
+ <sink_block_id>qtgui_time_sink_x_1_0_0_1</sink_block_id>
+ <source_key>2</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
<source_block_id>uhd_usrp_source_0</source_block_id>
<sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
<source_key>0</source_key>
diff --git a/gr-digital/examples/packet/uhd_packet_tx.grc
b/gr-digital/examples/packet/uhd_packet_tx.grc
index 825d4bb..2bc5ae7 100644
--- a/gr-digital/examples/packet/uhd_packet_tx.grc
+++ b/gr-digital/examples/packet/uhd_packet_tx.grc
@@ -92,6 +92,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -139,6 +143,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -186,6 +194,10 @@
<value>digital.psk_4()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -497,60 +509,6 @@
</param>
</block>
<block>
- <key>variable_packet_formatter_default</key>
- <param>
- <key>access_code</key>
- <value>digital.packet_utils.default_access_code</value>
- </param>
- <param>
- <key>comment</key>
- <value></value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(728, 11)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- <param>
- <key>id</key>
- <value>formatter</value>
- </param>
- </block>
- <block>
- <key>variable</key>
- <param>
- <key>comment</key>
- <value></value>
- </param>
- <param>
- <key>_enabled</key>
- <value>False</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(728, 75)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- <param>
- <key>id</key>
- <value>formatter</value>
- </param>
- <param>
- <key>value</key>
-
<value>digital.packet_formatter_counter(digital.packet_utils.default_access_code,
Const_PLD.bits_per_symbol())</value>
- </param>
- </block>
- <block>
<key>variable_qtgui_range</key>
<param>
<key>comment</key>
@@ -677,6 +635,64 @@
</param>
</block>
<block>
+ <key>variable_header_format_default</key>
+ <param>
+ <key>access_code</key>
+ <value>digital.packet_utils.default_access_code</value>
+ </param>
+ <param>
+ <key>comment</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(752, 14)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>id</key>
+ <value>hdr_format</value>
+ </param>
+ <param>
+ <key>threshold</key>
+ <value>3</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>comment</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(752, 85)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>id</key>
+ <value>hdr_format</value>
+ </param>
+ <param>
+ <key>value</key>
+
<value>digital.header_format_counter(digital.packet_utils.default_access_code,
3, Const_PLD.bits_per_symbol())</value>
+ </param>
+ </block>
+ <block>
<key>variable</key>
<param>
<key>comment</key>
@@ -1241,6 +1257,10 @@
<value>enc_hdr</value>
</param>
<param>
+ <key>hdr_format</key>
+
<value>digital.header_format_default(digital.packet_utils.default_access_code,
0)</value>
+ </param>
+ <param>
<key>hdr_const</key>
<value>Const_HDR</value>
</param>
@@ -1257,10 +1277,6 @@
<value>0</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
- </param>
- <param>
<key>pld_enc</key>
<value>enc</value>
</param>
@@ -1284,6 +1300,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -1631,6 +1651,10 @@
<value>1.0</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>bw</key>
<value>1</value>
</param>
@@ -1922,6 +1946,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
diff --git a/gr-digital/examples/packet/uhd_packet_tx_tun.grc
b/gr-digital/examples/packet/uhd_packet_tx_tun.grc
index c168286..95fccd4 100644
--- a/gr-digital/examples/packet/uhd_packet_tx_tun.grc
+++ b/gr-digital/examples/packet/uhd_packet_tx_tun.grc
@@ -92,6 +92,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -139,6 +143,10 @@
<value>digital.psk_2()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -186,6 +194,10 @@
<value>digital.psk_4()[0]</value>
</param>
<param>
+ <key>type</key>
+ <value>calcdist</value>
+ </param>
+ <param>
<key>dims</key>
<value>1</value>
</param>
@@ -497,64 +509,6 @@
</param>
</block>
<block>
- <key>variable_packet_formatter_default</key>
- <param>
- <key>access_code</key>
- <value>digital.packet_utils.default_access_code</value>
- </param>
- <param>
- <key>comment</key>
- <value></value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(728, 11)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- <param>
- <key>id</key>
- <value>formatter</value>
- </param>
- <param>
- <key>threshold</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>variable</key>
- <param>
- <key>comment</key>
- <value></value>
- </param>
- <param>
- <key>_enabled</key>
- <value>False</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(728, 75)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- <param>
- <key>id</key>
- <value>formatter</value>
- </param>
- <param>
- <key>value</key>
-
<value>digital.packet_formatter_counter(digital.packet_utils.default_access_code,
Const_PLD.bits_per_symbol())</value>
- </param>
- </block>
- <block>
<key>variable_qtgui_range</key>
<param>
<key>comment</key>
@@ -681,6 +635,64 @@
</param>
</block>
<block>
+ <key>variable_header_format_default</key>
+ <param>
+ <key>access_code</key>
+ <value>digital.packet_utils.default_access_code</value>
+ </param>
+ <param>
+ <key>comment</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(752, 14)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>id</key>
+ <value>hdr_format</value>
+ </param>
+ <param>
+ <key>threshold</key>
+ <value>3</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>comment</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(752, 85)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>id</key>
+ <value>hdr_format_0</value>
+ </param>
+ <param>
+ <key>value</key>
+
<value>digital.header_format_counter(digital.packet_utils.default_access_code,
3, Const_PLD.bits_per_symbol())</value>
+ </param>
+ </block>
+ <block>
<key>variable</key>
<param>
<key>comment</key>
@@ -1194,6 +1206,10 @@
<value>enc_hdr</value>
</param>
<param>
+ <key>hdr_format</key>
+
<value>digital.header_format_default(digital.packet_utils.default_access_code,
0)</value>
+ </param>
+ <param>
<key>hdr_const</key>
<value>Const_HDR</value>
</param>
@@ -1210,10 +1226,6 @@
<value>0</value>
</param>
<param>
- <key>formatter</key>
- <value>formatter</value>
- </param>
- <param>
<key>pld_enc</key>
<value>enc</value>
</param>
@@ -1237,6 +1249,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
@@ -1584,6 +1600,10 @@
<value>1.0</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>bw</key>
<value>1</value>
</param>
@@ -1875,6 +1895,10 @@
<value>False</value>
</param>
<param>
+ <key>axislabels</key>
+ <value>True</value>
+ </param>
+ <param>
<key>alias</key>
<value></value>
</param>
diff --git a/gr-digital/grc/digital_block_tree.xml
b/gr-digital/grc/digital_block_tree.xml
index 5703447..5e6e742 100644
--- a/gr-digital/grc/digital_block_tree.xml
+++ b/gr-digital/grc/digital_block_tree.xml
@@ -72,10 +72,10 @@
<block>digital_crc32_bb</block>
<block>digital_crc32_async_bb</block>
<block>digital_framer_sink_1</block>
- <block>variable_packet_formatter_default</block>
- <block>digital_packet_format_async</block>
- <block>digital_packet_format_bb</block>
- <block>digital_packet_parse_b</block>
+ <block>variable_header_format_default</block>
+ <block>digital_protocol_formatter_async</block>
+ <block>digital_protocol_formatter_bb</block>
+ <block>digital_protocol_parser_b</block>
<block>digital_header_payload_demux</block>
<block>digital_packet_headergenerator_bb</block>
<block>digital_packet_headergenerator_bb_default</block>
diff --git a/gr-digital/grc/digital_packet_format_async.xml
b/gr-digital/grc/digital_protocol_formatter_async.xml
similarity index 64%
rename from gr-digital/grc/digital_packet_format_async.xml
rename to gr-digital/grc/digital_protocol_formatter_async.xml
index 34c1918..52a67ec 100644
--- a/gr-digital/grc/digital_packet_format_async.xml
+++ b/gr-digital/grc/digital_protocol_formatter_async.xml
@@ -1,12 +1,14 @@
+<?xml version="1.0"?>
+
<block>
- <name>Packet Header Formatter (Async)</name>
- <key>digital_packet_format_async</key>
+ <name>Protocol Formatter (Async)</name>
+ <key>digital_protocol_formatter_async</key>
<import>from gnuradio import digital</import>
- <make>digital.packet_format_async($formatter)</make>
+ <make>digital.protocol_formatter_async($format)</make>
<param>
- <name>Formatter</name>
- <key>formatter</key>
+ <name>Format Obj.</name>
+ <key>format</key>
<type>raw</type>
</param>
diff --git a/gr-digital/grc/digital_packet_format_bb.xml
b/gr-digital/grc/digital_protocol_formatter_bb.xml
similarity index 63%
rename from gr-digital/grc/digital_packet_format_bb.xml
rename to gr-digital/grc/digital_protocol_formatter_bb.xml
index d94171a..b37a791 100644
--- a/gr-digital/grc/digital_packet_format_bb.xml
+++ b/gr-digital/grc/digital_protocol_formatter_bb.xml
@@ -1,12 +1,14 @@
+<?xml version="1.0"?>
+
<block>
- <name>Packet Header Formatter</name>
- <key>digital_packet_format_bb</key>
+ <name>Protocol Formatter</name>
+ <key>digital_protocol_formatter_bb</key>
<import>from gnuradio import digital</import>
- <make>digital.packet_format_bb($formatter, $len_tag_key)</make>
+ <make>digital.protocol_formatter_bb($format, $len_tag_key)</make>
<param>
- <name>Formatter</name>
- <key>formatter</key>
+ <name>Format Obj.</name>
+ <key>format</key>
<type>raw</type>
</param>
diff --git a/gr-digital/grc/digital_packet_parse_b.xml
b/gr-digital/grc/digital_protocol_parser_b.xml
similarity index 58%
rename from gr-digital/grc/digital_packet_parse_b.xml
rename to gr-digital/grc/digital_protocol_parser_b.xml
index 25f7b6a..27fb15e 100644
--- a/gr-digital/grc/digital_packet_parse_b.xml
+++ b/gr-digital/grc/digital_protocol_parser_b.xml
@@ -1,12 +1,14 @@
+<?xml version="1.0"?>
+
<block>
- <name>Packet Parser</name>
- <key>digital_packet_parse_b</key>
+ <name>Protocol Parser</name>
+ <key>digital_protocol_parser_b</key>
<import>from gnuradio import digital</import>
- <make>digital.packet_parse_b($formatter)</make>
+ <make>digital.protocol_parser_b($format)</make>
<param>
- <name>Formatter</name>
- <key>formatter</key>
+ <name>Format Obj.</name>
+ <key>format</key>
<type>raw</type>
</param>
diff --git a/gr-digital/grc/variable_packet_formatter_default.xml
b/gr-digital/grc/variable_header_format_default.xml
similarity index 56%
rename from gr-digital/grc/variable_packet_formatter_default.xml
rename to gr-digital/grc/variable_header_format_default.xml
index 106cff6..55b361f 100644
--- a/gr-digital/grc/variable_packet_formatter_default.xml
+++ b/gr-digital/grc/variable_header_format_default.xml
@@ -1,21 +1,21 @@
<?xml version="1.0"?>
<!--
###################################################
-# packet_formatter_default object
+# header_format_default object
###################################################
-->
<block>
- <name>Default Packet Header Definition</name>
- <key>variable_packet_formatter_default</key>
+ <name>Default Header Format Obj.</name>
+ <key>variable_header_format_default</key>
<import>from gnuradio import digital</import>
<var_make>
#if int($access_code())==0 #
-self.$(id) = $(id) =
digital.packet_formatter_default(digital.packet_utils.default_access_code,
$threshold)
+self.$(id) = $(id) =
digital.header_format_default(digital.packet_utils.default_access_code,
$threshold)
#else
-self.$(id) = $(id) = digital.packet_formatter_default($access_code, $threshold)
+self.$(id) = $(id) = digital.header_format_default($access_code, $threshold)
#end if
</var_make>
- <var_value>digital.packet_formatter_default($access_code,
$threshold)</var_value>
+ <var_value>digital.header_format_default($access_code,
$threshold)</var_value>
<make></make>
<param>
diff --git a/gr-digital/include/gnuradio/digital/CMakeLists.txt
b/gr-digital/include/gnuradio/digital/CMakeLists.txt
index 1aaa389..1b22265 100644
--- a/gr-digital/include/gnuradio/digital/CMakeLists.txt
+++ b/gr-digital/include/gnuradio/digital/CMakeLists.txt
@@ -91,14 +91,14 @@ install(FILES
ofdm_sampler.h
ofdm_serializer_vcc.h
ofdm_sync_sc_cfb.h
- packet_formatter_base.h
- packet_formatter_default.h
- packet_formatter_counter.h
- packet_formatter_crc.h
- packet_formatter_ofdm.h
- packet_format_async.h
- packet_format_bb.h
- packet_parse_b.h
+ header_format_base.h
+ header_format_default.h
+ header_format_counter.h
+ header_format_crc.h
+ header_format_ofdm.h
+ protocol_formatter_async.h
+ protocol_formatter_bb.h
+ protocol_parser_b.h
packet_header_default.h
packet_header_ofdm.h
packet_headergenerator_bb.h
diff --git a/gr-digital/include/gnuradio/digital/header_buffer.h
b/gr-digital/include/gnuradio/digital/header_buffer.h
index 2ed010f..b3f3e2c 100644
--- a/gr-digital/include/gnuradio/digital/header_buffer.h
+++ b/gr-digital/include/gnuradio/digital/header_buffer.h
@@ -1,5 +1,5 @@
/* -*- c++ -*- */
-/* Copyright 2015 Free Software Foundation, Inc.
+/* Copyright 2015-2016 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -34,14 +34,13 @@ namespace gr {
*
* \details
*
- * This class is used by the packet formatter blocks (e.g.,
- * digital::packet_formatter_default) to make it easier to deal
- * with payload headers. This class functions in two different
- * ways depending on if it is used in a transmitter or
- * receiver. When used in a transmitter, this class helps us build
- * headers out of the fields of the protocol. When used in a
- * receiver, this class helps us parse the received bits into the
- * protocol's fields.
+ * This class is used by the header format blocks (e.g.,
+ * digital::header_format_default) to make it easier to deal with
+ * payload headers. This class functions in two different ways
+ * depending on if it is used in a transmitter or receiver. When
+ * used in a transmitter, this class helps us build headers out of
+ * the fields of the protocol. When used in a receiver, this class
+ * helps us parse the received bits into the protocol's fields.
*
* This page describes how to work with the different modes,
* transmit or receive. The class is instructed as to which mode
@@ -56,9 +55,9 @@ namespace gr {
* transmit mode. We can then use the add_field[N] functions to
* add new fields to this header. The buffer MUST be large enough
* to hold the full header. As this class is meant to work mostly
- * with the digital::packet_formatter_default and child
+ * with the digital::header_format_default and child
* classes, the header length can be read from
- * digital::packet_formatter_default::header_nbytes().
+ * digital::header_format_default::header_nbytes().
*
* Each field is a specific length of 8, 16, 32, or 64 bits that
* are to be transmitted in network byte order (bit
@@ -73,7 +72,7 @@ namespace gr {
* which is sizeof(dtype), and the add_field[N] call defaults to
* len=N. Occasionally, we may need to use fewer bytes than
* actually represented by the data type. An example would be the
- * access code used in the packet_formatter_default, which is a
+ * access code used in the header_format_default, which is a
* uint64_t type but may have fewer bytes used in the actual
* access code.
*
@@ -162,8 +161,9 @@ namespace gr {
uint16_t opts = d_hdr_reg.extract_field16(20, 12);
\endverbatim
*
- * \sa packet_formatter_default
- * \sa packet_formatter_counter
+ * \sa header_format_default
+ * \sa header_format_counter
+ * \sa header_format_crc
*/
class DIGITAL_API header_buffer
{
diff --git a/gr-digital/include/gnuradio/digital/packet_formatter_base.h
b/gr-digital/include/gnuradio/digital/header_format_base.h
similarity index 91%
rename from gr-digital/include/gnuradio/digital/packet_formatter_base.h
rename to gr-digital/include/gnuradio/digital/header_format_base.h
index baf4f10..557a55c 100644
--- a/gr-digital/include/gnuradio/digital/packet_formatter_base.h
+++ b/gr-digital/include/gnuradio/digital/header_format_base.h
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef INCLUDED_DIGITAL_PACKET_FORMATTER_BASE_H
-#define INCLUDED_DIGITAL_PACKET_FORMATTER_BASE_H
+#ifndef INCLUDED_DIGITAL_HEADER_FORMAT_BASE_H
+#define INCLUDED_DIGITAL_HEADER_FORMAT_BASE_H
#include <pmt/pmt.h>
#include <gnuradio/digital/api.h>
@@ -43,22 +43,22 @@ namespace gr {
* that inherits from this and overload the necessary
* functions. The main functions to overload are:
*
- * \li packet_formatter_base::format: takes in a payload and
+ * \li header_format_base::format: takes in a payload and
* creates a header from it.
*
- * \li packet_formatter_base::parse: receive bits and extract
+ * \li header_format_base::parse: receive bits and extract
* the header info. These are expected to be hard bits (0 or 1)
* that have either been sliced or gone through an FEC decoder.
*
- * \li packet_formatter_base::header_nbits: the number of bits
+ * \li header_format_base::header_nbits: the number of bits
* in the full header (including an access code).
*
- * \li packet_formatter_base::header_ok: checks to see if the
+ * \li header_format_base::header_ok: checks to see if the
* received header is ok. Since the header often specifies the
* length of the frame to decode next, it is important that this
* information be correct.
*
- * \li packet_formatter_base::header_payload: unpacks the header
+ * \li header_format_base::header_payload: unpacks the header
* register (from the class header_buffer) as a set of bits into
* its component parts of the header. For example, this may find
* and extract the frame length field as a 16-bit value and/or
@@ -117,17 +117,17 @@ namespace gr {
* format, parse, and parsing state machine functions as
* necessary.
*
- * \sa packet_formatter_default
- * \sa packet_formatter_counter
+ * \sa header_format_default
+ * \sa header_format_counter
*/
- class DIGITAL_API packet_formatter_base
- : public
boost::enable_shared_from_this<gr::digital::packet_formatter_base>
+ class DIGITAL_API header_format_base
+ : public boost::enable_shared_from_this<gr::digital::header_format_base>
{
public:
- typedef boost::shared_ptr<packet_formatter_base> sptr;
+ typedef boost::shared_ptr<header_format_base> sptr;
- packet_formatter_base();
- virtual ~packet_formatter_base();
+ header_format_base();
+ virtual ~header_format_base();
sptr base() { return shared_from_this(); };
sptr formatter() { return shared_from_this(); };
@@ -222,4 +222,4 @@ namespace gr {
} // namespace digital
} // namespace gr
-#endif /* INCLUDED_DIGITAL_PACKET_FORMATTER_BASE_H */
+#endif /* INCLUDED_DIGITAL_HEADER_FORMAT_BASE_H */
diff --git a/gr-digital/include/gnuradio/digital/packet_formatter_counter.h
b/gr-digital/include/gnuradio/digital/header_format_counter.h
similarity index 87%
rename from gr-digital/include/gnuradio/digital/packet_formatter_counter.h
rename to gr-digital/include/gnuradio/digital/header_format_counter.h
index f9fe7df..5eb075a 100644
--- a/gr-digital/include/gnuradio/digital/packet_formatter_counter.h
+++ b/gr-digital/include/gnuradio/digital/header_format_counter.h
@@ -19,12 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef INCLUDED_DIGITAL_PACKET_FORMATTER_COUNTER_H
-#define INCLUDED_DIGITAL_PACKET_FORMATTER_COUNTER_H
+#ifndef INCLUDED_DIGITAL_HEADER_FORMAT_COUNTER_H
+#define INCLUDED_DIGITAL_HEADER_FORMAT_COUNTER_H
#include <pmt/pmt.h>
#include <gnuradio/digital/api.h>
-#include <gnuradio/digital/packet_formatter_default.h>
+#include <gnuradio/digital/header_format_default.h>
namespace gr {
namespace digital {
@@ -36,7 +36,7 @@ namespace gr {
*
* \details
*
- * Child class of packet_formatter_default. This version adds two
+ * Child class of header_format_default. This version adds two
* fields to the header:
*
* \li bps (16 bits): bits/symbol used when modulating the payload.
@@ -57,15 +57,15 @@ namespace gr {
*
* The access code and header are formatted for network byte order.
*
- * \sa packet_formatter_default
+ * \sa header_format_default
*/
- class DIGITAL_API packet_formatter_counter
- : public packet_formatter_default
+ class DIGITAL_API header_format_counter
+ : public header_format_default
{
public:
- packet_formatter_counter(const std::string &access_code,
- int threshold, int bps);
- virtual ~packet_formatter_counter();
+ header_format_counter(const std::string &access_code,
+ int threshold, int bps);
+ virtual ~header_format_counter();
/*!
* Creates a header from the access code and packet length to
@@ -132,4 +132,4 @@ namespace gr {
} // namespace digital
} // namespace gr
-#endif /* INCLUDED_DIGITAL_PACKET_FORMATTER_COUNTER_H */
+#endif /* INCLUDED_DIGITAL_HEADER_FORMAT_COUNTER_H */
diff --git a/gr-digital/include/gnuradio/digital/packet_formatter_crc.h
b/gr-digital/include/gnuradio/digital/header_format_crc.h
similarity index 87%
rename from gr-digital/include/gnuradio/digital/packet_formatter_crc.h
rename to gr-digital/include/gnuradio/digital/header_format_crc.h
index 50808d0..edb1884 100644
--- a/gr-digital/include/gnuradio/digital/packet_formatter_crc.h
+++ b/gr-digital/include/gnuradio/digital/header_format_crc.h
@@ -19,12 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef INCLUDED_DIGITAL_PACKET_FORMATTER_CRC_H
-#define INCLUDED_DIGITAL_PACKET_FORMATTER_CRC_H
+#ifndef INCLUDED_DIGITAL_HEADER_FORMAT_CRC_H
+#define INCLUDED_DIGITAL_HEADER_FORMAT_CRC_H
#include <pmt/pmt.h>
#include <gnuradio/digital/api.h>
-#include <gnuradio/digital/packet_formatter_default.h>
+#include <gnuradio/digital/header_format_default.h>
#include <boost/crc.hpp>
namespace gr {
@@ -37,7 +37,7 @@ namespace gr {
*
* \details
*
- * Child class of packet_formatter_base. This version's header
+ * Child class of header_format_base. This version's header
* format looks like:
*
* \li length (12 bits): length of the payload
@@ -53,15 +53,15 @@ namespace gr {
\endverbatim
*
* Reimplements packet_header_default in the style of the
- * packet_formatter_base.
+ * header_format_base.
*/
- class DIGITAL_API packet_formatter_crc
- : public packet_formatter_base
+ class DIGITAL_API header_format_crc
+ : public header_format_base
{
public:
- packet_formatter_crc(const std::string &len_key_name="packet_len",
+ header_format_crc(const std::string &len_key_name="packet_len",
const std::string &num_key_name="packet_num");
- virtual ~packet_formatter_crc();
+ virtual ~header_format_crc();
void set_header_num(unsigned header_num) { d_header_number = header_num;
};
@@ -115,4 +115,4 @@ namespace gr {
} // namespace digital
} // namespace gr
-#endif /* INCLUDED_DIGITAL_PACKET_FORMATTER_CRC_H */
+#endif /* INCLUDED_DIGITAL_HEADER_FORMAT_CRC_H */
diff --git a/gr-digital/include/gnuradio/digital/packet_formatter_default.h
b/gr-digital/include/gnuradio/digital/header_format_default.h
similarity index 92%
rename from gr-digital/include/gnuradio/digital/packet_formatter_default.h
rename to gr-digital/include/gnuradio/digital/header_format_default.h
index ddfad04..4abd7bb 100644
--- a/gr-digital/include/gnuradio/digital/packet_formatter_default.h
+++ b/gr-digital/include/gnuradio/digital/header_format_default.h
@@ -19,12 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef INCLUDED_DIGITAL_PACKET_FORMATTER_DEFAULT_H
-#define INCLUDED_DIGITAL_PACKET_FORMATTER_DEFAULT_H
+#ifndef INCLUDED_DIGITAL_HEADER_FORMAT_DEFAULT_H
+#define INCLUDED_DIGITAL_HEADER_FORMAT_DEFAULT_H
#include <pmt/pmt.h>
#include <gnuradio/digital/api.h>
-#include <gnuradio/digital/packet_formatter_base.h>
+#include <gnuradio/digital/header_format_base.h>
#include <gnuradio/digital/header_buffer.h>
#include <gnuradio/logger.h>
#include <boost/enable_shared_from_this.hpp>
@@ -39,7 +39,7 @@ namespace gr {
* \details
* Used to handle the default packet header.
*
- * See the parent class packet_formatter_base for details of how
+ * See the parent class header_format_base for details of how
* these classes operate.
*
* The default header created in this base class consists of an
@@ -72,18 +72,18 @@ namespace gr {
* payload. The payload decoder will have to know how this relates
* to the number of bits received. This block knows nothing about
* the payload modulation or the number of bits/symbol. Use the
- * gr::digital::packet_formatter_counter for that purpose.
+ * gr::digital::header_format_counter for that purpose.
*
- * \sa packet_formatter_counter
- * \sa packet_formatter_1
- * \sa packet_formatter_ofdm
+ * \sa header_format_counter
+ * \sa header_format_crc
+ * \sa header_format_ofdm
*/
- class DIGITAL_API packet_formatter_default
- : public packet_formatter_base
+ class DIGITAL_API header_format_default
+ : public header_format_base
{
public:
- packet_formatter_default(const std::string &access_code, int threshold);
- virtual ~packet_formatter_default();
+ header_format_default(const std::string &access_code, int threshold);
+ virtual ~header_format_default();
/*!
* Creates a header from the access code and packet length and
@@ -214,4 +214,4 @@ namespace gr {
} // namespace digital
} // namespace gr
-#endif /* INCLUDED_DIGITAL_PACKET_FORMATTER_DEFAULT_H */
+#endif /* INCLUDED_DIGITAL_HEADER_FORMAT_DEFAULT_H */
diff --git a/gr-digital/include/gnuradio/digital/packet_formatter_ofdm.h
b/gr-digital/include/gnuradio/digital/header_format_ofdm.h
similarity index 89%
rename from gr-digital/include/gnuradio/digital/packet_formatter_ofdm.h
rename to gr-digital/include/gnuradio/digital/header_format_ofdm.h
index b8117f2..b426c74 100644
--- a/gr-digital/include/gnuradio/digital/packet_formatter_ofdm.h
+++ b/gr-digital/include/gnuradio/digital/header_format_ofdm.h
@@ -19,12 +19,12 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef INCLUDED_DIGITAL_PACKET_FORMATTER_OFDM_H
-#define INCLUDED_DIGITAL_PACKET_FORMATTER_OFDM_H
+#ifndef INCLUDED_DIGITAL_HEADER_FORMAT_OFDM_H
+#define INCLUDED_DIGITAL_HEADER_FORMAT_OFDM_H
#include <pmt/pmt.h>
#include <gnuradio/digital/api.h>
-#include <gnuradio/digital/packet_formatter_crc.h>
+#include <gnuradio/digital/header_format_crc.h>
#include <boost/crc.hpp>
namespace gr {
@@ -37,7 +37,7 @@ namespace gr {
*
* \details
*
- * Child class of packet_formatter_base. This version's header
+ * Child class of header_format_base. This version's header
* format looks like:
*
* \li length (12 bits): length of the payload
@@ -53,13 +53,13 @@ namespace gr {
\endverbatim
*
* Reimplements packet_header_default in the style of the
- * packet_formatter_base.
+ * header_format_base.
*/
- class DIGITAL_API packet_formatter_ofdm
- : public packet_formatter_crc
+ class DIGITAL_API header_format_ofdm
+ : public header_format_crc
{
public:
- packet_formatter_ofdm(const std::vector<std::vector<int> >
&occupied_carriers,
+ header_format_ofdm(const std::vector<std::vector<int> >
&occupied_carriers,
int n_syms,
const std::string &len_key_name="packet_len",
const std::string &frame_key_name="frame_len",
@@ -67,7 +67,7 @@ namespace gr {
int bits_per_header_sym=1,
int bits_per_payload_sym=1,
bool scramble_header=false);
- virtual ~packet_formatter_ofdm();
+ virtual ~header_format_ofdm();
/*!
* \brief Encodes the header information in the given tags into
@@ -124,4 +124,4 @@ namespace gr {
} // namespace digital
} // namespace gr
-#endif /* INCLUDED_DIGITAL_PACKET_FORMATTER_OFDM_H */
+#endif /* INCLUDED_DIGITAL_HEADER_FORMAT_OFDM_H */
diff --git a/gr-digital/include/gnuradio/digital/packet_format_async.h
b/gr-digital/include/gnuradio/digital/protocol_formatter_async.h
similarity index 61%
rename from gr-digital/include/gnuradio/digital/packet_format_async.h
rename to gr-digital/include/gnuradio/digital/protocol_formatter_async.h
index c846c8c..560a236 100644
--- a/gr-digital/include/gnuradio/digital/packet_format_async.h
+++ b/gr-digital/include/gnuradio/digital/protocol_formatter_async.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015-2016 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -21,22 +21,23 @@
*/
-#ifndef INCLUDED_DIGITAL_PACKET_FORMAT_ASYNC_H
-#define INCLUDED_DIGITAL_PACKET_FORMAT_ASYNC_H
+#ifndef INCLUDED_DIGITAL_PROTOCOL_FORMATTER_ASYNC_H
+#define INCLUDED_DIGITAL_PROTOCOL_FORMATTER_ASYNC_H
#include <gnuradio/digital/api.h>
-#include <gnuradio/digital/packet_formatter_base.h>
+#include <gnuradio/digital/header_format_base.h>
#include <gnuradio/block.h>
namespace gr {
namespace digital {
/*!
- * \brief Uses a header formatter to append a header onto a PDU.
+ * \brief Uses a header format object to append a header onto a
+ * PDU.
+ *
* \ingroup packet_operators_blk
*
* \details
-
* This block takes in PDUs and creates a header, generally for
* MAC-level processing. Each received PDU is assumed to be its
* own frame, so any fragmentation would be done upstream in or
@@ -44,21 +45,21 @@ namespace gr {
*
* The header that is created and transmitted out of the 'header'
* message port as a PDU. The header is based entirely on the \p
- * formatter, which is an object derived from the
- * packet_formatter_base class. All of these packet header
- * formatters operate the same: they take in the payload data as
- * well as possible extra metadata info about the PDU; the
- * formatter then returns the output PDU as a PMT argument along
+ * format object, which is an object derived from the
+ * header_format_base class. All of these packet header format
+ * objects operate the same: they take in the payload data as well
+ * as possible extra metadata info about the PDU; the format
+ * object then returns the output PDU as a PMT argument along
* with any changes to the metadata info PMT.
*
* For different packet header formatting needs, we can define new
- * classes that inherit from the packet_formatter_base block
- * and which overload the packet_formatter_base::format
+ * classes that inherit from the header_format_base block
+ * and which overload the header_format_base::format
* function.
*
- * \sa packet_formatter_base
- * \sa packet_formatter_default
- * \sa packet_formatter_counter
+ * \sa header_format_base
+ * \sa header_format_default
+ * \sa header_format_counter
*
* This block only uses asynchronous message passing interfaces to
* receiver and emit PDUs. The message ports are:
@@ -67,21 +68,21 @@ namespace gr {
* \li header: the header formatted for the given frame
* \li payload: the payload
*/
- class DIGITAL_API packet_format_async : virtual public block
+ class DIGITAL_API protocol_formatter_async : virtual public block
{
public:
- typedef boost::shared_ptr<packet_format_async> sptr;
+ typedef boost::shared_ptr<protocol_formatter_async> sptr;
/*!
- * Make a packet header block using a given \p formatter.
+ * Make a packet header block using a given \p format.
*
- * \param formatter The formatter class to use when creating the
+ * \param format The format object to use when creating the
* header for the packet.
*/
- static sptr make(const packet_formatter_base::sptr &formatter);
+ static sptr make(const header_format_base::sptr &format);
};
} // namespace digital
} // namespace gr
-#endif /* INCLUDED_DIGITAL_PACKET_FORMAT_ASYNC_H */
+#endif /* INCLUDED_DIGITAL_PROTOCOL_FORMATTER_ASYNC_H */
diff --git a/gr-digital/include/gnuradio/digital/packet_format_bb.h
b/gr-digital/include/gnuradio/digital/protocol_formatter_bb.h
similarity index 62%
rename from gr-digital/include/gnuradio/digital/packet_format_bb.h
rename to gr-digital/include/gnuradio/digital/protocol_formatter_bb.h
index 60bda36..2a57fdc 100644
--- a/gr-digital/include/gnuradio/digital/packet_format_bb.h
+++ b/gr-digital/include/gnuradio/digital/protocol_formatter_bb.h
@@ -21,23 +21,23 @@
*/
-#ifndef INCLUDED_DIGITAL_PACKET_FORMAT_BB_H
-#define INCLUDED_DIGITAL_PACKET_FORMAT_BB_H
+#ifndef INCLUDED_DIGITAL_PROTOCOL_FORMATTER_BB_H
+#define INCLUDED_DIGITAL_PROTOCOL_FORMATTER_BB_H
#include <gnuradio/digital/api.h>
-#include <gnuradio/digital/packet_formatter_base.h>
+#include <gnuradio/digital/header_format_base.h>
#include <gnuradio/tagged_stream_block.h>
namespace gr {
namespace digital {
/*!
- * \brief Uses a header formatter to create a header from a tagged
- * stream packet.
+ * \brief Uses a header format object to create a header from a
+ * tagged stream packet.
+ *
* \ingroup packet_operators_blk
*
* \details
-
* This block takes in tagged stream and creates a header,
* generally for MAC-level processing. Each received tagged stream
* is assumed to be its own frame, so any fragmentation would be
@@ -46,36 +46,36 @@ namespace gr {
* The header that is created and transmitted from this block. The
* payload should then be sent as a parallel tagged stream to be
* muxed together later. The header is based entirely on the \p
- * formatter object, which is an object derived from the
- * packet_formatter_base class. All of these packet header
- * formatters operate the same: they take in the payload data as
- * well as possible extra metadata info about the PDU; the
- * formatter then returns the output and metadata info. This block
+ * format object, which is an object derived from the
+ * header_format_base class. All of these packet header format
+ * objects operate the same: they take in the payload data as well
+ * as possible extra metadata info about the PDU; the format
+ * object then returns the output and metadata info. This block
* then transmits the header vector and attaches and metadata as
* tags at the start of the header.
*
- * \sa packet_format_async
+ * \sa protocol_formatter_async
*/
- class DIGITAL_API packet_format_bb : virtual public tagged_stream_block
+ class DIGITAL_API protocol_formatter_bb : virtual public
tagged_stream_block
{
public:
- typedef boost::shared_ptr<packet_format_bb> sptr;
+ typedef boost::shared_ptr<protocol_formatter_bb> sptr;
/*!
- * Make a packet header block using a given \p formatter.
+ * Make a packet header block using a given \p format.
*
- * \param formatter The formatter class to use when creating the
+ * \param format The format object to use when creating the
* header for the packet. Derived from the
- * packet_formatter_base class.
+ * header_format_base class.
* \param len_tag_key The tagged stream length key.
*/
- static sptr make(const packet_formatter_base::sptr &formatter,
+ static sptr make(const header_format_base::sptr &format,
const std::string &len_tag_key="packet_len");
- virtual void set_header_formatter(packet_formatter_base::sptr
&formatter) = 0;
+ virtual void set_header_format(header_format_base::sptr &format) = 0;
};
} // namespace digital
} // namespace gr
-#endif /* INCLUDED_DIGITAL_PACKET_FORMAT_BB_H */
+#endif /* INCLUDED_DIGITAL_PROTOCOL_FORMATTER_BB_H */
diff --git a/gr-digital/include/gnuradio/digital/packet_parse_b.h
b/gr-digital/include/gnuradio/digital/protocol_parser_b.h
similarity index 64%
rename from gr-digital/include/gnuradio/digital/packet_parse_b.h
rename to gr-digital/include/gnuradio/digital/protocol_parser_b.h
index fe7681b..89c7f7e 100644
--- a/gr-digital/include/gnuradio/digital/packet_parse_b.h
+++ b/gr-digital/include/gnuradio/digital/protocol_parser_b.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2015,2016 Free Software Foundation, Inc.
+ * Copyright 2015-2016 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -25,7 +25,7 @@
#define INCLUDED_DIGITAL_PACKET_PARSE_B_H
#include <gnuradio/digital/api.h>
-#include <gnuradio/digital/packet_formatter_base.h>
+#include <gnuradio/digital/header_format_base.h>
#include <gnuradio/sync_block.h>
namespace gr {
@@ -33,8 +33,8 @@ namespace gr {
/*!
* \brief Block that synchronizes to a header based on a header
- * formatter class. Designed to accept hard bits and produce PDUs
- * with packed bytes (pmt::u8vector).
+ * format object class. Designed to accept hard bits and produce
+ * PDUs with packed bytes (pmt::u8vector).
*
* \ingroup packet_operators_blk
*
@@ -44,15 +44,15 @@ namespace gr {
* (unpacked bytes; 1's and 0's as the LSB) and finds the access
* code as a sync word to find the start of a frame.
*
- * The block uses a formatter derived from a
- * packet_formatter_base formatter class.
+ * The block uses a format object derived from a
+ * header_format_base class.
*
* Once the frame is detected (usually through the use of an
- * access code), the block uses the formatter's parser to decode
- * the remaining header. Generally, as in the default header case,
- * the header will contain the length of the frame's payload. That
- * and anything else in the header will generally go into the
- * PDU's meta-data dictionary.
+ * access code), the block uses the format object's parser
+ * function to decode the remaining header. Generally, as in the
+ * default header case, the header will contain the length of the
+ * frame's payload. That and anything else in the header will
+ * generally go into the PDU's meta-data dictionary.
*
* The block will output a PDU that contains frame's header info
* in the meta-data portion of the PDU and the payload itself. The
@@ -60,21 +60,21 @@ namespace gr {
*
* \sa packet_sync_ff for a soft decision version.
*/
- class DIGITAL_API packet_parse_b : virtual public sync_block
+ class DIGITAL_API protocol_parser_b : virtual public sync_block
{
public:
- typedef boost::shared_ptr<packet_parse_b> sptr;
+ typedef boost::shared_ptr<protocol_parser_b> sptr;
/*!
- * Make a packet header block using a given \p formatter.
+ * Make a packet header block using a given \p format.
*
- * \param formatter The formatter class to use when reading the
+ * \param format The format object to use when reading the
* header.
*/
- static sptr make(const packet_formatter_base::sptr &formatter);
+ static sptr make(const header_format_base::sptr &format);
};
} // namespace digital
} // namespace gr
-#endif /* INCLUDED_DIGITAL_PACKET_PARSE_B_H */
+#endif /* INCLUDED_DIGITAL_PROTOCOL_PARSER_B_H */
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index 4aa387b..7e9ebed 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -107,14 +107,14 @@ list(APPEND digital_sources
ofdm_sampler_impl.cc
ofdm_serializer_vcc_impl.cc
ofdm_sync_sc_cfb_impl.cc
- packet_formatter_base.cc
- packet_formatter_default.cc
- packet_formatter_counter.cc
- packet_formatter_crc.cc
- packet_formatter_ofdm.cc
- packet_format_async_impl.cc
- packet_format_bb_impl.cc
- packet_parse_b_impl.cc
+ header_format_base.cc
+ header_format_default.cc
+ header_format_counter.cc
+ header_format_crc.cc
+ header_format_ofdm.cc
+ protocol_formatter_async_impl.cc
+ protocol_formatter_bb_impl.cc
+ protocol_parser_b_impl.cc
packet_header_default.cc
packet_header_ofdm.cc
packet_headergenerator_bb_impl.cc
@@ -214,7 +214,7 @@ if(ENABLE_TESTING)
list(APPEND test_gr_digital_sources
${CMAKE_CURRENT_SOURCE_DIR}/test_gr_digital.cc
${CMAKE_CURRENT_SOURCE_DIR}/qa_digital.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/qa_packet_formatters.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/qa_header_format.cc
)
add_executable(test-gr-digital ${test_gr_digital_sources})
diff --git a/gr-digital/lib/packet_formatter_base.cc
b/gr-digital/lib/header_format_base.cc
similarity index 80%
rename from gr-digital/lib/packet_formatter_base.cc
rename to gr-digital/lib/header_format_base.cc
index e7666c0..a8d8c86 100644
--- a/gr-digital/lib/packet_formatter_base.cc
+++ b/gr-digital/lib/header_format_base.cc
@@ -26,42 +26,42 @@
#include <iostream>
#include <string.h>
#include <volk/volk.h>
-#include <gnuradio/digital/packet_formatter_base.h>
+#include <gnuradio/digital/header_format_base.h>
#include <gnuradio/math.h>
namespace gr {
namespace digital {
- packet_formatter_base::packet_formatter_base()
+ header_format_base::header_format_base()
{
enter_search();
configure_default_loggers(d_logger, d_debug_logger, "packet formatter");
}
- packet_formatter_base::~packet_formatter_base()
+ header_format_base::~header_format_base()
{
}
size_t
- packet_formatter_base::header_nbytes() const
+ header_format_base::header_nbytes() const
{
return header_nbits() / 8;
}
inline void
- packet_formatter_base::enter_search()
+ header_format_base::enter_search()
{
d_state = STATE_SYNC_SEARCH;
}
inline void
- packet_formatter_base::enter_have_sync()
+ header_format_base::enter_have_sync()
{
d_state = STATE_HAVE_SYNC;
}
inline void
- packet_formatter_base::enter_have_header(int payload_len)
+ header_format_base::enter_have_header(int payload_len)
{
d_state = STATE_SYNC_SEARCH;
}
diff --git a/gr-digital/lib/packet_formatter_counter.cc
b/gr-digital/lib/header_format_counter.cc
similarity index 72%
rename from gr-digital/lib/packet_formatter_counter.cc
rename to gr-digital/lib/header_format_counter.cc
index e132b34..6244ec1 100644
--- a/gr-digital/lib/packet_formatter_counter.cc
+++ b/gr-digital/lib/header_format_counter.cc
@@ -1,5 +1,5 @@
/* -*- c++ -*- */
-/* Copyright 2014 Free Software Foundation, Inc.
+/* Copyright 2016 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -27,38 +27,38 @@
#include <iomanip>
#include <string.h>
#include <volk/volk.h>
-#include <gnuradio/digital/packet_formatter_counter.h>
+#include <gnuradio/digital/header_format_counter.h>
#include <gnuradio/digital/header_buffer.h>
#include <gnuradio/math.h>
namespace gr {
namespace digital {
- packet_formatter_counter::sptr
- packet_formatter_counter::make(const std::string &access_code,
- int threshold, int bps)
+ header_format_counter::sptr
+ header_format_counter::make(const std::string &access_code,
+ int threshold, int bps)
{
- return packet_formatter_counter::sptr
- (new packet_formatter_counter(access_code, threshold, bps));
+ return header_format_counter::sptr
+ (new header_format_counter(access_code, threshold, bps));
}
- packet_formatter_counter::packet_formatter_counter(const std::string
&access_code,
- int threshold, int bps)
- : packet_formatter_default(access_code, threshold)
+ header_format_counter::header_format_counter(const std::string
&access_code,
+ int threshold, int bps)
+ : header_format_default(access_code, threshold)
{
d_bps = bps;
d_counter = 0;
}
- packet_formatter_counter::~packet_formatter_counter()
+ header_format_counter::~header_format_counter()
{
}
bool
- packet_formatter_counter::format(int nbytes_in,
- const unsigned char *input,
- pmt::pmt_t &output,
- pmt::pmt_t &info)
+ header_format_counter::format(int nbytes_in,
+ const unsigned char *input,
+ pmt::pmt_t &output,
+ pmt::pmt_t &info)
{
uint8_t* bytes_out = (uint8_t*)volk_malloc(header_nbytes(),
@@ -83,13 +83,13 @@ namespace gr {
}
size_t
- packet_formatter_counter::header_nbits() const
+ header_format_counter::header_nbits() const
{
return d_access_code_len + 8*4*sizeof(uint16_t);
}
bool
- packet_formatter_counter::header_ok()
+ header_format_counter::header_ok()
{
// confirm that two copies of header info are identical
uint16_t len0 = d_hdr_reg.extract_field16(0);
@@ -98,7 +98,7 @@ namespace gr {
}
int
- packet_formatter_counter::header_payload()
+ header_format_counter::header_payload()
{
uint16_t len = d_hdr_reg.extract_field16(0);
uint16_t bps = d_hdr_reg.extract_field16(32);
diff --git a/gr-digital/lib/packet_formatter_crc.cc
b/gr-digital/lib/header_format_crc.cc
similarity index 77%
rename from gr-digital/lib/packet_formatter_crc.cc
rename to gr-digital/lib/header_format_crc.cc
index 799f465..73d95df 100644
--- a/gr-digital/lib/packet_formatter_crc.cc
+++ b/gr-digital/lib/header_format_crc.cc
@@ -25,38 +25,38 @@
#include <string.h>
#include <volk/volk.h>
-#include <gnuradio/digital/packet_formatter_crc.h>
+#include <gnuradio/digital/header_format_crc.h>
#include <gnuradio/digital/header_buffer.h>
namespace gr {
namespace digital {
- packet_formatter_crc::sptr
- packet_formatter_crc::make(const std::string &len_key_name,
- const std::string &num_key_name)
+ header_format_crc::sptr
+ header_format_crc::make(const std::string &len_key_name,
+ const std::string &num_key_name)
{
- return packet_formatter_crc::sptr
- (new packet_formatter_crc(len_key_name, num_key_name));
+ return header_format_crc::sptr
+ (new header_format_crc(len_key_name, num_key_name));
}
- packet_formatter_crc::packet_formatter_crc(const std::string &len_key_name,
- const std::string &num_key_name)
- : packet_formatter_base(),
+ header_format_crc::header_format_crc(const std::string &len_key_name,
+ const std::string &num_key_name)
+ : header_format_base(),
d_header_number(0)
{
d_len_key_name = pmt::intern(len_key_name);
d_num_key_name = pmt::intern(num_key_name);
}
- packet_formatter_crc::~packet_formatter_crc()
+ header_format_crc::~header_format_crc()
{
}
bool
- packet_formatter_crc::format(int nbytes_in,
- const unsigned char *input,
- pmt::pmt_t &output,
- pmt::pmt_t &info)
+ header_format_crc::format(int nbytes_in,
+ const unsigned char *input,
+ pmt::pmt_t &output,
+ pmt::pmt_t &info)
{
uint8_t* bytes_out = (uint8_t*)volk_malloc(header_nbytes(),
volk_get_alignment());
@@ -92,10 +92,10 @@ namespace gr {
}
bool
- packet_formatter_crc::parse(int nbits_in,
- const unsigned char *input,
- std::vector<pmt::pmt_t> &info,
- int &nbits_processed)
+ header_format_crc::parse(int nbits_in,
+ const unsigned char *input,
+ std::vector<pmt::pmt_t> &info,
+ int &nbits_processed)
{
while(nbits_processed <= nbits_in) {
d_hdr_reg.insert_bit(input[nbits_processed++]);
@@ -119,14 +119,14 @@ namespace gr {
}
size_t
- packet_formatter_crc::header_nbits() const
+ header_format_crc::header_nbits() const
{
return 32;
}
bool
- packet_formatter_crc::header_ok()
+ header_format_crc::header_ok()
{
uint32_t pkt = d_hdr_reg.extract_field32(0, 24, true);
uint16_t pktlen = static_cast<uint16_t>((pkt >> 8) & 0x0fff);
@@ -143,7 +143,7 @@ namespace gr {
}
int
- packet_formatter_crc::header_payload()
+ header_format_crc::header_payload()
{
uint32_t pkt = d_hdr_reg.extract_field32(0, 24, true);
uint16_t pktlen = static_cast<uint16_t>((pkt >> 8) & 0x0fff);
diff --git a/gr-digital/lib/packet_formatter_default.cc
b/gr-digital/lib/header_format_default.cc
similarity index 74%
rename from gr-digital/lib/packet_formatter_default.cc
rename to gr-digital/lib/header_format_default.cc
index 64ccd06..2ddc729 100644
--- a/gr-digital/lib/packet_formatter_default.cc
+++ b/gr-digital/lib/header_format_default.cc
@@ -26,39 +26,39 @@
#include <iostream>
#include <string.h>
#include <volk/volk.h>
-#include <gnuradio/digital/packet_formatter_default.h>
+#include <gnuradio/digital/header_format_default.h>
#include <gnuradio/math.h>
namespace gr {
namespace digital {
- packet_formatter_default::sptr
- packet_formatter_default::make(const std::string &access_code,
- int threshold)
+ header_format_default::sptr
+ header_format_default::make(const std::string &access_code,
+ int threshold)
{
- return packet_formatter_default::sptr
- (new packet_formatter_default(access_code, threshold));
+ return header_format_default::sptr
+ (new header_format_default(access_code, threshold));
}
- packet_formatter_default::packet_formatter_default(const std::string
&access_code,
- int threshold)
- : packet_formatter_base(),
+ header_format_default::header_format_default(const std::string
&access_code,
+ int threshold)
+ : header_format_base(),
d_data_reg(0), d_mask(0), d_threshold(0),
d_pkt_len(0), d_pkt_count(0), d_nbits(0)
{
if(!set_access_code(access_code)) {
- throw std::runtime_error("packet_formatter_default: Setting access
code failed");
+ throw std::runtime_error("header_format_default: Setting access code
failed");
}
set_threshold(threshold);
}
- packet_formatter_default::~packet_formatter_default()
+ header_format_default::~header_format_default()
{
}
bool
- packet_formatter_default::set_access_code(const std::string &access_code)
+ header_format_default::set_access_code(const std::string &access_code)
{
d_access_code_len = access_code.length(); // # of bits in the
access code
@@ -78,32 +78,32 @@ namespace gr {
}
unsigned long long
- packet_formatter_default::access_code() const
+ header_format_default::access_code() const
{
return d_access_code;
}
void
- packet_formatter_default::set_threshold(unsigned int thresh)
+ header_format_default::set_threshold(unsigned int thresh)
{
if(d_threshold > d_access_code_len) {
- throw std::runtime_error("packet_formatter_default: Cannot set
threshold " \
+ throw std::runtime_error("header_format_default: Cannot set threshold
" \
"larger than the access code length.");
}
d_threshold = thresh;
}
unsigned int
- packet_formatter_default::threshold() const
+ header_format_default::threshold() const
{
return d_threshold;
}
bool
- packet_formatter_default::format(int nbytes_in,
- const unsigned char *input,
- pmt::pmt_t &output,
- pmt::pmt_t &info)
+ header_format_default::format(int nbytes_in,
+ const unsigned char *input,
+ pmt::pmt_t &output,
+ pmt::pmt_t &info)
{
uint8_t* bytes_out = (uint8_t*)volk_malloc(header_nbytes(),
volk_get_alignment());
@@ -123,10 +123,10 @@ namespace gr {
}
bool
- packet_formatter_default::parse(int nbits_in,
- const unsigned char *input,
- std::vector<pmt::pmt_t> &info,
- int &nbits_processed)
+ header_format_default::parse(int nbits_in,
+ const unsigned char *input,
+ std::vector<pmt::pmt_t> &info,
+ int &nbits_processed)
{
nbits_processed = 0;
@@ -178,20 +178,20 @@ namespace gr {
}
size_t
- packet_formatter_default::header_nbits() const
+ header_format_default::header_nbits() const
{
return d_access_code_len + 8*2*sizeof(uint16_t);
}
inline void
- packet_formatter_default::enter_have_sync()
+ header_format_default::enter_have_sync()
{
d_state = STATE_HAVE_SYNC;
d_hdr_reg.clear_input();
}
inline void
- packet_formatter_default::enter_have_header(int payload_len)
+ header_format_default::enter_have_header(int payload_len)
{
d_state = STATE_SYNC_SEARCH;
d_pkt_len = payload_len;
@@ -199,7 +199,7 @@ namespace gr {
}
bool
- packet_formatter_default::header_ok()
+ header_format_default::header_ok()
{
// confirm that two copies of header info are identical
uint16_t len0 = d_hdr_reg.extract_field16(0, 16);
@@ -208,7 +208,7 @@ namespace gr {
}
int
- packet_formatter_default::header_payload()
+ header_format_default::header_payload()
{
uint16_t len = d_hdr_reg.extract_field16(0, 16);
diff --git a/gr-digital/lib/packet_formatter_ofdm.cc
b/gr-digital/lib/header_format_ofdm.cc
similarity index 65%
rename from gr-digital/lib/packet_formatter_ofdm.cc
rename to gr-digital/lib/header_format_ofdm.cc
index e4d52a4..adc217d 100644
--- a/gr-digital/lib/packet_formatter_ofdm.cc
+++ b/gr-digital/lib/header_format_ofdm.cc
@@ -25,40 +25,40 @@
#include <string.h>
#include <volk/volk.h>
-#include <gnuradio/digital/packet_formatter_ofdm.h>
+#include <gnuradio/digital/header_format_ofdm.h>
#include <gnuradio/digital/header_buffer.h>
#include <gnuradio/digital/lfsr.h>
namespace gr {
namespace digital {
- packet_formatter_ofdm::sptr
- packet_formatter_ofdm::make(const std::vector<std::vector<int> >
&occupied_carriers,
- int n_syms,
- const std::string &len_key_name,
- const std::string &frame_key_name,
- const std::string &num_key_name,
- int bits_per_header_sym,
- int bits_per_payload_sym,
- bool scramble_header)
+ header_format_ofdm::sptr
+ header_format_ofdm::make(const std::vector<std::vector<int> >
&occupied_carriers,
+ int n_syms,
+ const std::string &len_key_name,
+ const std::string &frame_key_name,
+ const std::string &num_key_name,
+ int bits_per_header_sym,
+ int bits_per_payload_sym,
+ bool scramble_header)
{
- return packet_formatter_ofdm::sptr
- (new packet_formatter_ofdm(occupied_carriers, n_syms,
- len_key_name, frame_key_name, num_key_name,
- bits_per_header_sym,
- bits_per_payload_sym,
- scramble_header));
+ return header_format_ofdm::sptr
+ (new header_format_ofdm(occupied_carriers, n_syms,
+ len_key_name, frame_key_name, num_key_name,
+ bits_per_header_sym,
+ bits_per_payload_sym,
+ scramble_header));
}
- packet_formatter_ofdm::packet_formatter_ofdm(const
std::vector<std::vector<int> > &occupied_carriers,
- int n_syms,
- const std::string
&len_key_name,
- const std::string
&frame_key_name,
- const std::string
&num_key_name,
- int bits_per_header_sym,
- int bits_per_payload_sym,
- bool scramble_header)
- : packet_formatter_crc(len_key_name, num_key_name),
+ header_format_ofdm::header_format_ofdm(const std::vector<std::vector<int>
> &occupied_carriers,
+ int n_syms,
+ const std::string &len_key_name,
+ const std::string &frame_key_name,
+ const std::string &num_key_name,
+ int bits_per_header_sym,
+ int bits_per_payload_sym,
+ bool scramble_header)
+ : header_format_crc(len_key_name, num_key_name),
d_frame_key_name(pmt::intern(frame_key_name)),
d_occupied_carriers(occupied_carriers),
d_bits_per_payload_sym(bits_per_payload_sym)
@@ -86,18 +86,18 @@ namespace gr {
}
}
- packet_formatter_ofdm::~packet_formatter_ofdm()
+ header_format_ofdm::~header_format_ofdm()
{
}
bool
- packet_formatter_ofdm::format(int nbytes_in,
- const unsigned char *input,
- pmt::pmt_t &output,
- pmt::pmt_t &info)
+ header_format_ofdm::format(int nbytes_in,
+ const unsigned char *input,
+ pmt::pmt_t &output,
+ pmt::pmt_t &info)
{
- bool ret_val = packet_formatter_crc::format(nbytes_in, input,
- output, info);
+ bool ret_val = header_format_crc::format(nbytes_in, input,
+ output, info);
//size_t len;
//uint8_t *out = pmt::u8vector_writable_elements(output, len);
@@ -109,7 +109,7 @@ namespace gr {
}
bool
- packet_formatter_ofdm::parse(int nbits_in,
+ header_format_ofdm::parse(int nbits_in,
const unsigned char *input,
std::vector<pmt::pmt_t> &info,
int &nbits_processed)
@@ -137,13 +137,13 @@ namespace gr {
}
size_t
- packet_formatter_ofdm::header_nbits() const
+ header_format_ofdm::header_nbits() const
{
return d_header_len;
}
int
- packet_formatter_ofdm::header_payload()
+ header_format_ofdm::header_payload()
{
uint32_t pkt = d_hdr_reg.extract_field32(0, 24, true);
uint16_t pktlen = static_cast<uint16_t>((pkt >> 8) & 0x0fff);
diff --git a/gr-digital/lib/packet_format_async_impl.cc
b/gr-digital/lib/protocol_formatter_async_impl.cc
similarity index 74%
rename from gr-digital/lib/packet_format_async_impl.cc
rename to gr-digital/lib/protocol_formatter_async_impl.cc
index 6729e48..83a2eed 100644
--- a/gr-digital/lib/packet_format_async_impl.cc
+++ b/gr-digital/lib/protocol_formatter_async_impl.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015-2016 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -26,25 +26,25 @@
#include <volk/volk.h>
#include <gnuradio/io_signature.h>
-#include "packet_format_async_impl.h"
+#include "protocol_formatter_async_impl.h"
#include <stdio.h>
namespace gr {
namespace digital {
- packet_format_async::sptr
- packet_format_async::make(const packet_formatter_base::sptr &formatter)
+ protocol_formatter_async::sptr
+ protocol_formatter_async::make(const header_format_base::sptr &format)
{
return gnuradio::get_initial_sptr
- (new packet_format_async_impl(formatter));
+ (new protocol_formatter_async_impl(format));
}
- packet_format_async_impl::packet_format_async_impl(const
packet_formatter_base::sptr &formatter)
- : block("packet_format_async",
+ protocol_formatter_async_impl::protocol_formatter_async_impl(const
header_format_base::sptr &format)
+ : block("protocol_formatter_async",
io_signature::make(0, 0, 0),
io_signature::make(0, 0, 0))
{
- d_formatter = formatter;
+ d_format = format;
d_in_port = pmt::mp("in");
d_hdr_port = pmt::mp("header");
@@ -55,15 +55,15 @@ namespace gr {
message_port_register_out(d_pld_port);
set_msg_handler(d_in_port,
- boost::bind(&packet_format_async_impl::append, this ,_1)
);
+ boost::bind(&protocol_formatter_async_impl::append, this
,_1) );
}
- packet_format_async_impl::~packet_format_async_impl()
+ protocol_formatter_async_impl::~protocol_formatter_async_impl()
{
}
void
- packet_format_async_impl::append(pmt::pmt_t msg)
+ protocol_formatter_async_impl::append(pmt::pmt_t msg)
{
// extract input pdu
pmt::pmt_t meta(pmt::car(msg));
@@ -80,8 +80,8 @@ namespace gr {
output = pmt::init_u8vector(pkt_len, payload);
volk_free(payload);
- // Build the header from the input, metadata, and formatter
- d_formatter->format(pkt_len, bytes_in, header, meta);
+ // Build the header from the input, metadata, and format
+ d_format->format(pkt_len, bytes_in, header, meta);
// Package and publish
pmt::pmt_t hdr_pdu = pmt::cons(meta, header);
diff --git a/gr-digital/lib/packet_format_async_impl.h
b/gr-digital/lib/protocol_formatter_async_impl.h
similarity index 65%
rename from gr-digital/lib/packet_format_async_impl.h
rename to gr-digital/lib/protocol_formatter_async_impl.h
index ab6fc68..79c80de 100644
--- a/gr-digital/lib/packet_format_async_impl.h
+++ b/gr-digital/lib/protocol_formatter_async_impl.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2015 Free Software Foundation, Inc.
+ * Copyright 2015-2016 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -20,19 +20,19 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef INCLUDED_DIGITAL_PACKET_FORMAT_ASYNC_IMPL_H
-#define INCLUDED_DIGITAL_PACKET_FORMAT_ASYNC_IMPL_H
+#ifndef INCLUDED_DIGITAL_PROTOCOL_FORMATTER_ASYNC_IMPL_H
+#define INCLUDED_DIGITAL_PROTOCOL_FORMATTER_ASYNC_IMPL_H
-#include <gnuradio/digital/packet_format_async.h>
+#include <gnuradio/digital/protocol_formatter_async.h>
namespace gr {
namespace digital {
- class packet_format_async_impl
- : public packet_format_async
+ class protocol_formatter_async_impl
+ : public protocol_formatter_async
{
private:
- packet_formatter_base::sptr d_formatter;
+ header_format_base::sptr d_format;
pmt::pmt_t d_in_port;
pmt::pmt_t d_hdr_port, d_pld_port;
@@ -40,11 +40,11 @@ namespace gr {
void append(pmt::pmt_t msg);
public:
- packet_format_async_impl(const packet_formatter_base::sptr &formatter);
- ~packet_format_async_impl();
+ protocol_formatter_async_impl(const header_format_base::sptr &format);
+ ~protocol_formatter_async_impl();
};
} // namespace digital
} // namespace gr
-#endif /* INCLUDED_DIGITAL_PACKET_FORMAT_ASYNC_IMPL_H */
+#endif /* INCLUDED_DIGITAL_PROTOCOL_FORMATTER_ASYNC_IMPL_H */
diff --git a/gr-digital/lib/packet_format_bb_impl.cc
b/gr-digital/lib/protocol_formatter_bb_impl.cc
similarity index 66%
rename from gr-digital/lib/packet_format_bb_impl.cc
rename to gr-digital/lib/protocol_formatter_bb_impl.cc
index bc2e05d..fcf2f66 100644
--- a/gr-digital/lib/packet_format_bb_impl.cc
+++ b/gr-digital/lib/protocol_formatter_bb_impl.cc
@@ -26,51 +26,51 @@
#include <volk/volk.h>
#include <gnuradio/io_signature.h>
-#include "packet_format_bb_impl.h"
+#include "protocol_formatter_bb_impl.h"
#include <stdio.h>
namespace gr {
namespace digital {
- packet_format_bb::sptr
- packet_format_bb::make(const packet_formatter_base::sptr &formatter,
- const std::string &len_tag_key)
+ protocol_formatter_bb::sptr
+ protocol_formatter_bb::make(const header_format_base::sptr &format,
+ const std::string &len_tag_key)
{
return gnuradio::get_initial_sptr
- (new packet_format_bb_impl(formatter, len_tag_key));
+ (new protocol_formatter_bb_impl(format, len_tag_key));
}
- packet_format_bb_impl::packet_format_bb_impl(const
packet_formatter_base::sptr &formatter,
- const std::string
&len_tag_key)
- : tagged_stream_block("packet_format_bb",
+ protocol_formatter_bb_impl::protocol_formatter_bb_impl(const
header_format_base::sptr &format,
+ const std::string
&len_tag_key)
+ : tagged_stream_block("protocol_formatter_bb",
io_signature::make(1, 1, sizeof(char)),
io_signature::make(1, 1, sizeof(char)),
len_tag_key),
- d_formatter(formatter)
+ d_format(format)
{
- set_output_multiple(d_formatter->header_nbytes());
+ set_output_multiple(d_format->header_nbytes());
// This is the worst case rate, because we don't know the true value, of
course
- set_relative_rate(d_formatter->header_nbytes());
+ set_relative_rate(d_format->header_nbytes());
set_tag_propagation_policy(TPP_DONT);
}
- packet_format_bb_impl::~packet_format_bb_impl()
+ protocol_formatter_bb_impl::~protocol_formatter_bb_impl()
{
}
void
- packet_format_bb_impl::set_header_formatter(packet_formatter_base::sptr
&formatter)
+ protocol_formatter_bb_impl::set_header_format(header_format_base::sptr
&format)
{
gr::thread::scoped_lock guard(d_setlock);
- d_formatter = formatter;
+ d_format = format;
}
int
- packet_format_bb_impl::work(int noutput_items,
- gr_vector_int &ninput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
+ protocol_formatter_bb_impl::work(int noutput_items,
+ gr_vector_int &ninput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
{
gr::thread::scoped_lock guard(d_setlock);
unsigned char *out = (unsigned char *) output_items[0];
@@ -83,17 +83,17 @@ namespace gr {
pmt::pmt_t pmt_out;
pmt::pmt_t info = pmt::PMT_NIL;
- if(!d_formatter->format(ninput_items[0], in, pmt_out, info)) {
- GR_LOG_FATAL(d_logger, boost::format("formatter returned false "
+ if(!d_format->format(ninput_items[0], in, pmt_out, info)) {
+ GR_LOG_FATAL(d_logger, boost::format("header format returned false "
"(this shouldn't happen).
Offending "
"header started at %1%") %
nitems_read(0));
- throw std::runtime_error("packet formatter returned false.");
+ throw std::runtime_error("header format returned false.");
}
size_t len;
const uint8_t *data = pmt::u8vector_elements(pmt_out, len);
- if(len != d_formatter->header_nbytes()) {
- throw std::runtime_error("Formatter got wrong size header");
+ if(len != d_format->header_nbytes()) {
+ throw std::runtime_error("Header format got wrong size header");
}
memcpy(out, data, len);
diff --git a/gr-digital/lib/packet_format_bb_impl.h
b/gr-digital/lib/protocol_formatter_bb_impl.h
similarity index 67%
rename from gr-digital/lib/packet_format_bb_impl.h
rename to gr-digital/lib/protocol_formatter_bb_impl.h
index bbff8f0..c7c86e4 100644
--- a/gr-digital/lib/packet_format_bb_impl.h
+++ b/gr-digital/lib/protocol_formatter_bb_impl.h
@@ -20,28 +20,29 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef INCLUDED_DIGITAL_PACKET_FORMAT_BB_IMPL_H
-#define INCLUDED_DIGITAL_PACKET_FORMAT_BB_IMPL_H
+#ifndef INCLUDED_DIGITAL_PROTOCOL_FORMATTER_BB_IMPL_H
+#define INCLUDED_DIGITAL_PROTOCOL_FORMATTER_BB_IMPL_H
-#include <gnuradio/digital/packet_format_bb.h>
+#include <gnuradio/digital/protocol_formatter_bb.h>
namespace gr {
namespace digital {
- class packet_format_bb_impl : public packet_format_bb
+ class protocol_formatter_bb_impl : public protocol_formatter_bb
{
private:
- packet_formatter_base::sptr d_formatter;
+ header_format_base::sptr d_format;
public:
- packet_format_bb_impl(const packet_formatter_base::sptr &formatter,
- const std::string &len_tag_key);
- ~packet_format_bb_impl();
+ protocol_formatter_bb_impl(const header_format_base::sptr &format,
+ const std::string &len_tag_key);
+ ~protocol_formatter_bb_impl();
- void set_header_formatter(packet_formatter_base::sptr &formatter);
+ void set_header_format(header_format_base::sptr &format);
void remove_length_tags(const std::vector<std::vector<tag_t> > &tags) {};
- int calculate_output_stream_length(const gr_vector_int &ninput_items) {
return d_formatter->header_nbytes(); };
+ int calculate_output_stream_length(const gr_vector_int &ninput_items) {
+ return d_format->header_nbytes(); };
int work(int noutput_items,
gr_vector_int &ninput_items,
@@ -52,4 +53,4 @@ namespace gr {
} // namespace digital
} // namespace gr
-#endif /* INCLUDED_DIGITAL_PACKET_FORMAT_BB_IMPL_H */
+#endif /* INCLUDED_DIGITAL_PROTOCOL_FORMATTER_BB_IMPL_H */
diff --git a/gr-digital/lib/packet_parse_b_impl.cc
b/gr-digital/lib/protocol_parser_b_impl.cc
similarity index 70%
rename from gr-digital/lib/packet_parse_b_impl.cc
rename to gr-digital/lib/protocol_parser_b_impl.cc
index 1d2fb4f..642fcae 100644
--- a/gr-digital/lib/packet_parse_b_impl.cc
+++ b/gr-digital/lib/protocol_parser_b_impl.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2015,2016 Free Software Foundation, Inc.
+ * Copyright 2015-2016 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -24,7 +24,7 @@
#include "config.h"
#endif
-#include "packet_parse_b_impl.h"
+#include "protocol_parser_b_impl.h"
#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <volk/volk.h>
@@ -33,39 +33,39 @@
namespace gr {
namespace digital {
- packet_parse_b::sptr
- packet_parse_b::make(const packet_formatter_base::sptr &formatter)
+ protocol_parser_b::sptr
+ protocol_parser_b::make(const header_format_base::sptr &format)
{
return gnuradio::get_initial_sptr
- (new packet_parse_b_impl(formatter));
+ (new protocol_parser_b_impl(format));
}
- packet_parse_b_impl::packet_parse_b_impl(const packet_formatter_base::sptr
&formatter)
- : sync_block("packet_parse_b",
+ protocol_parser_b_impl::protocol_parser_b_impl(const
header_format_base::sptr &format)
+ : sync_block("protocol_parser_b",
io_signature::make(1, 1, sizeof(char)),
io_signature::make(0, 0, 0))
{
- d_formatter = formatter;
+ d_format = format;
d_out_port = pmt::mp("info");
message_port_register_out(d_out_port);
}
- packet_parse_b_impl::~packet_parse_b_impl()
+ protocol_parser_b_impl::~protocol_parser_b_impl()
{
}
int
- packet_parse_b_impl::work(int noutput_items,
- gr_vector_const_void_star &input_items,
- gr_vector_void_star &output_items)
+ protocol_parser_b_impl::work(int noutput_items,
+ gr_vector_const_void_star &input_items,
+ gr_vector_void_star &output_items)
{
const unsigned char *in = (const unsigned char*)input_items[0];
int count = 0;
std::vector<pmt::pmt_t> info;
- bool ret = d_formatter->parse(noutput_items, in, info, count);
+ bool ret = d_format->parse(noutput_items, in, info, count);
if(ret) {
for(size_t i = 0; i < info.size(); i++) {
diff --git a/gr-digital/lib/packet_parse_b_impl.h
b/gr-digital/lib/protocol_parser_b_impl.h
similarity index 71%
rename from gr-digital/lib/packet_parse_b_impl.h
rename to gr-digital/lib/protocol_parser_b_impl.h
index 8fc039e..7b09313 100644
--- a/gr-digital/lib/packet_parse_b_impl.h
+++ b/gr-digital/lib/protocol_parser_b_impl.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2015,2016 Free Software Foundation, Inc.
+ * Copyright 2015-2016 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -20,23 +20,23 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef INCLUDED_DIGITAL_PACKET_PARSE_B_IMPL_H
-#define INCLUDED_DIGITAL_PACKET_PARSE_B_IMPL_H
+#ifndef INCLUDED_DIGITAL_PROTOCOL_PARSER_B_IMPL_H
+#define INCLUDED_DIGITAL_PROTOCOL_PARSER_B_IMPL_H
-#include <gnuradio/digital/packet_parse_b.h>
+#include <gnuradio/digital/protocol_parser_b.h>
namespace gr {
namespace digital {
- class packet_parse_b_impl : public packet_parse_b
+ class protocol_parser_b_impl : public protocol_parser_b
{
private:
- packet_formatter_base::sptr d_formatter;
+ header_format_base::sptr d_format;
pmt::pmt_t d_out_port;
public:
- packet_parse_b_impl(const packet_formatter_base::sptr &formatter);
- ~packet_parse_b_impl();
+ protocol_parser_b_impl(const header_format_base::sptr &format);
+ ~protocol_parser_b_impl();
void set_threshold(unsigned int thresh);
unsigned int threshold() const;
@@ -49,4 +49,4 @@ namespace gr {
} // namespace digital
} // namespace gr
-#endif /* INCLUDED_DIGITAL_PACKET_PARSE_B_IMPL_H */
+#endif /* INCLUDED_DIGITAL_PROTOCOL_PARSER_B_IMPL_H */
diff --git a/gr-digital/lib/qa_digital.cc b/gr-digital/lib/qa_digital.cc
index ad88de5..07e19f4 100644
--- a/gr-digital/lib/qa_digital.cc
+++ b/gr-digital/lib/qa_digital.cc
@@ -26,14 +26,14 @@
*/
#include "qa_digital.h"
-#include "qa_packet_formatters.h"
+#include "qa_header_format.h"
CppUnit::TestSuite *
qa_digital::suite()
{
CppUnit::TestSuite *s = new CppUnit::TestSuite("gr-digital");
- s->addTest(qa_packet_formatters::suite());
+ s->addTest(qa_header_format::suite());
return s;
}
diff --git a/gr-digital/lib/qa_packet_formatters.cc
b/gr-digital/lib/qa_header_format.cc
similarity index 89%
rename from gr-digital/lib/qa_packet_formatters.cc
rename to gr-digital/lib/qa_header_format.cc
index aa3d033..bfe2d34 100644
--- a/gr-digital/lib/qa_packet_formatters.cc
+++ b/gr-digital/lib/qa_header_format.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2015,2016 Free Software Foundation, Inc.
+ * Copyright 2015-2016 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -32,13 +32,13 @@
#include <gnuradio/expj.h>
#include <cppunit/TestAssert.h>
-#include "qa_packet_formatters.h"
-#include <gnuradio/digital/packet_formatter_counter.h>
-#include <gnuradio/digital/packet_formatter_default.h>
+#include "qa_header_format.h"
+#include <gnuradio/digital/header_format_counter.h>
+#include <gnuradio/digital/header_format_default.h>
#include <gnuradio/blocks/unpack_k_bits.h>
void
-qa_packet_formatters::test_default_format()
+qa_header_format::test_default_format()
{
static const int N = 4800;
int upper8 = (N >> 8) & 0xFF;
@@ -52,8 +52,8 @@ qa_packet_formatters::test_default_format()
data[i] = rand() % 256;
}
- gr::digital::packet_formatter_default::sptr formatter;
- formatter = gr::digital::packet_formatter_default::make(ac, 0);
+ gr::digital::header_format_default::sptr formatter;
+ formatter = gr::digital::header_format_default::make(ac, 0);
pmt::pmt_t output;
pmt::pmt_t info = pmt::make_dict();
@@ -86,7 +86,7 @@ qa_packet_formatters::test_default_format()
void
-qa_packet_formatters::test_default_parse()
+qa_header_format::test_default_parse()
{
static const int nbytes = 106;
static const int nbits = 8*nbytes;
@@ -114,8 +114,8 @@ qa_packet_formatters::test_default_parse()
unpacker.unpack(bits, bytes, nbytes);
std::string ac = "1010101010101010"; //0xAAAA
- gr::digital::packet_formatter_default::sptr formatter;
- formatter = gr::digital::packet_formatter_default::make(ac, 0);
+ gr::digital::header_format_default::sptr formatter;
+ formatter = gr::digital::header_format_default::make(ac, 0);
int count = 0;
std::vector<pmt::pmt_t> info;
@@ -137,7 +137,7 @@ qa_packet_formatters::test_default_parse()
}
void
-qa_packet_formatters::test_counter_format()
+qa_header_format::test_counter_format()
{
static const int N = 4800;
int upper8 = (N >> 8) & 0xFF;
@@ -152,8 +152,8 @@ qa_packet_formatters::test_counter_format()
}
uint16_t expected_bps = 2;
- gr::digital::packet_formatter_counter::sptr formatter;
- formatter = gr::digital::packet_formatter_counter::make(ac, 0, expected_bps);
+ gr::digital::header_format_counter::sptr formatter;
+ formatter = gr::digital::header_format_counter::make(ac, 0, expected_bps);
pmt::pmt_t output;
pmt::pmt_t info = pmt::make_dict();
@@ -203,7 +203,7 @@ qa_packet_formatters::test_counter_format()
void
-qa_packet_formatters::test_counter_parse()
+qa_header_format::test_counter_parse()
{
static const int nbytes = 110;
static const int nbits = 8*nbytes;
@@ -236,8 +236,8 @@ qa_packet_formatters::test_counter_parse()
uint16_t expected_bps = 2;
std::string ac = "1010101010101010"; //0xAAAA
- gr::digital::packet_formatter_counter::sptr formatter;
- formatter = gr::digital::packet_formatter_counter::make(ac, 0, expected_bps);
+ gr::digital::header_format_counter::sptr formatter;
+ formatter = gr::digital::header_format_counter::make(ac, 0, expected_bps);
int count = 0;
std::vector<pmt::pmt_t> info;
diff --git a/gr-digital/lib/qa_packet_formatters.h
b/gr-digital/lib/qa_header_format.h
similarity index 81%
rename from gr-digital/lib/qa_packet_formatters.h
rename to gr-digital/lib/qa_header_format.h
index cff2d54..281e8f4 100644
--- a/gr-digital/lib/qa_packet_formatters.h
+++ b/gr-digital/lib/qa_header_format.h
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2014 Free Software Foundation, Inc.
+ * Copyright 2015-2016 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -20,15 +20,15 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef _QA_DIGITAL_PACKET_FORMATTERS_H_
-#define _QA_DIGITAL_PACKET_FORMATTERS_H_
+#ifndef _QA_DIGITAL_HEADER_FORMAT_H_
+#define _QA_DIGITAL_HEADER_FORMAT_H_
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/TestCase.h>
-class qa_packet_formatters : public CppUnit::TestCase
+class qa_header_format : public CppUnit::TestCase
{
- CPPUNIT_TEST_SUITE(qa_packet_formatters);
+ CPPUNIT_TEST_SUITE(qa_header_format);
CPPUNIT_TEST(test_default_format);
CPPUNIT_TEST(test_default_parse);
CPPUNIT_TEST(test_counter_format);
@@ -44,4 +44,4 @@ class qa_packet_formatters : public CppUnit::TestCase
void test_counter_parse_soft();
};
-#endif /* _QA_DIGITAL_PACKET_FORMATTERS_H_ */
+#endif /* _QA_DIGITAL_HEADER_FORMAT_H_ */
diff --git a/gr-digital/python/digital/qa_packet_format.py
b/gr-digital/python/digital/qa_packet_format.py
index 2dbe600..f2931fa 100644
--- a/gr-digital/python/digital/qa_packet_format.py
+++ b/gr-digital/python/digital/qa_packet_format.py
@@ -35,14 +35,14 @@ class test_packet_format_fb(gr_unittest.TestCase):
def test_packet_format_async_default(self):
ac = packet_utils.default_access_code
- formatter = digital.packet_formatter_default(ac, 0)
+ hdr_format = digital.header_format_default(ac, 0)
- pkt_header = digital.packet_format_async(formatter)
+ formatter = digital.protocol_formatter_async(hdr_format)
snk_hdr = blocks.message_debug()
snk_pld = blocks.message_debug()
- self.tb.msg_connect(pkt_header, 'header', snk_hdr, 'store')
- self.tb.msg_connect(pkt_header, 'payload', snk_pld, 'store')
+ self.tb.msg_connect(formatter, 'header', snk_hdr, 'store')
+ self.tb.msg_connect(formatter, 'payload', snk_pld, 'store')
send_str = "Hello World"
@@ -83,14 +83,14 @@ class test_packet_format_fb(gr_unittest.TestCase):
def test_packet_format_async_counter(self):
bps = 2
ac = packet_utils.default_access_code
- formatter = digital.packet_formatter_counter(ac, 0, 2)
+ hdr_format = digital.header_format_counter(ac, 0, 2)
- pkt_header = digital.packet_format_async(formatter)
+ formatter = digital.protocol_formatter_async(hdr_format)
snk_hdr = blocks.message_debug()
snk_pld = blocks.message_debug()
- self.tb.msg_connect(pkt_header, 'header', snk_hdr, 'store')
- self.tb.msg_connect(pkt_header, 'payload', snk_pld, 'store')
+ self.tb.msg_connect(formatter, 'header', snk_hdr, 'store')
+ self.tb.msg_connect(formatter, 'payload', snk_pld, 'store')
send_str = "Hello World" + 1000*"xxx"
diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i
index b4b3e41..8a38d65 100644
--- a/gr-digital/swig/digital_swig.i
+++ b/gr-digital/swig/digital_swig.i
@@ -100,14 +100,14 @@
#include "gnuradio/digital/ofdm_sampler.h"
#include "gnuradio/digital/ofdm_serializer_vcc.h"
#include "gnuradio/digital/ofdm_sync_sc_cfb.h"
-#include "gnuradio/digital/packet_formatter_base.h"
-#include "gnuradio/digital/packet_formatter_default.h"
-#include "gnuradio/digital/packet_formatter_counter.h"
-#include "gnuradio/digital/packet_formatter_crc.h"
-#include "gnuradio/digital/packet_formatter_ofdm.h"
-#include "gnuradio/digital/packet_format_async.h"
-#include "gnuradio/digital/packet_format_bb.h"
-#include "gnuradio/digital/packet_parse_b.h"
+#include "gnuradio/digital/header_format_base.h"
+#include "gnuradio/digital/header_format_default.h"
+#include "gnuradio/digital/header_format_counter.h"
+#include "gnuradio/digital/header_format_crc.h"
+#include "gnuradio/digital/header_format_ofdm.h"
+#include "gnuradio/digital/protocol_formatter_async.h"
+#include "gnuradio/digital/protocol_formatter_bb.h"
+#include "gnuradio/digital/protocol_parser_b.h"
#include "gnuradio/digital/packet_header_default.h"
#include "gnuradio/digital/packet_header_ofdm.h"
#include "gnuradio/digital/packet_headergenerator_bb.h"
@@ -189,14 +189,14 @@
%include "gnuradio/digital/ofdm_sampler.h"
%include "gnuradio/digital/ofdm_serializer_vcc.h"
%include "gnuradio/digital/ofdm_sync_sc_cfb.h"
-%include "gnuradio/digital/packet_formatter_base.h"
-%include "gnuradio/digital/packet_formatter_default.h"
-%include "gnuradio/digital/packet_formatter_counter.h"
-%include "gnuradio/digital/packet_formatter_crc.h"
-%include "gnuradio/digital/packet_formatter_ofdm.h"
-%include "gnuradio/digital/packet_format_async.h"
-%include "gnuradio/digital/packet_format_bb.h"
-%include "gnuradio/digital/packet_parse_b.h"
+%include "gnuradio/digital/header_format_base.h"
+%include "gnuradio/digital/header_format_default.h"
+%include "gnuradio/digital/header_format_counter.h"
+%include "gnuradio/digital/header_format_crc.h"
+%include "gnuradio/digital/header_format_ofdm.h"
+%include "gnuradio/digital/protocol_formatter_async.h"
+%include "gnuradio/digital/protocol_formatter_bb.h"
+%include "gnuradio/digital/protocol_parser_b.h"
%include "gnuradio/digital/packet_header_default.h"
%include "gnuradio/digital/packet_header_ofdm.h"
%include "gnuradio/digital/packet_headergenerator_bb.h"
@@ -265,9 +265,9 @@ GR_SWIG_BLOCK_MAGIC2(digital, ofdm_mapper_bcv);
GR_SWIG_BLOCK_MAGIC2(digital, ofdm_sampler);
GR_SWIG_BLOCK_MAGIC2(digital, ofdm_serializer_vcc);
GR_SWIG_BLOCK_MAGIC2(digital, ofdm_sync_sc_cfb);
-GR_SWIG_BLOCK_MAGIC2(digital, packet_format_async);
-GR_SWIG_BLOCK_MAGIC2(digital, packet_format_bb);
-GR_SWIG_BLOCK_MAGIC2(digital, packet_parse_b);
+GR_SWIG_BLOCK_MAGIC2(digital, protocol_formatter_async);
+GR_SWIG_BLOCK_MAGIC2(digital, protocol_formatter_bb);
+GR_SWIG_BLOCK_MAGIC2(digital, protocol_parser_b);
GR_SWIG_BLOCK_MAGIC2(digital, packet_headergenerator_bb);
GR_SWIG_BLOCK_MAGIC2(digital, packet_headerparser_b);
GR_SWIG_BLOCK_MAGIC2(digital, packet_sink);
diff --git a/gr-digital/swig/packet_header.i b/gr-digital/swig/packet_header.i
index 32bb334..ace7030 100644
--- a/gr-digital/swig/packet_header.i
+++ b/gr-digital/swig/packet_header.i
@@ -32,29 +32,29 @@ packet_header_ofdm_sptr.__repr__ = lambda self:
"<packet_header_ofdm>"
packet_header_ofdm = packet_header_ofdm .make;
%}
-%template(packet_formatter_base_sptr)
boost::shared_ptr<gr::digital::packet_formatter_base>;
+%template(header_format_base_sptr)
boost::shared_ptr<gr::digital::header_format_base>;
-%template(packet_formatter_default_sptr)
boost::shared_ptr<gr::digital::packet_formatter_default>;
+%template(header_format_default_sptr)
boost::shared_ptr<gr::digital::header_format_default>;
%pythoncode %{
-packet_formatter_default_sptr.__repr__ = lambda self:
"<packet_formatter_default>"
-packet_formatter_default = packet_formatter_default .make;
+header_format_default_sptr.__repr__ = lambda self: "<header_format_default>"
+header_format_default = header_format_default .make;
%}
-%template(packet_formatter_counter_sptr)
boost::shared_ptr<gr::digital::packet_formatter_counter>;
+%template(header_format_counter_sptr)
boost::shared_ptr<gr::digital::header_format_counter>;
%pythoncode %{
-packet_formatter_counter_sptr.__repr__ = lambda self:
"<packet_formatter_counter>"
-packet_formatter_counter = packet_formatter_counter .make;
+header_format_counter_sptr.__repr__ = lambda self: "<header_format_counter>"
+header_format_counter = header_format_counter .make;
%}
-%template(packet_formatter_crc_sptr)
boost::shared_ptr<gr::digital::packet_formatter_crc>;
+%template(header_format_crc_sptr)
boost::shared_ptr<gr::digital::header_format_crc>;
%pythoncode %{
-packet_formatter_crc_sptr.__repr__ = lambda self: "<packet_formatter_crc>"
-packet_formatter_crc = packet_formatter_crc .make;
+header_format_crc_sptr.__repr__ = lambda self: "<header_format_crc>"
+header_format_crc = header_format_crc .make;
%}
-%template(packet_formatter_ofdm_sptr)
boost::shared_ptr<gr::digital::packet_formatter_ofdm>;
+%template(header_format_ofdm_sptr)
boost::shared_ptr<gr::digital::header_format_ofdm>;
%pythoncode %{
-packet_formatter_ofdm_sptr.__repr__ = lambda self: "<packet_formatter_ofdm>"
-packet_formatter_ofdm = packet_formatter_ofdm .make;
+header_format_ofdm_sptr.__repr__ = lambda self: "<header_format_ofdm>"
+header_format_ofdm = header_format_ofdm .make;
%}
- [Commit-gnuradio] [gnuradio] 14/24: digital: wip: pfb_clock_sync_ccf tag offset update., (continued)
- [Commit-gnuradio] [gnuradio] 14/24: digital: wip: pfb_clock_sync_ccf tag offset update., git, 2016/06/13
- [Commit-gnuradio] [gnuradio] 18/24: digital: fixing up some of the packet formatters since the new base class., git, 2016/06/13
- [Commit-gnuradio] [gnuradio] 17/24: docs: Adding documentation for packet comms, git, 2016/06/13
- [Commit-gnuradio] [gnuradio] 07/24: digital: Updates to corr_est block., git, 2016/06/13
- [Commit-gnuradio] [gnuradio] 20/24: digital: fixed packet_parse from using default formatter to base class, git, 2016/06/13
- [Commit-gnuradio] [gnuradio] 24/24: digital: fixed up some header_buffer issues and added QA., git, 2016/06/13
- [Commit-gnuradio] [gnuradio] 19/24: digital: adding more support for packet formatters., git, 2016/06/13
- [Commit-gnuradio] [gnuradio] 10/24: digital: Redid packet formatter class hierarchy., git, 2016/06/13
- [Commit-gnuradio] [gnuradio] 01/24: digital: New packet management classes., git, 2016/06/13
- [Commit-gnuradio] [gnuradio] 21/24: digital: adding packet_formatter_ofdm to replace packet_header_ofdm., git, 2016/06/13
- [Commit-gnuradio] [gnuradio] 22/24: digital: refactoring formatting/parsing code.,
git <=
- [Commit-gnuradio] [gnuradio] 02/24: digital: adding examples for using packet utilities., git, 2016/06/13
- [Commit-gnuradio] [gnuradio] 16/24: digital: Examples for dealing with packet comms, git, 2016/06/13
- [Commit-gnuradio] [gnuradio] 05/24: digital: More examples to help debug packet blocks/code., git, 2016/06/13