[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
Date: |
Thu, 15 Oct 2015 21:21:34 +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 de3f86e60c4c9b64b7ba887e315aef2c53143213
Merge: 6734fa8 616fee5
Author: Johnathan Corgan <address@hidden>
Date: Thu Oct 15 14:13:04 2015 -0700
Merge branch 'master' into next
gr-fec/CMakeLists.txt | 5 +
gr-fec/{examples => apps}/CMakeLists.txt | 50 +-
gr-fec/doc/fec.dox | 282 +-
gr-fec/examples/CMakeLists.txt | 2 +-
gr-fec/examples/ber_curve_gen.grc | 2250 ++++----
.../{ber_curve_gen.grc => ber_curve_gen_ldpc.grc} | 2252 +++-----
...decoders.grc => fecapi_async_ldpc_decoders.grc} | 1224 ++--
...decoders.grc => fecapi_async_ldpc_encoders.grc} | 1370 +----
...agged_decoders.grc => fecapi_ldpc_decoders.grc} | 774 +--
...agged_decoders.grc => fecapi_ldpc_encoders.grc} | 1262 ++---
gr-fec/examples/fecapi_tagged_decoders.grc | 23 +-
...ecoders.grc => fecapi_tagged_ldpc_decoders.grc} | 1315 +++--
...ecoders.grc => fecapi_tagged_ldpc_encoders.grc} | 1232 ++--
gr-fec/grc/fec_block_tree.xml | 11 +-
gr-fec/grc/ldpc_encoder_def_list.xml | 106 +-
gr-fec/grc/variable_ldpc_G_matrix_object.xml | 43 +
gr-fec/grc/variable_ldpc_H_matrix_object.xml | 55 +
gr-fec/grc/variable_ldpc_bit_flip_decoder.xml | 88 +
gr-fec/grc/variable_ldpc_encoder_G.xml | 72 +
...er_def_list.xml => variable_ldpc_encoder_H.xml} | 31 +-
gr-fec/include/gnuradio/fec/CMakeLists.txt | 18 +-
gr-fec/include/gnuradio/fec/fec_mtrx.h | 165 +
gr-fec/include/gnuradio/fec/gf2vec.h | 57 +-
gr-fec/include/gnuradio/fec/ldpc_G_matrix.h | 99 +
gr-fec/include/gnuradio/fec/ldpc_H_matrix.h | 103 +
.../include/gnuradio/fec/ldpc_bit_flip_decoder.h | 91 +
gr-fec/include/gnuradio/fec/ldpc_decoder.h | 72 +-
gr-fec/include/gnuradio/fec/ldpc_encoder.h | 36 +-
.../include/gnuradio/fec/ldpc_gen_mtrx_encoder.h | 76 +
.../{ldpc_encoder.h => ldpc_par_mtrx_encoder.h} | 49 +-
gr-fec/{examples => ldpc_alist}/271.127.3.112 | 0
gr-fec/{examples => ldpc_alist}/CMakeLists.txt | 44 +-
gr-fec/ldpc_alist/PNB2_512_23C1.alist | 5924 ++++++++++++++++++++
gr-fec/ldpc_alist/n_0100_k_0023_gap_10.alist | 181 +
gr-fec/ldpc_alist/n_0100_k_0027_gap_04.alist | 177 +
gr-fec/ldpc_alist/n_0100_k_0042_gap_02.alist | 162 +
gr-fec/ldpc_alist/n_0100_k_0058_gen_matrix.alist | 162 +
gr-fec/ldpc_alist/n_0300_k_0103_gap_24.alist | 501 ++
gr-fec/ldpc_alist/n_0300_k_0122_gap_06.alist | 482 ++
gr-fec/ldpc_alist/n_0300_k_0152_gap_03.alist | 452 ++
gr-fec/ldpc_alist/n_0500_k_0127_gap_21.alist | 877 +++
gr-fec/ldpc_alist/n_0500_k_0202_gap_11.alist | 802 +++
gr-fec/ldpc_alist/n_0512_k_0130_gap_21.alist | 898 +++
gr-fec/ldpc_alist/n_0700_k_0282_gap_16.alist | 1122 ++++
gr-fec/ldpc_alist/n_1100_k_0442_gap_24.alist | 1762 ++++++
gr-fec/ldpc_alist/n_1300_k_0522_gap_30.alist | 2082 +++++++
gr-fec/ldpc_alist/n_1800_k_0902_gap_28.alist | 2702 +++++++++
gr-fec/ldpc_alist/n_2400_k_1198_gap_33.alist | 3602 ++++++++++++
gr-fec/ldpc_alist/n_2400_k_1198_gen_matrix.alist | 3602 ++++++++++++
gr-fec/ldpc_alist/simple_g_matrix.alist | 17 +
gr-fec/lib/CMakeLists.txt | 18 +-
gr-fec/lib/cldpc.cc | 71 +-
gr-fec/lib/fec_mtrx_impl.cc | 504 ++
gr-fec/lib/fec_mtrx_impl.h | 98 +
gr-fec/lib/gf2vec.cc | 105 +-
gr-fec/lib/ldpc_G_matrix_impl.cc | 293 +
gr-fec/lib/ldpc_G_matrix_impl.h | 105 +
gr-fec/lib/ldpc_H_matrix_impl.cc | 432 ++
gr-fec/lib/ldpc_H_matrix_impl.h | 126 +
gr-fec/lib/ldpc_bit_flip_decoder_impl.cc | 119 +
gr-fec/lib/ldpc_bit_flip_decoder_impl.h | 61 +
gr-fec/lib/ldpc_decoder.cc | 187 +-
gr-fec/lib/ldpc_encoder.cc | 76 -
gr-fec/lib/ldpc_encoder_impl.cc | 83 +
.../fec/ldpc_encoder.h => lib/ldpc_encoder_impl.h} | 32 +-
gr-fec/lib/ldpc_gen_mtrx_encoder_impl.cc | 111 +
gr-fec/lib/ldpc_gen_mtrx_encoder_impl.h | 64 +
gr-fec/lib/ldpc_par_mtrx_encoder_impl.cc | 124 +
gr-fec/lib/ldpc_par_mtrx_encoder_impl.h | 64 +
gr-fec/python/fec/CMakeLists.txt | 10 +
.../{examples => python/fec/LDPC}/CMakeLists.txt | 30 +-
gr-fec/python/fec/LDPC/Generate_LDPC_matrix.py | 79 +
.../fec/LDPC/Generate_LDPC_matrix_functions.py | 683 +++
gr-fec/python/fec/LDPC/README | 4 +
.../CMakeLists.txt => python/fec/LDPC/__init__.py} | 30 +-
gr-fec/python/fec/qa_fecapi_ldpc.py | 305 +
gr-fec/swig/CMakeLists.txt | 4 +
gr-fec/swig/fec_swig.i | 39 +-
gr-fec/swig/ldpc.i | 34 +
gr-qtgui/lib/ber_sink_b_impl.cc | 2 +-
80 files changed, 35325 insertions(+), 7332 deletions(-)