[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.
|
From: |
git version control |
|
Subject: |
[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4-864-ge965a5b |
|
Date: |
Fri, 15 Mar 2013 17:24:44 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/gnuradio".
The branch, next has been updated
via e965a5bb209ad46a509ccd21f393667fd69d95f9 (commit)
via 27990ca9e236931e39a830e48f0a1efe13ec085f (commit)
via c2ef28e50696170f0347118d9a13fe38f3255fae (commit)
via 928a9ada1c7caa739ee57f49da4446a04d301b12 (commit)
via c2c7d53afe862390ec1d6490309d2d0f4b96bf50 (commit)
via f968b36d4ed2b194111585605f9a1b5367638fb3 (commit)
from 2bf9c4cb4b0b426690f353fc1662a13e70c0d5e0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e965a5bb209ad46a509ccd21f393667fd69d95f9
Merge: 2bf9c4c 27990ca
Author: Johnathan Corgan <address@hidden>
Date: Fri Mar 15 09:57:31 2013 -0700
Merge branch 'ofdm-master' into ofdm-next
Added fixups for next branch changes
Conflicts:
CMakeLists.txt
gnuradio-core/src/lib/io/gr_message_sink.cc
gnuradio-core/src/lib/io/gr_message_sink.h
gnuradio-core/src/lib/io/gr_message_sink.i
gnuradio-core/src/lib/io/gr_message_source.cc
gnuradio-core/src/lib/io/gr_message_source.h
gnuradio-core/src/lib/io/gr_message_source.i
gr-blocks/CMakeLists.txt
gr-digital/CMakeLists.txt
gr-digital/grc/digital_block_tree.xml
gr-digital/include/digital/CMakeLists.txt
gr-digital/include/digital_ofdm_cyclic_prefixer.h
gr-digital/lib/CMakeLists.txt
gr-digital/lib/digital_ofdm_cyclic_prefixer.cc
gr-digital/lib/ofdm_cyclic_prefixer_impl.h
gr-digital/python/CMakeLists.txt
gr-digital/swig/CMakeLists.txt
gr-digital/swig/digital_swig.i
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 1 -
gnuradio-core/src/lib/gengen/gr_vector_sink_X.cc.t | 11 +-
gnuradio-core/src/lib/gengen/gr_vector_sink_X.h.t | 2 +
gnuradio-core/src/lib/gengen/gr_vector_sink_X.i.t | 1 +
.../src/lib/gengen/gr_vector_source_X.cc.t | 67 +-
.../src/lib/gengen/gr_vector_source_X.h.t | 11 +-
.../src/lib/gengen/gr_vector_source_X.i.t | 6 +-
gnuradio-core/src/lib/runtime/CMakeLists.txt | 3 +
.../src/lib/runtime/gr_tagged_stream_block.cc | 144 +++
.../src/lib/runtime/gr_tagged_stream_block.h | 138 +++
.../src/lib/runtime/gr_tagged_stream_block.i | 30 +
gnuradio-core/src/lib/runtime/runtime.i | 2 +
gnuradio-core/src/lib/swig/gnuradio.i | 5 +-
.../src/lib/swig/gnuradio_swig_bug_workaround.h | 1 +
gr-analog/grc/analog_block_tree.xml | 1 +
gr-analog/grc/analog_plateau_detector_fb.xml | 26 +
gr-analog/include/analog/CMakeLists.txt | 3 +-
gr-analog/include/analog/plateau_detector_fb.h | 71 ++
gr-analog/lib/CMakeLists.txt | 1 +
gr-analog/lib/plateau_detector_fb_impl.cc | 82 ++
gr-analog/lib/plateau_detector_fb_impl.h | 50 +
gr-analog/python/CMakeLists.txt | 1 +
gr-analog/python/qa_plateau_detector_fb.py | 46 +
gr-analog/swig/analog_swig.i | 3 +
gr-blocks/CMakeLists.txt | 1 +
gr-blocks/grc/blocks_block_tree.xml | 1 +
gr-blocks/grc/blocks_repack_bits_bb.xml | 46 +
gr-blocks/grc/blocks_tagged_stream_mux.xml | 65 ++
gr-blocks/include/blocks/CMakeLists.txt | 6 +-
gr-blocks/include/blocks/message_sink.h | 5 +-
gr-blocks/include/blocks/message_source.h | 2 +
gr-blocks/include/blocks/repack_bits_bb.h | 65 ++
gr-blocks/include/blocks/tagged_stream_mux.h | 61 +
gr-blocks/lib/CMakeLists.txt | 6 +-
gr-blocks/lib/message_sink_impl.cc | 79 ++-
gr-blocks/lib/message_sink_impl.h | 6 +
gr-blocks/lib/message_source_impl.cc | 100 ++-
gr-blocks/lib/message_source_impl.h | 6 +
gr-blocks/lib/repack_bits_bb_impl.cc | 123 +++
gr-blocks/lib/repack_bits_bb_impl.h | 58 +
gr-blocks/lib/tagged_stream_mux_impl.cc | 93 ++
gr-blocks/lib/tagged_stream_mux_impl.h | 54 +
gr-blocks/python/qa_message_tags.py | 27 +
gr-blocks/python/qa_repack_bits_bb.py | 127 +++
gr-blocks/python/qa_tagged_stream_mux.py | 111 ++
gr-blocks/swig/blocks_swig.i | 12 +
gr-digital/CMakeLists.txt | 3 +
gr-digital/examples/ofdm/ofdm_bugsquatch.py | 22 +
gr-digital/examples/ofdm/rx_ofdm.grc | 1092 +++++++++++++++++++
gr-digital/examples/ofdm/tx_ofdm.grc | 1143 ++++++++++++++++++++
gr-digital/grc/CMakeLists.txt | 4 +-
gr-digital/grc/digital_block_tree.xml | 40 +-
gr-digital/grc/digital_crc32_bb.xml | 33 +
gr-digital/grc/digital_header_payload_demux.xml | 94 ++
.../grc/digital_ofdm_carrier_allocator_cvc.xml | 45 +
gr-digital/grc/digital_ofdm_chanest_vcvc.xml | 61 +
gr-digital/grc/digital_ofdm_cyclic_prefixer.xml | 20 +-
.../grc/digital_ofdm_frame_equalizer_vcvc.xml | 45 +
gr-digital/grc/digital_ofdm_mod2.xml | 65 ++
gr-digital/grc/digital_ofdm_serializer_vcc.xml | 50 +
gr-digital/grc/digital_ofdm_sync_sc_cfb.xml | 29 +
.../grc/digital_packet_headergenerator_bb.xml | 19 +
.../digital_packet_headergenerator_bb_default.xml | 26 +
gr-digital/grc/digital_packet_headerparser_b.xml | 19 +
.../grc/digital_packet_headerparser_b_default.xml | 26 +
gr-digital/grc/digital_scale_tags.xml | 31 +
gr-digital/include/CMakeLists.txt | 34 +
gr-digital/include/digital/CMakeLists.txt | 33 +-
gr-digital/include/digital/constellation.h | 2 +-
gr-digital/include/digital/header_payload_demux.h | 90 ++
.../include/digital/ofdm_frame_equalizer_vcvc.h | 63 ++
gr-digital/include/digital/ofdm_serializer_vcc.h | 91 ++
gr-digital/include/digital/packet_header_default.h | 101 ++
gr-digital/include/digital/packet_header_ofdm.h | 83 ++
.../include/digital/packet_headergenerator_bb.h | 57 +
gr-digital/include/digital/packet_headerparser_b.h | 65 ++
gr-digital/include/digital/scale_tags.h | 58 +
gr-digital/include/digital/tagged_stream_check.h | 55 +
gr-digital/include/digital/ts_insert_zeros_cc.h | 55 +
gr-digital/include/digital_crc32_bb.h | 67 ++
.../include/digital_ofdm_carrier_allocator_cvc.h | 116 ++
gr-digital/include/digital_ofdm_chanest_vcvc.h | 133 +++
gr-digital/include/digital_ofdm_cyclic_prefixer.h | 95 ++
gr-digital/include/digital_ofdm_equalizer_base.h | 102 ++
.../include/digital_ofdm_equalizer_simpledfe.h | 126 +++
gr-digital/include/digital_ofdm_equalizer_static.h | 97 ++
gr-digital/include/digital_ofdm_sync_sc_cfb.h | 79 ++
gr-digital/lib/CMakeLists.txt | 44 +-
gr-digital/lib/digital_crc32_bb.cc | 102 ++
.../lib/digital_ofdm_carrier_allocator_cvc.cc | 156 +++
gr-digital/lib/digital_ofdm_chanest_vcvc.cc | 281 +++++
gr-digital/lib/digital_ofdm_cyclic_prefixer.cc | 162 +++
gr-digital/lib/digital_ofdm_equalizer_base.cc | 116 ++
gr-digital/lib/digital_ofdm_equalizer_simpledfe.cc | 101 ++
gr-digital/lib/digital_ofdm_equalizer_static.cc | 90 ++
gr-digital/lib/digital_ofdm_sync_sc_cfb.cc | 109 ++
gr-digital/lib/header_payload_demux_impl.cc | 292 +++++
gr-digital/lib/header_payload_demux_impl.h | 85 ++
gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc | 89 ++
gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h | 57 +
gr-digital/lib/ofdm_serializer_vcc_impl.cc | 205 ++++
gr-digital/lib/ofdm_serializer_vcc_impl.h | 69 ++
gr-digital/lib/packet_header_default.cc | 128 +++
gr-digital/lib/packet_header_ofdm.cc | 115 ++
gr-digital/lib/packet_headergenerator_bb_impl.cc | 90 ++
gr-digital/lib/packet_headergenerator_bb_impl.h | 55 +
gr-digital/lib/packet_headerparser_b_impl.cc | 90 ++
gr-digital/lib/packet_headerparser_b_impl.h | 48 +
gr-digital/lib/scale_tags_impl.cc | 84 ++
gr-digital/lib/scale_tags_impl.h | 51 +
gr-digital/lib/tagged_stream_check_impl.cc | 112 ++
gr-digital/lib/tagged_stream_check_impl.h | 53 +
gr-digital/lib/ts_insert_zeros_cc_impl.cc | 130 +++
gr-digital/lib/ts_insert_zeros_cc_impl.h | 54 +
gr-digital/python/CMakeLists.txt | 7 +-
gr-digital/python/__init__.py | 2 +
gr-digital/python/fftshift.py | 31 +
gr-digital/python/ofdm_txrx.py | 268 +++++
gr-digital/python/qa_crc32_bb.py | 150 +++
gr-digital/python/qa_header_payload_demux.py | 78 ++
gr-digital/python/qa_ofdm_carrier_allocator_cvc.py | 154 +++
gr-digital/python/qa_ofdm_chanest_vcvc.py | 284 +++++
gr-digital/python/qa_ofdm_cyclic_prefixer.py | 95 ++
gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py | 161 +++
gr-digital/python/qa_ofdm_serializer_vcc.py | 214 ++++
gr-digital/python/qa_ofdm_sync_sc_cfb.py | 203 ++++
gr-digital/python/qa_ofdm_txrx.py | 58 +
gr-digital/python/qa_packet_headergenerator_bb.py | 157 +++
gr-digital/python/qa_packet_headerparser_b.py | 72 ++
gr-digital/python/qa_scale_tags.py | 57 +
gr-digital/python/qa_ts_insert_zeros.py | 78 ++
gr-digital/python/utils/tagged_streams.py | 112 ++
gr-digital/swig/CMakeLists.txt | 9 +
gr-digital/swig/digital_crc32_bb.i | 32 +
.../swig/digital_ofdm_carrier_allocator_cvc.i | 37 +
gr-digital/swig/digital_ofdm_chanest_vcvc.i | 40 +
gr-digital/swig/digital_ofdm_cyclic_prefixer.i | 35 +
gr-digital/swig/digital_ofdm_equalizer_base.i | 64 ++
gr-digital/swig/digital_ofdm_equalizer_simpledfe.i | 58 +
gr-digital/swig/digital_ofdm_equalizer_static.i | 55 +
gr-digital/swig/digital_ofdm_sync_sc_cfb.i | 33 +
gr-digital/swig/digital_swig.i | 105 ++-
gr-digital/swig/packet_header.i | 34 +
grc/blocks/gr_vector_source_x.xml | 11 +-
144 files changed, 11746 insertions(+), 145 deletions(-)
create mode 100644 gnuradio-core/src/lib/runtime/gr_tagged_stream_block.cc
create mode 100644 gnuradio-core/src/lib/runtime/gr_tagged_stream_block.h
create mode 100644 gnuradio-core/src/lib/runtime/gr_tagged_stream_block.i
create mode 100644 gr-analog/grc/analog_plateau_detector_fb.xml
create mode 100644 gr-analog/include/analog/plateau_detector_fb.h
create mode 100644 gr-analog/lib/plateau_detector_fb_impl.cc
create mode 100644 gr-analog/lib/plateau_detector_fb_impl.h
create mode 100755 gr-analog/python/qa_plateau_detector_fb.py
create mode 100644 gr-blocks/grc/blocks_repack_bits_bb.xml
create mode 100644 gr-blocks/grc/blocks_tagged_stream_mux.xml
create mode 100644 gr-blocks/include/blocks/repack_bits_bb.h
create mode 100644 gr-blocks/include/blocks/tagged_stream_mux.h
create mode 100644 gr-blocks/lib/repack_bits_bb_impl.cc
create mode 100644 gr-blocks/lib/repack_bits_bb_impl.h
create mode 100644 gr-blocks/lib/tagged_stream_mux_impl.cc
create mode 100644 gr-blocks/lib/tagged_stream_mux_impl.h
create mode 100644 gr-blocks/python/qa_message_tags.py
create mode 100755 gr-blocks/python/qa_repack_bits_bb.py
create mode 100755 gr-blocks/python/qa_tagged_stream_mux.py
create mode 100644 gr-digital/examples/ofdm/ofdm_bugsquatch.py
create mode 100644 gr-digital/examples/ofdm/rx_ofdm.grc
create mode 100644 gr-digital/examples/ofdm/tx_ofdm.grc
create mode 100644 gr-digital/grc/digital_crc32_bb.xml
create mode 100644 gr-digital/grc/digital_header_payload_demux.xml
create mode 100644 gr-digital/grc/digital_ofdm_carrier_allocator_cvc.xml
create mode 100644 gr-digital/grc/digital_ofdm_chanest_vcvc.xml
create mode 100644 gr-digital/grc/digital_ofdm_frame_equalizer_vcvc.xml
create mode 100644 gr-digital/grc/digital_ofdm_mod2.xml
create mode 100644 gr-digital/grc/digital_ofdm_serializer_vcc.xml
create mode 100644 gr-digital/grc/digital_ofdm_sync_sc_cfb.xml
create mode 100644 gr-digital/grc/digital_packet_headergenerator_bb.xml
create mode 100644 gr-digital/grc/digital_packet_headergenerator_bb_default.xml
create mode 100644 gr-digital/grc/digital_packet_headerparser_b.xml
create mode 100644 gr-digital/grc/digital_packet_headerparser_b_default.xml
create mode 100644 gr-digital/grc/digital_scale_tags.xml
create mode 100644 gr-digital/include/CMakeLists.txt
create mode 100644 gr-digital/include/digital/header_payload_demux.h
create mode 100644 gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h
create mode 100644 gr-digital/include/digital/ofdm_serializer_vcc.h
create mode 100644 gr-digital/include/digital/packet_header_default.h
create mode 100644 gr-digital/include/digital/packet_header_ofdm.h
create mode 100644 gr-digital/include/digital/packet_headergenerator_bb.h
create mode 100644 gr-digital/include/digital/packet_headerparser_b.h
create mode 100644 gr-digital/include/digital/scale_tags.h
create mode 100644 gr-digital/include/digital/tagged_stream_check.h
create mode 100644 gr-digital/include/digital/ts_insert_zeros_cc.h
create mode 100644 gr-digital/include/digital_crc32_bb.h
create mode 100644 gr-digital/include/digital_ofdm_carrier_allocator_cvc.h
create mode 100644 gr-digital/include/digital_ofdm_chanest_vcvc.h
create mode 100644 gr-digital/include/digital_ofdm_cyclic_prefixer.h
create mode 100644 gr-digital/include/digital_ofdm_equalizer_base.h
create mode 100644 gr-digital/include/digital_ofdm_equalizer_simpledfe.h
create mode 100644 gr-digital/include/digital_ofdm_equalizer_static.h
create mode 100644 gr-digital/include/digital_ofdm_sync_sc_cfb.h
create mode 100644 gr-digital/lib/digital_crc32_bb.cc
create mode 100644 gr-digital/lib/digital_ofdm_carrier_allocator_cvc.cc
create mode 100644 gr-digital/lib/digital_ofdm_chanest_vcvc.cc
create mode 100644 gr-digital/lib/digital_ofdm_cyclic_prefixer.cc
create mode 100644 gr-digital/lib/digital_ofdm_equalizer_base.cc
create mode 100644 gr-digital/lib/digital_ofdm_equalizer_simpledfe.cc
create mode 100644 gr-digital/lib/digital_ofdm_equalizer_static.cc
create mode 100644 gr-digital/lib/digital_ofdm_sync_sc_cfb.cc
create mode 100644 gr-digital/lib/header_payload_demux_impl.cc
create mode 100644 gr-digital/lib/header_payload_demux_impl.h
create mode 100644 gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc
create mode 100644 gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h
create mode 100644 gr-digital/lib/ofdm_serializer_vcc_impl.cc
create mode 100644 gr-digital/lib/ofdm_serializer_vcc_impl.h
create mode 100644 gr-digital/lib/packet_header_default.cc
create mode 100644 gr-digital/lib/packet_header_ofdm.cc
create mode 100644 gr-digital/lib/packet_headergenerator_bb_impl.cc
create mode 100644 gr-digital/lib/packet_headergenerator_bb_impl.h
create mode 100644 gr-digital/lib/packet_headerparser_b_impl.cc
create mode 100644 gr-digital/lib/packet_headerparser_b_impl.h
create mode 100644 gr-digital/lib/scale_tags_impl.cc
create mode 100644 gr-digital/lib/scale_tags_impl.h
create mode 100644 gr-digital/lib/tagged_stream_check_impl.cc
create mode 100644 gr-digital/lib/tagged_stream_check_impl.h
create mode 100644 gr-digital/lib/ts_insert_zeros_cc_impl.cc
create mode 100644 gr-digital/lib/ts_insert_zeros_cc_impl.h
create mode 100644 gr-digital/python/fftshift.py
create mode 100644 gr-digital/python/ofdm_txrx.py
create mode 100755 gr-digital/python/qa_crc32_bb.py
create mode 100755 gr-digital/python/qa_header_payload_demux.py
create mode 100755 gr-digital/python/qa_ofdm_carrier_allocator_cvc.py
create mode 100755 gr-digital/python/qa_ofdm_chanest_vcvc.py
create mode 100755 gr-digital/python/qa_ofdm_cyclic_prefixer.py
create mode 100755 gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py
create mode 100755 gr-digital/python/qa_ofdm_serializer_vcc.py
create mode 100755 gr-digital/python/qa_ofdm_sync_sc_cfb.py
create mode 100755 gr-digital/python/qa_ofdm_txrx.py
create mode 100755 gr-digital/python/qa_packet_headergenerator_bb.py
create mode 100755 gr-digital/python/qa_packet_headerparser_b.py
create mode 100755 gr-digital/python/qa_scale_tags.py
create mode 100644 gr-digital/python/qa_ts_insert_zeros.py
create mode 100644 gr-digital/python/utils/tagged_streams.py
create mode 100644 gr-digital/swig/digital_crc32_bb.i
create mode 100644 gr-digital/swig/digital_ofdm_carrier_allocator_cvc.i
create mode 100644 gr-digital/swig/digital_ofdm_chanest_vcvc.i
create mode 100644 gr-digital/swig/digital_ofdm_cyclic_prefixer.i
create mode 100644 gr-digital/swig/digital_ofdm_equalizer_base.i
create mode 100644 gr-digital/swig/digital_ofdm_equalizer_simpledfe.i
create mode 100644 gr-digital/swig/digital_ofdm_equalizer_static.i
create mode 100644 gr-digital/swig/digital_ofdm_sync_sc_cfb.i
create mode 100644 gr-digital/swig/packet_header.i
hooks/post-receive
--
git://gnuradio.org/gnuradio
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4-864-ge965a5b,
git version control <=