[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] git://gnuradio.org/jblum branch, next, updated. 60be27
|
From: |
git version control |
|
Subject: |
[Commit-gnuradio] git://gnuradio.org/jblum branch, next, updated. 60be272e2e2f086ee4c9a12f9ca42d774e917141 |
|
Date: |
Fri, 13 Jan 2012 19:57:48 +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/jblum".
The branch, next has been updated
via 60be272e2e2f086ee4c9a12f9ca42d774e917141 (commit)
via 420efa5c646c8bcb05cb131773d36eb339b05f4e (commit)
via 72d1ff01ca68f798befc3d58b61bd30c76e42c4a (commit)
via cc0949bc08555163afdfb2062ec099f67136c970 (commit)
via 1fc3b145a8cd8aa02cf31d71df483fe78759c18c (commit)
via a98edbde7ab60cab244bf0d849e293cad7672b5a (commit)
via cdda4a586bef2ba7300c04641ac9fb550566f859 (commit)
via 9ce32622bdf9244b3e3df379116b3fd1c1e0fb2d (commit)
via d35c6bd9eeffc40c9a9a15e9a000df47990ff6d6 (commit)
via ebdfd5e17d19b62feca218bd2a7ddbaec9ce0063 (commit)
via aaf6444f6f51319491b7bafc70c2e641a551deb6 (commit)
via 9c45fe54ec0a2573538662083b286b96ebc631f3 (commit)
via 1b80996597fc1800c28e17f77b7cb09f9783d290 (commit)
via e337d7ce6b89403d68cfe75177811ec23571abe5 (commit)
via 963b3dd91cd2204c601dc6325cc5b159e927054c (commit)
via 1561b416702a26d53f0bbd5879925534c0ff82b2 (commit)
via 83b3e37d09181daa82584327d2614eeca38cf027 (commit)
via d2d0da6f500961e910be59ff52baaec256f4432d (commit)
via d94c47d652d170760ffca728dc61e45d629fcc04 (commit)
via ab7cfce4a78dbb95a7c8871f56f4cb037e5b1bb2 (commit)
via 5b9769b7d7f2734bf4c5e7aff347fa74da41b5d2 (commit)
via 72e8cc83d795ed49e1cb78e305e32dca892d0bed (commit)
via 0ab3f9fa4ccd0e0f464dabc384832c315ef4296a (commit)
via 12825f5fdfffd831a36a04695176c4c46f0a03b5 (commit)
via 0644c4bf65b35b6494553cd75623f65e8e4a4ba3 (commit)
via 10d65867b80f796da27c82443734cc20e99b672e (commit)
via 68301f5ef8af45bfcfe8b66cf75631f322267a7b (commit)
via d87f67134ab6c28bc932b63c5315c33b0e293fd4 (commit)
via 4c6316e12456650b56fab2aa5bbca273a972b1c6 (commit)
via 2ed887b69a3b15840830998c4e6157176d427f60 (commit)
via a64f22095bb5263fc939dec41eb0c00a26e0692a (commit)
via cece444e4de92535a53152fd090e9fa33f60b692 (commit)
via 230e11b80ccec9acf77c1da13230bc773dbbee28 (commit)
via 9716da257dcc3acbbc7ff8d9d79c1bc52c85b874 (commit)
via 810f72a7a3c7555636d64208886642970ea74188 (commit)
via b53f0dfb6bbd0d2c0233ba3ee192a551b111d907 (commit)
via 8bbb1388a1fd3519abe37514fceafaaf62844739 (commit)
via dd84c8dfcb30617dbac56f49a57c1e363afe643b (commit)
via 9838bb040af5eb21cd88dbc9aae8d4bdf2838854 (commit)
via 6f0aee4f7a200f87c6fbe23c12fb01cbda872608 (commit)
via 529ffdd0d60241a96b6daa72a1f942d6a92a3535 (commit)
via 59ae7f87cc52e28a39b04895f2977624552f6f1d (commit)
via 6e52e9f86b40ccc38ee21068983936113e6b53dc (commit)
via 1091192d27aab20694e1597868df4962b39ad060 (commit)
via 8e134f11639deeadd0ed242e0f12360ef628d495 (commit)
via ef4d48de26b64d89851a93fc5402b33fcc1a809f (commit)
via a4d62472975aaeb50fa96c360c4b24d3ad84cf6e (commit)
via 0bf8934a7f1bf41916a5f7562b250c18a87034c7 (commit)
via 3d92c79e311f40cb2f3839b5ac68eab76c476408 (commit)
via 7790082f3618a6a90cbc97e2f7dd142d604b52af (commit)
via 685c924703f11a794564a72cd7c580f93833b146 (commit)
via 36dda1f11620c6c9db63036d76a67b3be3f711bc (commit)
via 062f4f37c8dd543cbd29ab4a4745534497c920a8 (commit)
via 886e3c258ff40b4d10e7e8fc28912f14565a4fd1 (commit)
via 2db40bb40eda996bf47417a04ec001acb422d3d9 (commit)
via 91e29b5819955818671dae779203ffa8f49b66c4 (commit)
via 55ff1160c9e0d49028c52296fa920428d30fd7c3 (commit)
via 74c53aa4c5b9aeac590b803b12601bcc9c8b9b60 (commit)
via ceb18ce1c1342477d0704edfaa3e775830a999e4 (commit)
via 858e3582a108cfea8040f59628698e9394558092 (commit)
via 6a78e0a8ae6dc17a12ab5e397f1452a1a363e7d1 (commit)
via c1c68974a6677f6dd81b1fb6e3c129e8d08c1fd0 (commit)
via 5cd411a7e260b0721fecbac6c53b0717b2adf7e6 (commit)
via 5faab4fbcf423cc614d53f0f3c557c2f055b7ed0 (commit)
via cb3289d1494339cb0ac20bed080a0d37b99ab4fb (commit)
from 25ce466010ec5eda1f42d3525d5eaea495f6bb3c (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 60be272e2e2f086ee4c9a12f9ca42d774e917141
Merge: 420efa5 72d1ff0
Author: Josh Blum <address@hidden>
Date: Fri Jan 13 11:57:48 2012 -0800
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
commit 420efa5c646c8bcb05cb131773d36eb339b05f4e
Merge: 25ce466 a98edbd
Author: Josh Blum <address@hidden>
Date: Fri Jan 13 11:57:44 2012 -0800
Merge branch 'new_blocks' into next
commit 72d1ff01ca68f798befc3d58b61bd30c76e42c4a
Merge: cdda4a5 cc0949b
Author: Johnathan Corgan <address@hidden>
Date: Fri Jan 13 08:07:43 2012 -0800
Merge branch 'master' into next
commit cc0949bc08555163afdfb2062ec099f67136c970
Merge: 9ce3262 1fc3b14
Author: Johnathan Corgan <address@hidden>
Date: Fri Jan 13 08:07:26 2012 -0800
Merge branch 'maint'
commit 1fc3b145a8cd8aa02cf31d71df483fe78759c18c
Author: Jaroslav Skarvada <address@hidden>
Date: Fri Jan 13 08:06:47 2012 -0800
Fix compilation with gcc-4.7
commit cdda4a586bef2ba7300c04641ac9fb550566f859
Merge: aaf6444 9ce3262
Author: Johnathan Corgan <address@hidden>
Date: Sat Jan 7 12:25:30 2012 -0800
Merge branch 'master' into next
* Use -s ours to skip over release commits on master
commit 9ce32622bdf9244b3e3df379116b3fd1c1e0fb2d
Author: Johnathan Corgan <address@hidden>
Date: Sat Jan 7 12:22:31 2012 -0800
build: update revision to 3.5.2git
commit d35c6bd9eeffc40c9a9a15e9a000df47990ff6d6
Author: Johnathan Corgan <address@hidden>
Date: Sat Jan 7 10:57:31 2012 -0800
build: update revision to 3.5.1
commit ebdfd5e17d19b62feca218bd2a7ddbaec9ce0063
Author: Johnathan Corgan <address@hidden>
Date: Sat Jan 7 10:52:53 2012 -0800
build: update canonical config files
commit aaf6444f6f51319491b7bafc70c2e641a551deb6
Merge: 1b80996 9c45fe5
Author: Johnathan Corgan <address@hidden>
Date: Sat Jan 7 11:28:14 2012 -0800
Merge branch 'master' into next
commit 9c45fe54ec0a2573538662083b286b96ebc631f3
Author: Johnathan Corgan <address@hidden>
Date: Sat Jan 7 11:26:28 2012 -0800
core: comment out QA debug output
commit 1b80996597fc1800c28e17f77b7cb09f9783d290
Merge: d94c47d e337d7c
Author: Tom Rondeau <address@hidden>
Date: Fri Jan 6 14:44:51 2012 -0500
Merge branch 'master' into next
commit d94c47d652d170760ffca728dc61e45d629fcc04
Merge: 72e8cc8 ab7cfce
Author: Tom Rondeau <address@hidden>
Date: Tue Jan 3 16:30:59 2012 -0500
Merge branch 'master' into next
commit 72e8cc83d795ed49e1cb78e305e32dca892d0bed
Merge: 68301f5 0ab3f9f
Author: Tom Rondeau <address@hidden>
Date: Mon Jan 2 22:49:15 2012 -0500
Merge branch 'master' into next
commit 68301f5ef8af45bfcfe8b66cf75631f322267a7b
Merge: dd84c8d d87f671
Author: Johnathan Corgan <address@hidden>
Date: Mon Jan 2 11:17:29 2012 -0800
Merge branch 'master' into next
commit dd84c8dfcb30617dbac56f49a57c1e363afe643b
Merge: 0cdc6e6 9838bb0
Author: Tom Rondeau <address@hidden>
Date: Fri Dec 30 13:49:14 2011 -0500
Merge branch 'master' into next
Conflicts:
gr-digital/examples/Makefile.am
gr-digital/include/Makefile.am
gr-digital/lib/Makefile.am
gr-digital/python/Makefile.am
gr-digital/swig/Makefile.am
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 10 +
cmake/Modules/GrSwig.cmake | 8 +
docs/doxygen/other/group_defs.dox | 1 +
gnuradio-core/src/lib/filter/CMakeLists.txt | 2 +-
gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc | 7 +
gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h | 1 +
gnuradio-core/src/lib/filter/gr_fft_filter_ccc.i | 1 +
gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc | 8 +-
gnuradio-core/src/lib/filter/gr_fft_filter_fff.h | 1 +
gnuradio-core/src/lib/filter/gr_fft_filter_fff.i | 1 +
.../src/lib/filter/gr_fir_filter_XXX.cc.t | 6 +
gnuradio-core/src/lib/filter/gr_fir_filter_XXX.h.t | 1 +
gnuradio-core/src/lib/filter/gr_fir_filter_XXX.i.t | 1 +
.../src/lib/filter/gr_pfb_clock_sync_ccf.cc | 26 ++-
.../src/lib/filter/gr_pfb_clock_sync_ccf.h | 81 ++++--
.../src/lib/filter/gr_pfb_clock_sync_fff.h | 80 ++++--
.../lib/filter/qa_gri_mmse_fir_interpolator_cc.cc | 1 +
gnuradio-core/src/lib/gengen/gr_noise_source_X.h.t | 3 +
gnuradio-core/src/lib/gengen/gr_noise_source_X.i.t | 3 +
gnuradio-core/src/lib/hier/gr_channel_model.cc | 25 ++
gnuradio-core/src/lib/hier/gr_channel_model.h | 5 +
gnuradio-core/src/lib/hier/gr_channel_model.i | 5 +
gnuradio-core/src/lib/io/gr_udp_sink.cc | 2 +
gnuradio-core/src/lib/runtime/gr_block_executor.cc | 11 +-
gnuradio-core/src/lib/runtime/gr_block_executor.h | 3 +-
gnuradio-core/src/lib/runtime/gr_scheduler.cc | 2 +-
gnuradio-core/src/lib/runtime/gr_scheduler.h | 2 +-
gnuradio-core/src/lib/runtime/gr_scheduler_sts.cc | 8 +-
gnuradio-core/src/lib/runtime/gr_scheduler_sts.h | 4 +-
gnuradio-core/src/lib/runtime/gr_scheduler_tpb.cc | 17 +-
gnuradio-core/src/lib/runtime/gr_scheduler_tpb.h | 4 +-
gnuradio-core/src/lib/runtime/gr_top_block.cc | 20 ++-
gnuradio-core/src/lib/runtime/gr_top_block.h | 19 ++-
gnuradio-core/src/lib/runtime/gr_top_block.i | 5 +-
gnuradio-core/src/lib/runtime/gr_top_block_impl.cc | 27 ++-
gnuradio-core/src/lib/runtime/gr_top_block_impl.h | 9 +-
.../src/lib/runtime/gr_tpb_thread_body.cc | 4 +-
gnuradio-core/src/lib/runtime/gr_tpb_thread_body.h | 2 +-
gnuradio-core/src/lib/swig/gr_swig_block_magic.i | 14 +-
.../src/python/gnuradio/gr/qa_fft_filter.py | 24 ++
gnuradio-core/src/python/gnuradio/gr/qa_noise.py | 12 +
gnuradio-core/src/python/gnuradio/gr/top_block.py | 8 +-
gr-atsc/src/lib/qa_atsci_single_viterbi.cc | 4 +-
gr-audio/lib/alsa/audio_alsa_source.cc | 6 +-
gr-blocks/grc/blocks_add.xml | 92 +++----
gr-blocks/grc/blocks_add_const.xml | 31 +--
gr-blocks/grc/blocks_divide.xml | 92 +++----
gr-blocks/grc/blocks_multiply.xml | 92 +++----
gr-blocks/grc/blocks_multiply_const.xml | 31 +--
gr-blocks/grc/blocks_noise_source.xml | 6 +-
gr-blocks/grc/blocks_signal_source.xml | 6 +-
gr-blocks/grc/blocks_subtract.xml | 92 +++----
gr-blocks/include/CMakeLists.txt | 1 -
gr-blocks/include/gnuradio/blocks/add.h | 11 +-
gr-blocks/include/gnuradio/blocks/add_const.h | 61 ++++-
gr-blocks/include/gnuradio/blocks/api.h | 22 ++
gr-blocks/include/gnuradio/blocks/divide.h | 10 +-
gr-blocks/include/gnuradio/blocks/multiply.h | 10 +-
gr-blocks/include/gnuradio/blocks/multiply_const.h | 59 ++++-
gr-blocks/include/gnuradio/blocks/noise_source.h | 23 ++-
gr-blocks/include/gnuradio/blocks/signal_source.h | 28 ++-
gr-blocks/include/gnuradio/blocks/subtract.h | 10 +-
gr-blocks/lib/CMakeLists.txt | 2 +
gr-blocks/lib/add.cc | 106 ++++----
gr-blocks/lib/add_const.cc | 107 ++------
gr-blocks/lib/{add_const.cc => add_const_v.cc} | 66 ++---
gr-blocks/lib/divide.cc | 84 ++++---
gr-blocks/lib/multiply.cc | 153 +++++------
gr-blocks/lib/multiply_const.cc | 197 ++------------
gr-blocks/lib/multiply_const_v.cc | 162 ++++++++++++
gr-blocks/lib/noise_source.cc | 71 +++--
gr-blocks/lib/signal_source.cc | 71 +++--
gr-blocks/lib/subtract.cc | 90 ++++---
gr-blocks/python/__init__.py | 64 +++++
gr-blocks/python/qa_add_and_friends.py | 41 ++--
gr-blocks/python/qa_noise_source.py | 2 +-
gr-blocks/python/qa_signal_source.py | 114 +--------
gr-blocks/swig/blocks_ops.i | 30 ++-
gr-blocks/swig/blocks_sources.i | 16 +-
gr-blocks/swig/blocks_swig.i | 5 -
gr-digital/examples/CMakeLists.txt | 1 +
gr-digital/examples/snr_estimators.py | 174 ++++++++++++
gr-digital/grc/digital_dxpsk_demod.xml | 7 +
gr-digital/include/CMakeLists.txt | 3 +
gr-digital/include/digital_impl_mpsk_snr_est.h | 279 ++++++++++++++++++++
gr-digital/include/digital_mpsk_snr_est_cc.h | 115 ++++++++
gr-digital/include/digital_probe_mpsk_snr_est_c.h | 113 ++++++++
gr-digital/lib/CMakeLists.txt | 3 +
gr-digital/lib/digital_constellation.cc | 2 -
gr-digital/lib/digital_impl_mpsk_snr_est.cc | 256 ++++++++++++++++++
gr-digital/lib/digital_mpsk_snr_est_cc.cc | 186 +++++++++++++
gr-digital/lib/digital_probe_mpsk_snr_est_c.cc | 152 +++++++++++
gr-digital/python/qa_constellation_receiver.py | 2 +-
gr-digital/python/qa_fll_band_edge.py | 1 +
gr-digital/python/qa_mpsk_snr_est.py | 126 +++++++++
gr-digital/swig/CMakeLists.txt | 2 +
...ic_equalizer_cc.i => digital_mpsk_snr_est_cc.i} | 27 ++-
...ualizer_cc.i => digital_probe_mpsk_snr_est_c.i} | 31 ++-
gr-digital/swig/digital_swig.i | 21 ++
gr-filter/grc/filter_decim_fir.xml | 13 +-
gr-filter/include/gnuradio/filter/decim_fir.h | 19 +-
gr-filter/include/gnuradio/filter/types.h | 8 +-
gr-filter/lib/decim_fir.cc | 156 ++++++-----
gr-filter/swig/filter_fir.i | 4 +-
gr-wxgui/src/python/stdgui2.py | 20 +-
volk/include/volk/volk_16i_max_star_16i_a.h | 4 +-
volk/include/volk/volk_32f_s32f_stddev_32f_a.h | 6 +-
.../volk/volk_32f_stddev_and_mean_32f_x2_a.h | 6 +-
volk/lib/CMakeLists.txt | 14 +-
volk/orc/volk_16ic_magnitude_16i_a_orc_impl.orc | 2 +-
.../volk_16sc_magnitude_32f_aligned16_orc_impl.orc | 2 +-
volk/orc/volk_32f_sqrt_32f_a_orc_impl.orc | 2 +-
volk/orc/volk_32fc_magnitude_32f_a_orc_impl.orc | 2 +-
.../volk_32fc_s32f_magnitude_16i_a_orc_impl.orc | 2 +-
114 files changed, 3057 insertions(+), 1246 deletions(-)
copy gr-blocks/lib/{add_const.cc => add_const_v.cc} (58%)
create mode 100644 gr-blocks/lib/multiply_const_v.cc
create mode 100755 gr-digital/examples/snr_estimators.py
create mode 100644 gr-digital/include/digital_impl_mpsk_snr_est.h
create mode 100644 gr-digital/include/digital_mpsk_snr_est_cc.h
create mode 100644 gr-digital/include/digital_probe_mpsk_snr_est_c.h
create mode 100644 gr-digital/lib/digital_impl_mpsk_snr_est.cc
create mode 100644 gr-digital/lib/digital_mpsk_snr_est_cc.cc
create mode 100644 gr-digital/lib/digital_probe_mpsk_snr_est_c.cc
create mode 100755 gr-digital/python/qa_mpsk_snr_est.py
copy gr-digital/swig/{digital_kurtotic_equalizer_cc.i =>
digital_mpsk_snr_est_cc.i} (61%)
copy gr-digital/swig/{digital_cma_equalizer_cc.i =>
digital_probe_mpsk_snr_est_c.i} (60%)
hooks/post-receive
--
git://gnuradio.org/jblum
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] git://gnuradio.org/jblum branch, next, updated. 60be272e2e2f086ee4c9a12f9ca42d774e917141,
git version control <=