[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-1012-gdc0af95 |
Date: |
Mon, 1 Apr 2013 22:37:19 +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 dc0af953d402a10a69d89730cfd66bea519c7312 (commit)
via f87c90fe3e2470007121b27018e08c5fe6bcd589 (commit)
via 2a525ac04bcb0a70d193bddf9ba1018a99484904 (commit)
via 888c07f2510c49b5100223121ee02d9faea287d9 (commit)
via 6834e1d4a23ee8b2b6f3fb449c515e6a99d781cd (commit)
via 7e1310eec954597d2e355f601780accc4985146e (commit)
via 4a95aa2fbbe28f046d4925a44d7a0021050ced34 (commit)
via fbd74560b72196fba9de8c6d01378b0715df758a (commit)
via 5438517719dcac700915c7a515e5f5fe4104a3c5 (commit)
via a67bfcc5fcbea9064a05cfdd4bea7b6fab2c531f (commit)
via 4918f83127c63e0d7c1ac8bfe0b0dd0d38dcfefd (commit)
via 4baee9bde3c49662162a7b58aec564e2925f8fda (commit)
via 2d43bacfe5d989c507666f2615f519e48278319e (commit)
via 9b47ed5a0efa26a25a40d438ea8028c51ea18312 (commit)
via 2866af427e343c12abacd1e7454234d73c3e6a84 (commit)
from 007b401cf14fcfc067d11f5e4d2ca1730407803b (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 dc0af953d402a10a69d89730cfd66bea519c7312
Author: Tom Rondeau <address@hidden>
Date: Mon Apr 1 18:26:27 2013 -0400
digital: adding sync_word input to OFDM QA code.
commit f87c90fe3e2470007121b27018e08c5fe6bcd589
Author: Tom Rondeau <address@hidden>
Date: Mon Apr 1 17:58:07 2013 -0400
runtime: fixing missing includes from previous merge conflict.
commit 2a525ac04bcb0a70d193bddf9ba1018a99484904
Merge: fbd7456 888c07f
Author: Tom Rondeau <address@hidden>
Date: Mon Apr 1 12:42:34 2013 -0400
Merge branch 'master' into next
Conflicts:
gnuradio-runtime/include/gr_logger.h
gr-digital/lib/packet_headergenerator_bb_impl.cc
gr-digital/python/ofdm_txrx.py
gr-digital/python/qa_ofdm_txrx.py
gr-digital/python/qa_packet_headergenerator_bb.py
gr-uhd/examples/python/usrp_spectrum_sense.py
commit fbd74560b72196fba9de8c6d01378b0715df758a
Merge: 007b401 4918f83
Author: Tom Rondeau <address@hidden>
Date: Mon Apr 1 12:30:55 2013 -0400
Merge remote-tracking branch 'mbant/sword2' into next
commit 4918f83127c63e0d7c1ac8bfe0b0dd0d38dcfefd
Author: Martin Braun <address@hidden>
Date: Fri Mar 29 16:51:22 2013 +0100
digital: OFDM carrier allocator can now handle the sync words
-----------------------------------------------------------------------
Summary of changes:
docs/doxygen/other/main_page.dox | 1 +
gnuradio-runtime/include/gr_logger.h | 2 +-
gnuradio-runtime/include/gr_tagged_stream_block.h | 18 ++++---
gnuradio-runtime/lib/gr_tagged_stream_block.cc | 4 +-
gr-blocks/include/blocks/tagged_stream_mux.h | 6 +-
.../grc/digital_ofdm_carrier_allocator_cvc.xml | 8 +++-
.../include/digital/ofdm_carrier_allocator_cvc.h | 20 ++++++--
.../include/digital/ofdm_frame_equalizer_vcvc.h | 2 +-
gr-digital/include/digital/packet_header_default.h | 18 ++++++-
gr-digital/include/digital/packet_header_ofdm.h | 7 ++-
.../include/digital/packet_headergenerator_bb.h | 27 ++++++++--
gr-digital/include/digital/packet_headerparser_b.h | 6 ++-
gr-digital/lib/header_payload_demux_impl.h | 22 ++++----
gr-digital/lib/ofdm_carrier_allocator_cvc_impl.cc | 49 ++++++++++++++++----
gr-digital/lib/ofdm_carrier_allocator_cvc_impl.h | 13 +++++-
gr-digital/lib/ofdm_frame_equalizer_vcvc_impl.h | 2 +-
gr-digital/lib/ofdm_serializer_vcc_impl.h | 15 +++---
gr-digital/lib/packet_headergenerator_bb_impl.cc | 27 ++++++-----
gr-digital/lib/packet_headergenerator_bb_impl.h | 10 ++--
gr-digital/lib/packet_headerparser_b_impl.cc | 2 +
gr-digital/python/ofdm_txrx.py | 23 +++------
gr-digital/python/qa_ofdm_carrier_allocator_cvc.py | 47 ++++++++++++++++---
gr-digital/python/qa_ofdm_serializer_vcc.py | 10 ++--
gr-digital/python/qa_ofdm_txrx.py | 3 +
gr-digital/python/qa_packet_headergenerator_bb.py | 4 +-
gr-uhd/examples/python/usrp_spectrum_sense.py | 41 +++++++++++++---
26 files changed, 274 insertions(+), 113 deletions(-)
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-1012-gdc0af95,
git version control <=