[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next |
|
Date: |
Thu, 2 Apr 2015 19:15:54 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 50b66458748057fe19dca5b736cc9ece331905d0
Merge: c6b430a f128144
Author: Johnathan Corgan <address@hidden>
Date: Thu Apr 2 11:55:14 2015 -0700
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/hier_block2.h | 48 +++
gnuradio-runtime/lib/flat_flowgraph.cc | 8 +
gnuradio-runtime/lib/flat_flowgraph.h | 4 +
gnuradio-runtime/lib/hier_block2.cc | 93 +++++
gnuradio-runtime/lib/hier_block2_detail.cc | 184 ++++++++++
gnuradio-runtime/lib/hier_block2_detail.h | 4 +
gnuradio-runtime/swig/hier_block2.i | 8 +
gr-digital/grc/digital_chunks_to_symbols.xml | 1 +
.../gnuradio/digital/chunks_to_symbols_XX.h.t | 1 +
gr-digital/lib/chunks_to_symbols_XX_impl.cc.t | 2 +-
gr-digital/lib/chunks_to_symbols_XX_impl.h.t | 2 +-
gr-digital/python/digital/qa_chunks_to_symbols.py | 33 ++
gr-fec/examples/271.127.3.112 | 402 +++++++++++++++++++++
gr-fec/grc/fec_block_tree.xml | 2 +
gr-fec/grc/ldpc_decoder_def_list.xml | 88 +++++
gr-fec/grc/ldpc_encoder_def_list.xml | 75 ++++
gr-fec/include/gnuradio/fec/alist.h | 121 +++++++
gr-fec/include/gnuradio/fec/awgn_bp.h | 175 +++++++++
gr-fec/include/gnuradio/fec/cldpc.h | 115 ++++++
gr-fec/include/gnuradio/fec/generic_decoder.h | 9 +
gr-fec/include/gnuradio/fec/gf2mat.h | 111 ++++++
gr-fec/include/gnuradio/fec/gf2vec.h | 71 ++++
gr-fec/include/gnuradio/fec/ldpc_decoder.h | 79 ++++
gr-fec/include/gnuradio/fec/ldpc_encoder.h | 61 ++++
gr-fec/include/gnuradio/fec/maxstar.h | 99 +++++
gr-fec/lib/CMakeLists.txt | 7 +
gr-fec/lib/alist.cc | 205 +++++++++++
gr-fec/lib/async_decoder_impl.cc | 31 +-
gr-fec/lib/async_encoder_impl.cc | 20 +-
gr-fec/lib/awgn_bp.cc | 259 +++++++++++++
gr-fec/lib/cldpc.cc | 132 +++++++
gr-fec/lib/gf2mat.cc | 193 ++++++++++
gr-fec/lib/gf2vec.cc | 91 +++++
gr-fec/lib/ldpc_decoder.cc | 105 ++++++
gr-fec/lib/ldpc_encoder.cc | 76 ++++
gr-fec/swig/fec_swig.i | 4 +
grc/blocks/options.xml | 16 +
grc/gui/ActionHandler.py | 4 +-
grc/gui/Bars.py | 53 ++-
grc/gui/Connection.py | 6 +-
grc/gui/Dialogs.py | 8 +-
grc/gui/FlowGraph.py | 21 +-
grc/gui/MainWindow.py | 35 +-
grc/gui/Param.py | 30 +-
grc/gui/Preferences.py | 10 +-
grc/gui/PropsDialog.py | 19 +-
grc/python/Generator.py | 16 +-
grc/python/flow_graph.tmpl | 34 +-
grc/scripts/gnuradio-companion | 107 ++++--
49 files changed, 3172 insertions(+), 106 deletions(-)