[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 56/57: Merge branch 'fecapi'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 56/57: Merge branch 'fecapi' |
|
Date: |
Wed, 21 May 2014 03:10:32 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit 9422aea27e065a7da65c42dc29d56606356f0137
Merge: cb0bc7f 81bc676
Author: Tom Rondeau <address@hidden>
Date: Tue May 20 17:33:57 2014 -0400
Merge branch 'fecapi'
Conflicts:
cmake/Modules/FindICE-3.5.cmake
gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
gnuradio-runtime/include/gnuradio/basic_block.h | 27 +
gnuradio-runtime/include/gnuradio/block_registry.h | 3 +-
gnuradio-runtime/include/gnuradio/logger.h.in | 30 +-
gnuradio-runtime/lib/basic_block.cc | 27 +-
gnuradio-runtime/lib/block.cc | 2 +-
gnuradio-runtime/lib/block_registry.cc | 20 +
gnuradio-runtime/python/gnuradio/gr/__init__.py | 8 +
gr-blocks/grc/blocks_deinterleave.xml | 125 +-
gr-blocks/grc/blocks_interleave.xml | 125 +-
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 4 +-
gr-blocks/include/gnuradio/blocks/deinterleave.h | 34 +-
gr-blocks/include/gnuradio/blocks/interleave.h | 33 +-
gr-blocks/include/gnuradio/blocks/pack_k_bits.h | 85 +
gr-blocks/include/gnuradio/blocks/unpack_k_bits.h | 86 +
gr-blocks/lib/CMakeLists.txt | 12 +-
gr-blocks/lib/deinterleave_impl.cc | 53 +-
gr-blocks/lib/deinterleave_impl.h | 15 +-
gr-blocks/lib/interleave_impl.cc | 78 +-
gr-blocks/lib/interleave_impl.h | 16 +-
gr-blocks/lib/pack_k_bits.cc | 70 +
gr-blocks/lib/pack_k_bits_bb_impl.cc | 26 +-
gr-blocks/lib/pack_k_bits_bb_impl.h | 14 +-
gr-blocks/lib/unpack_k_bits.cc | 77 +
gr-blocks/lib/unpack_k_bits_bb_impl.cc | 23 +-
gr-blocks/lib/unpack_k_bits_bb_impl.h | 5 +-
gr-blocks/python/blocks/qa_interleave.py | 71 +-
gr-blocks/swig/blocks_swig5.i | 2 +
gr-digital/examples/demod/fec_corr_and_sync.grc | 3301 ++++++++++++++++++++
gr-digital/grc/digital_block_tree.xml | 2 +
.../grc/digital_correlate_access_code_xx_ts.xml | 58 +
gr-digital/grc/digital_crc32_async_bb.xml | 32 +
gr-digital/include/gnuradio/digital/CMakeLists.txt | 6 +-
.../include/gnuradio/digital/binary_slicer_fb.h | 10 +-
.../gnuradio/digital/correlate_access_code_bb_ts.h | 71 +
.../gnuradio/digital/correlate_access_code_ff_ts.h | 77 +
.../include/gnuradio/digital/crc32_async_bb.h | 70 +
gr-digital/lib/CMakeLists.txt | 13 +-
gr-digital/lib/binary_slicer_fb_impl.cc | 12 +-
gr-digital/lib/binary_slicer_fb_impl.h | 8 +-
gr-digital/lib/correlate_access_code_bb_impl.cc | 12 +-
gr-digital/lib/correlate_access_code_bb_ts_impl.cc | 168 +
gr-digital/lib/correlate_access_code_bb_ts_impl.h | 64 +
gr-digital/lib/correlate_access_code_ff_ts_impl.cc | 227 ++
gr-digital/lib/correlate_access_code_ff_ts_impl.h | 79 +
.../lib/correlate_access_code_tag_bb_impl.cc | 8 +-
gr-digital/lib/correlate_and_sync_cc_impl.cc | 31 +-
gr-digital/lib/correlate_and_sync_cc_impl.h | 16 +-
gr-digital/lib/crc32_async_bb_impl.cc | 122 +
gr-digital/lib/crc32_async_bb_impl.h | 60 +
gr-digital/python/digital/generic_mod_demod.py | 43 +-
gr-digital/python/digital/packet_utils.py | 553 ++--
.../python/digital/qa_correlate_access_code.py | 14 +-
gr-digital/swig/digital_swig.i | 17 +-
gr-fec/CMakeLists.txt | 5 +-
gr-fec/doc/fec.dox | 348 +++
.../fec/__init__.py => examples/CMakeLists.txt} | 30 +-
gr-fec/examples/ber_curve_gen.grc | 1633 ++++++++++
gr-fec/examples/ber_test.grc | 1538 +++++++++
gr-fec/examples/fecapi_async_decoders.grc | 2153 +++++++++++++
gr-fec/examples/fecapi_async_encoders.grc | 1591 ++++++++++
gr-fec/examples/fecapi_async_packed_decoders.grc | 1839 +++++++++++
gr-fec/examples/fecapi_async_to_stream.grc | 2081 ++++++++++++
gr-fec/examples/fecapi_cc_decoders.grc | 1316 ++++++++
gr-fec/examples/fecapi_decoders.grc | 1983 ++++++++++++
gr-fec/examples/fecapi_encoders.grc | 1696 ++++++++++
gr-fec/examples/fecapi_tagged_decoders.grc | 2106 +++++++++++++
gr-fec/examples/fecapi_tagged_encoders.grc | 2613 ++++++++++++++++
gr-fec/grc/fec_async_decoder.xml | 61 +
gr-fec/grc/fec_async_encoder.xml | 77 +
gr-fec/grc/fec_ber_bf.xml | 54 +
gr-fec/grc/fec_bercurve_generator.xml | 95 +
gr-fec/grc/fec_block_tree.xml | 42 +-
gr-fec/grc/fec_decode_ccsds_27_fb.xml | 24 +-
gr-fec/grc/fec_decoder.xml | 91 +
gr-fec/grc/fec_depuncture_bb.xml | 45 +
gr-fec/grc/fec_encoder.xml | 91 +
gr-fec/grc/fec_extended_async_encoder.xml | 38 +
gr-fec/grc/fec_extended_decoder.xml | 72 +
gr-fec/grc/fec_extended_encoder.xml | 57 +
gr-fec/grc/fec_extended_tagged_decoder.xml | 58 +
gr-fec/grc/fec_extended_tagged_encoder.xml | 43 +
gr-fec/grc/fec_puncture_xx.xml | 53 +
gr-fec/grc/fec_tagged_decoder.xml | 67 +
gr-fec/grc/fec_tagged_encoder.xml | 67 +
gr-fec/grc/variable_cc_decoder_def_list.xml | 146 +
gr-fec/grc/variable_cc_encoder_def_list.xml | 139 +
gr-fec/grc/variable_ccsds_encoder_def_list.xml | 103 +
gr-fec/grc/variable_dummy_decoder_def_list.xml | 73 +
gr-fec/grc/variable_dummy_encoder_def_list.xml | 73 +
.../grc/variable_repetition_decoder_def_list.xml | 87 +
.../grc/variable_repetition_encoder_def_list.xml | 80 +
gr-fec/include/gnuradio/fec/CMakeLists.txt | 24 +-
gr-fec/include/gnuradio/fec/async_decoder.h | 103 +
gr-fec/include/gnuradio/fec/async_encoder.h | 99 +
.../include/gnuradio/fec/ber_bf.h | 39 +-
.../include/gnuradio/fec/cc_common.h | 59 +-
gr-fec/include/gnuradio/fec/cc_decoder.h | 144 +
gr-fec/include/gnuradio/fec/cc_encoder.h | 140 +
gr-fec/include/gnuradio/fec/ccsds_encoder.h | 117 +
gr-fec/include/gnuradio/fec/conv_bit_corr_bb.h | 62 +
gr-fec/include/gnuradio/fec/decoder.h | 97 +
gr-fec/include/gnuradio/fec/depuncture_bb.h | 111 +
gr-fec/include/gnuradio/fec/dummy_decoder.h | 76 +
gr-fec/include/gnuradio/fec/dummy_encoder.h | 76 +
gr-fec/include/gnuradio/fec/encoder.h | 76 +
gr-fec/include/gnuradio/fec/generic_decoder.h | 242 ++
gr-fec/include/gnuradio/fec/generic_encoder.h | 152 +
gr-fec/include/gnuradio/fec/puncture_bb.h | 105 +
gr-fec/include/gnuradio/fec/puncture_ff.h | 104 +
gr-fec/include/gnuradio/fec/repetition_decoder.h | 82 +
gr-fec/include/gnuradio/fec/repetition_encoder.h | 78 +
gr-fec/include/gnuradio/fec/tagged_decoder.h | 95 +
gr-fec/include/gnuradio/fec/tagged_encoder.h | 75 +
gr-fec/lib/CMakeLists.txt | 39 +-
gr-fec/lib/async_decoder_impl.cc | 223 ++
gr-fec/lib/async_decoder_impl.h | 69 +
gr-fec/lib/async_encoder_impl.cc | 194 ++
gr-fec/lib/async_encoder_impl.h | 71 +
gr-fec/lib/ber_bf_impl.cc | 143 +
.../{decode_ccsds_27_fb_impl.h => ber_bf_impl.h} | 41 +-
gr-fec/lib/ber_tools.cc | 106 +
gr-fec/lib/ber_tools.h | 73 +
gr-fec/lib/cc_decoder_impl.cc | 497 +++
gr-fec/lib/cc_decoder_impl.h | 106 +
gr-fec/lib/cc_encoder_impl.cc | 204 ++
gr-fec/lib/cc_encoder_impl.h | 75 +
gr-fec/lib/ccsds_encoder_impl.cc | 152 +
gr-fec/lib/ccsds_encoder_impl.h | 64 +
gr-fec/lib/conv_bit_corr_bb_impl.cc | 258 ++
gr-fec/lib/conv_bit_corr_bb_impl.h | 97 +
gr-fec/lib/decode_ccsds_27_fb_impl.cc | 28 +-
gr-fec/lib/decode_ccsds_27_fb_impl.h | 2 +-
gr-fec/lib/decoder_impl.cc | 120 +
gr-fec/lib/decoder_impl.h | 56 +
gr-fec/lib/depuncture_bb_impl.cc | 153 +
gr-fec/lib/depuncture_bb_impl.h | 58 +
gr-fec/lib/dummy_decoder_impl.cc | 124 +
gr-fec/lib/dummy_decoder_impl.h | 61 +
gr-fec/lib/dummy_encoder_impl.cc | 99 +
gr-fec/lib/dummy_encoder_impl.h | 57 +
gr-fec/lib/encoder_impl.cc | 113 +
gr-fec/lib/encoder_impl.h | 59 +
gr-fec/lib/generic_decoder.cc | 168 +
gr-fec/lib/generic_encoder.cc | 120 +
gr-fec/lib/puncture_bb_impl.cc | 153 +
gr-fec/lib/puncture_bb_impl.h | 58 +
gr-fec/lib/puncture_ff_impl.cc | 153 +
gr-fec/lib/puncture_ff_impl.h | 58 +
gr-fec/lib/repetition_decoder_impl.cc | 144 +
gr-fec/lib/repetition_decoder_impl.h | 67 +
gr-fec/lib/repetition_encoder_impl.cc | 108 +
gr-fec/lib/repetition_encoder_impl.h | 58 +
gr-fec/lib/tagged_decoder_impl.cc | 92 +
.../lib/tagged_decoder_impl.h | 29 +-
gr-fec/lib/tagged_encoder_impl.cc | 93 +
.../lib/tagged_encoder_impl.h | 29 +-
gr-fec/python/fec/CMakeLists.txt | 12 +
gr-fec/python/fec/__init__.py | 17 +-
gr-fec/python/fec/_qa_helper.py | 90 +
gr-fec/python/fec/bercurve_generator.py | 95 +
gr-fec/python/fec/bitflip.py | 80 +
gr-fec/python/fec/capillary_threaded_decoder.py | 100 +
gr-fec/python/fec/capillary_threaded_encoder.py | 102 +
gr-fec/python/fec/extended_async_encoder.py | 67 +
gr-fec/python/fec/extended_decoder.py | 176 ++
gr-fec/python/fec/extended_encoder.py | 74 +
gr-fec/python/fec/extended_tagged_decoder.py | 175 ++
gr-fec/python/fec/extended_tagged_encoder.py | 82 +
gr-fec/python/fec/fec_test.py | 123 +
gr-fec/python/fec/qa_depuncture.py | 192 ++
gr-fec/python/fec/qa_fecapi_cc.py | 195 ++
gr-fec/python/fec/qa_fecapi_dummy.py | 190 ++
gr-fec/python/fec/qa_fecapi_repetition.py | 161 +
gr-fec/python/fec/qa_puncture.py | 244 ++
gr-fec/python/fec/threaded_decoder.py | 60 +
gr-fec/python/fec/threaded_encoder.py | 59 +
gr-fec/swig/fec_swig.i | 61 +-
gr-qtgui/grc/qtgui_ber_sink_b.xml | 684 ++++
gr-qtgui/grc/qtgui_block_tree.xml | 1 +
gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt | 2 +-
gr-qtgui/include/gnuradio/qtgui/ber_sink_b.h | 91 +
gr-qtgui/lib/CMakeLists.txt | 3 +-
gr-qtgui/lib/NumberDisplayPlot.cc | 63 -
gr-qtgui/lib/ber_sink_b_impl.cc | 401 +++
gr-qtgui/lib/ber_sink_b_impl.h | 111 +
gr-qtgui/swig/qtgui_swig.i | 3 +
grc/base/Block.py | 71 +-
grc/python/Generator.py | 8 +-
grc/python/flow_graph.tmpl | 10 +-
volk/apps/volk_profile.cc | 23 +
volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h | 241 ++
volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h | 396 +++
volk/lib/testqa.cc | 23 +
193 files changed, 39261 insertions(+), 866 deletions(-)
- [Commit-gnuradio] [gnuradio] 44/57: blocks: adds kernels for pack_k_bits and unpack_k_bits., (continued)
- [Commit-gnuradio] [gnuradio] 44/57: blocks: adds kernels for pack_k_bits and unpack_k_bits., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 30/57: runtime: configuring loggers in gr Python module for easy use in Python., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 39/57: digital: modified tagged stream correlate access code., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 37/57: Revert "blocks: add optional argument to deinterleave and interleave ctors to not set relative rate.", git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 42/57: fec: wip: fixing formatting., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 32/57: blocks: add optional argument to deinterleave and interleave ctors to not set relative rate., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 48/57: fec: wip: adding extended encoder for async version., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 47/57: digital: don't need the FEC info for the tagged stream corr access code., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 46/57: blocks: adding an option to swap the order of the output bits of a repack_bits block., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 45/57: fec: wip: using unpack/pack k bits kernels instead of copying logic in here., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 56/57: Merge branch 'fecapi',
git <=
- [Commit-gnuradio] [gnuradio] 51/57: Revert "blocks: adding an option to swap the order of the output bits of a repack_bits block.", git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 22/57: fec: wip: adding block that correlates against an access code and produces a tagged stream ofthe payload (stripped access code)., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 53/57: fec: wip: adding qa code., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 50/57: fec: wip: adding concept of padding for CC encoder/decoder., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 54/57: fec: mostly documentation updates, spell check, etc., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 55/57: fec: wip: fixing up allocated memory; allowing async encoder deployment to be used with CCSDS (packed input requirement)., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 41/57: digital: adding an async message passsing CRC32 calc/check block for PDUs., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 38/57: fec: wip: cleaning up tagged decoder, rep code., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 57/57: digital: fixing up some work done in the fec api development., git, 2014/05/20
- [Commit-gnuradio] [gnuradio] 40/57: fec: wip: adding async (PDU) encoder and decoder blocks., git, 2014/05/20