[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.1-1192-g2405532 |
Date: |
Sun, 12 May 2013 20:23:27 +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 2405532f945576470d1915a4668b91ff35c05775 (commit)
via 8c8fc5cd99c044ca3a85d1b7e253d05ab9a90098 (commit)
via 0641a4499d751f6facc151889d0ba50910cb0c6d (commit)
via cce6a69305cc475e8a37ba60ac1bc91659fa7f05 (commit)
via 7be24afbf8857a5e827fb536a80d7a83e7b6aa31 (commit)
via 728c6e2138d5eb4f0814dcd3d03c65e628746eab (commit)
from 99b77e1cbd4f4c67b07b3ebefc61f05af15f8d1b (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 2405532f945576470d1915a4668b91ff35c05775
Merge: 8c8fc5c 0641a44
Author: Johnathan Corgan <address@hidden>
Date: Mon May 13 05:53:45 2013 +1000
Merge branch 'master' into next
commit 8c8fc5cd99c044ca3a85d1b7e253d05ab9a90098
Merge: 99b77e1 cce6a69
Author: Johnathan Corgan <address@hidden>
Date: Mon May 13 05:53:20 2013 +1000
Merge remote-tracking branch 'martin/next-ofdm2' into next
commit cce6a69305cc475e8a37ba60ac1bc91659fa7f05
Merge: 9851f23 7be24af
Author: Martin Braun <address@hidden>
Date: Sun May 12 14:16:56 2013 +0200
Merge branch 'master-ofdm', fixed conflicts
-----------------------------------------------------------------------
Summary of changes:
gr-blocks/grc/blocks_block_tree.xml | 1 +
gr-blocks/grc/blocks_tag_gate.xml | 68 +
gr-blocks/include/blocks/CMakeLists.txt | 2 +-
.../blocks/{tagged_stream_to_pdu.h => tag_gate.h} | 33 +-
gr-blocks/lib/CMakeLists.txt | 3 +-
gr-blocks/lib/tag_gate_impl.cc | 79 +
...pdu_to_tagged_stream_impl.h => tag_gate_impl.h} | 28 +-
gr-blocks/python/qa_tag_gate.py | 47 +
gr-blocks/swig/blocks_swig0.i | 3 +
.../ofdm_loopback.grc} | 594 ++++----
gr-digital/examples/ofdm/rx_ofdm.grc | 1554 +++++++++++++-----
gr-digital/examples/ofdm/tx_ofdm.grc | 1721 +++++++++++++++-----
gr-digital/grc/digital_block_tree.xml | 2 +
gr-digital/grc/digital_header_payload_demux.xml | 2 +-
gr-digital/grc/digital_ofdm_chanest_vcvc.xml | 2 +-
gr-digital/grc/digital_ofdm_rx.xml | 174 ++
gr-digital/grc/digital_ofdm_sync_sc_cfb.xml | 17 +-
gr-digital/grc/digital_ofdm_tx.xml | 180 ++
gr-digital/include/digital/ofdm_chanest_vcvc.h | 9 +-
.../include/digital/ofdm_frame_equalizer_vcvc.h | 16 +-
gr-digital/include/digital/ofdm_serializer_vcc.h | 7 +
gr-digital/include/digital/ofdm_sync_sc_cfb.h | 5 +-
gr-digital/lib/header_payload_demux_impl.cc | 6 +-
gr-digital/lib/ofdm_chanest_vcvc_impl.cc | 50 +-
gr-digital/lib/ofdm_equalizer_base.cc | 7 +-
gr-digital/lib/ofdm_equalizer_simpledfe.cc | 10 +-
gr-digital/lib/ofdm_equalizer_static.cc | 6 +-
gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.cc | 78 +-
gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h | 9 +-
gr-digital/lib/ofdm_serializer_vcc_impl.cc | 31 +-
gr-digital/lib/ofdm_serializer_vcc_impl.h | 2 +
gr-digital/lib/ofdm_sync_sc_cfb_impl.cc | 8 +-
gr-digital/lib/ofdm_sync_sc_cfb_impl.h | 2 +-
gr-digital/lib/packet_header_default.cc | 19 +-
gr-digital/lib/packet_header_ofdm.cc | 9 +-
gr-digital/lib/packet_headerparser_b_impl.cc | 5 +
gr-digital/python/CMakeLists.txt | 2 +
gr-digital/python/ofdm_txrx.py | 280 +++-
gr-digital/python/qa_ofdm_chanest_vcvc.py | 26 +-
gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py | 219 +++-
gr-digital/python/qa_ofdm_serializer_vcc.py | 108 +-
gr-digital/python/qa_ofdm_sync_sc_cfb.py | 117 +-
gr-digital/python/qa_ofdm_txrx.py | 120 ++-
gr-digital/python/qa_packet_headerparser_b.py | 16 +-
44 files changed, 4235 insertions(+), 1442 deletions(-)
create mode 100644 gr-blocks/grc/blocks_tag_gate.xml
copy gr-blocks/include/blocks/{tagged_stream_to_pdu.h => tag_gate.h} (59%)
create mode 100644 gr-blocks/lib/tag_gate_impl.cc
copy gr-blocks/lib/{pdu_to_tagged_stream_impl.h => tag_gate_impl.h} (68%)
create mode 100755 gr-blocks/python/qa_tag_gate.py
copy gr-digital/examples/{demod/digital_freq_lock.grc =>
ofdm/ofdm_loopback.grc} (67%)
create mode 100644 gr-digital/grc/digital_ofdm_rx.xml
create mode 100644 gr-digital/grc/digital_ofdm_tx.xml
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.1-1192-g2405532,
git version control <=