commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'github


From: git
Subject: [Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'github/packet3'
Date: Sat, 25 Jun 2016 19:08:01 +0000 (UTC)

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 3b2566122d89a1c23460f8d1f3e558b872666612
Merge: 21e5f63 0ea81ee
Author: Johnathan Corgan <address@hidden>
Date:   Sat Jun 25 11:09:23 2016 -0700

    Merge remote-tracking branch 'github/packet3'

 docs/doxygen/other/components.dox                  |    1 +
 gnuradio-runtime/include/gnuradio/block_detail.h   |    3 +
 gnuradio-runtime/lib/block_detail.cc               |    8 +
 gnuradio-runtime/lib/block_executor.cc             |   21 +-
 gr-blocks/examples/tags/test_tag_prop.grc          | 1145 +++++
 gr-blocks/grc/blocks_block_tree.xml                |    3 +
 gr-blocks/grc/blocks_multiply_by_tag_value_cc.xml  |   32 +
 gr-blocks/grc/blocks_test_tag_variable_rate_ff.xml |   47 +
 gr-blocks/include/gnuradio/blocks/CMakeLists.txt   |    2 +
 .../gnuradio/blocks/multiply_by_tag_value_cc.h     |   69 +
 .../gnuradio/blocks/test_tag_variable_rate_ff.h    |   79 +
 gr-blocks/lib/CMakeLists.txt                       |    2 +
 gr-blocks/lib/multiply_by_tag_value_cc_impl.cc     |  128 +
 gr-blocks/lib/multiply_by_tag_value_cc_impl.h      |   56 +
 gr-blocks/lib/test_tag_variable_rate_ff_impl.cc    |  139 +
 gr-blocks/lib/test_tag_variable_rate_ff_impl.h     |   56 +
 gr-blocks/swig/blocks_swig3.i                      |    3 +
 gr-blocks/swig/blocks_swig5.i                      |    3 +
 gr-digital/doc/packet_comms.dox                    |  653 +++
 gr-digital/examples/CMakeLists.txt                 |   33 +-
 gr-digital/examples/ofdm/tx_ofdm.grc               | 2067 +++++----
 gr-digital/examples/packet/README                  |    3 +
 gr-digital/examples/packet/burst_tagger.grc        | 1160 +++++
 .../tx_ofdm.grc => packet/example_corr_est.grc}    | 2258 +++++-----
 .../example_corr_est_and_clock_sync.grc}           | 2864 ++++++++-----
 .../example_corr_est_and_phase_sync.grc}           | 3252 +++++++++-----
 gr-digital/examples/packet/formatter_crc.grc       |  958 +++++
 gr-digital/examples/packet/formatter_ofdm.grc      | 1157 +++++
 .../examples/packet/packet_loopback_hier.grc       | 4442 ++++++++++++++++++++
 .../{ofdm/tx_ofdm.grc => packet/packet_rx.grc}     | 2135 ++++------
 .../{ofdm/tx_ofdm.grc => packet/packet_tx.grc}     | 2121 ++++------
 .../tx_ofdm.grc => packet/simple_bpsk_tx.grc}      | 2913 ++++++++-----
 .../transmitter_sim_hier.grc}                      | 2165 +++++-----
 gr-digital/examples/packet/tx_stage0.grc           |  286 ++
 gr-digital/examples/packet/tx_stage1.grc           |  284 ++
 gr-digital/examples/packet/tx_stage2.grc           |  494 +++
 gr-digital/examples/packet/tx_stage3.grc           |  445 ++
 .../{ofdm/tx_ofdm.grc => packet/tx_stage4.grc}     | 2122 ++++------
 .../{ofdm/tx_ofdm.grc => packet/tx_stage5.grc}     | 2095 ++++-----
 .../{ofdm/tx_ofdm.grc => packet/tx_stage6.grc}     | 2168 +++++-----
 .../{ofdm/tx_ofdm.grc => packet/tx_stage6a.grc}    | 2074 ++++-----
 gr-digital/examples/packet/uhd_packet_rx.grc       | 4083 ++++++++++++++++++
 gr-digital/examples/packet/uhd_packet_rx_tun.grc   | 4143 ++++++++++++++++++
 gr-digital/examples/packet/uhd_packet_tx.grc       | 3293 +++++++++++++++
 .../tx_ofdm.grc => packet/uhd_packet_tx_tun.grc}   | 3154 +++++++++-----
 gr-digital/grc/digital_block_tree.xml              |    6 +-
 .../grc/digital_protocol_formatter_async.xml       |   33 +
 gr-digital/grc/digital_protocol_formatter_bb.xml   |   32 +
 gr-digital/grc/digital_protocol_parser_b.xml       |   25 +
 gr-digital/grc/variable_header_format_default.xml  |   35 +
 gr-digital/include/gnuradio/digital/CMakeLists.txt |   11 +-
 gr-digital/include/gnuradio/digital/corr_est_cc.h  |    8 +-
 .../include/gnuradio/digital/header_buffer.h       |  310 ++
 .../include/gnuradio/digital/header_format_base.h  |  225 +
 .../gnuradio/digital/header_format_counter.h       |  135 +
 .../include/gnuradio/digital/header_format_crc.h   |  118 +
 .../gnuradio/digital/header_format_default.h       |  217 +
 .../include/gnuradio/digital/header_format_ofdm.h  |  127 +
 .../gnuradio/digital/protocol_formatter_async.h    |   88 +
 .../gnuradio/digital/protocol_formatter_bb.h       |   81 +
 .../include/gnuradio/digital/protocol_parser_b.h   |   80 +
 gr-digital/lib/CMakeLists.txt                      |   46 +-
 gr-digital/lib/corr_est_cc_impl.cc                 |   81 +-
 gr-digital/lib/corr_est_cc_impl.h                  |    3 +
 gr-digital/lib/header_buffer.cc                    |  211 +
 gr-digital/lib/header_format_base.cc               |   70 +
 gr-digital/lib/header_format_counter.cc            |  120 +
 gr-digital/lib/header_format_crc.cc                |  161 +
 gr-digital/lib/header_format_default.cc            |  222 +
 gr-digital/lib/header_format_ofdm.cc               |  180 +
 gr-digital/lib/packet_header_ofdm.cc               |    9 +-
 gr-digital/lib/pfb_clock_sync_ccf_impl.cc          |   32 +-
 gr-digital/lib/pfb_clock_sync_ccf_impl.h           |    2 +
 gr-digital/lib/protocol_formatter_async_impl.cc    |   94 +
 gr-digital/lib/protocol_formatter_async_impl.h     |   50 +
 gr-digital/lib/protocol_formatter_bb_impl.cc       |  118 +
 gr-digital/lib/protocol_formatter_bb_impl.h        |   56 +
 gr-digital/lib/protocol_parser_b_impl.cc           |   83 +
 gr-digital/lib/protocol_parser_b_impl.h            |   52 +
 .../{swig/packet_header.i => lib/qa_digital.cc}    |   39 +-
 .../{swig/packet_header.i => lib/qa_digital.h}     |   34 +-
 gr-digital/lib/qa_header_buffer.cc                 |  364 ++
 gr-digital/lib/qa_header_buffer.h                  |   59 +
 gr-digital/lib/qa_header_format.cc                 |  265 ++
 .../packet_header.i => lib/qa_header_format.h}     |   43 +-
 .../packet_header.i => lib/test_gr_digital.cc}     |   44 +-
 gr-digital/python/digital/qa_packet_format.py      |  135 +
 gr-digital/swig/CMakeLists.txt                     |    1 +
 gr-digital/swig/digital_swig.i                     |   21 +-
 gr-digital/swig/packet_header.i                    |   34 +-
 90 files changed, 43880 insertions(+), 14899 deletions(-)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]