[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] git://gnuradio.org/jblum branch, next, updated. 2ccb12
From: |
git version control |
Subject: |
[Commit-gnuradio] git://gnuradio.org/jblum branch, next, updated. 2ccb1266791d0e7c6a58ccd56df1b00647d52b46 |
Date: |
Mon, 26 Sep 2011 19:13:52 +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 2ccb1266791d0e7c6a58ccd56df1b00647d52b46 (commit)
via 1ff42298b8c5216587ecddcd3a3571def2e5fa21 (commit)
via 18201a678610a608a4c952122ce6dc9430e8e2d1 (commit)
via dd63208289584f764ad69f36fbd552def3c761e5 (commit)
via 8b7db9d512f7d441bd6742eddf66fe6ae6caf3df (commit)
via ab2d7789629cdbfc7091100bfbe8ef02a05aec7e (commit)
via dc88c64b25bf4c4f28e1e0097c8c579b36e3a079 (commit)
via 95379f54e43f6e4b81d0a25e64d5f5323bf9a146 (commit)
via 6a58bfd31a30d9b3aaf56cd961c5947bccc75711 (commit)
via 2e378ce7d2d00096c700864ea8897b9a572125f5 (commit)
via 8bdd742763271b30245ebe6bf83d60fbd2a26512 (commit)
via f90b2a14787bb345c00f3121bc11934c3dca9092 (commit)
via 9194f9573f65faf4f3c2e0f43598cc7433e461ec (commit)
via 5249ba01cded451215d46bd35b924f5b923d617a (commit)
via 1ad2ce69ea04aa3a3837ecacc7089452bb937973 (commit)
via 2e6df0c3084b29648648148b1bd5aeddc63fe00f (commit)
via 1371c92be1ed0a4b371915168eecacd00fc3538c (commit)
via 9479dac98e305441fbbb0121836c98d8106369dc (commit)
via 3c70ea18b9d8ee131523d36533c92fb760186193 (commit)
via 7da9d688406db097f518b3eed2047fde60e1aa0e (commit)
via 91ace5a39a171ec7367c4030a1739d2f709eaed6 (commit)
via be67ead62f6c5d9abcb319cf2e6f1727fe4618d8 (commit)
via 40193f0b6ca030db990ec98a3b5059e918f7aaf3 (commit)
via c825caf1a86c5cefd20fdd222d915011ef43fbae (commit)
via c802032c0198c872ee09b1ec93ce7531f654715c (commit)
via 801465fe8dbac9905ac74aeb5c3dc308d3328d98 (commit)
via b6f2b4138be9dc9d250dda819f901872c13876be (commit)
via 4020755d7e46b78acad4a55b1d65ffabd66ccb35 (commit)
from 4aa4411f2a3f184760ff5f534eec015f557f80c9 (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 2ccb1266791d0e7c6a58ccd56df1b00647d52b46
Author: Josh Blum <address@hidden>
Date: Mon Sep 26 12:13:54 2011 -0700
uhd: cmake support for example application
commit 1ff42298b8c5216587ecddcd3a3571def2e5fa21
Merge: 4aa4411 18201a6
Author: Josh Blum <address@hidden>
Date: Mon Sep 26 12:04:27 2011 -0700
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
commit 18201a678610a608a4c952122ce6dc9430e8e2d1
Merge: dc88c64 dd63208
Author: Tom Rondeau <address@hidden>
Date: Mon Sep 26 13:20:09 2011 -0400
Merge branch 'master' into next
commit dd63208289584f764ad69f36fbd552def3c761e5
Author: Tom Rondeau <address@hidden>
Date: Mon Sep 26 13:17:39 2011 -0400
uhd: can't be const to go into tag_work, which might change it.
commit 8b7db9d512f7d441bd6742eddf66fe6ae6caf3df
Merge: 95379f5 ab2d778
Author: Tom Rondeau <address@hidden>
Date: Mon Sep 26 11:49:12 2011 -0400
Merge branch 'mergme/uhd_tags_impl_on_master'
commit dc88c64b25bf4c4f28e1e0097c8c579b36e3a079
Merge: 6a58bfd 95379f5
Author: Johnathan Corgan <address@hidden>
Date: Sat Sep 24 13:33:47 2011 -0700
Merge master into next, skipping version number change
commit 95379f54e43f6e4b81d0a25e64d5f5323bf9a146
Author: Johnathan Corgan <address@hidden>
Date: Sat Sep 24 13:32:55 2011 -0700
Update revision to 3.4.2git
commit 6a58bfd31a30d9b3aaf56cd961c5947bccc75711
Merge: 8bdd742 2e378ce
Author: Johnathan Corgan <address@hidden>
Date: Sat Sep 24 13:17:11 2011 -0700
Merge 'master' into next, skipping version change commit
commit 2e378ce7d2d00096c700864ea8897b9a572125f5
Author: Johnathan Corgan <address@hidden>
Date: Sat Sep 24 13:04:54 2011 -0700
Update revision to 3.4.1 release
commit 8bdd742763271b30245ebe6bf83d60fbd2a26512
Merge: 9194f95 f90b2a1
Author: Tom Rondeau <address@hidden>
Date: Sat Sep 24 14:34:52 2011 -0400
Merge branch 'master' into next
commit f90b2a14787bb345c00f3121bc11934c3dca9092
Merge: 5249ba0 4020755
Author: Tom Rondeau <address@hidden>
Date: Sat Sep 24 14:34:10 2011 -0400
Merge branch 'keep1n'
commit 9194f9573f65faf4f3c2e0f43598cc7433e461ec
Merge: 2e6df0c 5249ba0
Author: Johnathan Corgan <address@hidden>
Date: Sat Sep 24 11:31:35 2011 -0700
Merge branch 'master' into next
commit 5249ba01cded451215d46bd35b924f5b923d617a
Merge: 1371c92 1ad2ce6
Author: Johnathan Corgan <address@hidden>
Date: Sat Sep 24 11:31:29 2011 -0700
Merge branch 'maint'
commit 1ad2ce69ea04aa3a3837ecacc7089452bb937973
Author: Johnathan Corgan <address@hidden>
Date: Sat Sep 24 11:29:15 2011 -0700
gr-noaa: fix PLL to generate output, then update error
commit 2e6df0c3084b29648648148b1bd5aeddc63fe00f
Merge: 3522239 1371c92
Author: Johnathan Corgan <address@hidden>
Date: Sat Sep 24 11:19:17 2011 -0700
Merge branch 'master' into next
Conflicts:
gr-qtgui/apps/usrp_display.py
commit 1371c92be1ed0a4b371915168eecacd00fc3538c
Merge: c825caf 9479dac
Author: Johnathan Corgan <address@hidden>
Date: Sat Sep 24 11:10:26 2011 -0700
Merge branch 'maint'
commit 9479dac98e305441fbbb0121836c98d8106369dc
Author: Johnathan Corgan <address@hidden>
Date: Tue Jul 26 16:49:17 2011 -0700
comedi: fix to use comedi 0.8 API
(this was done on master but not maint, backporting)
commit 4020755d7e46b78acad4a55b1d65ffabd66ccb35
Author: Tom Rondeau <address@hidden>
Date: Thu Sep 22 16:29:46 2011 -0400
Fixing keep_one_in_n to allow for large values of n. Performs tag
propagation locally.
-----------------------------------------------------------------------
Summary of changes:
gnuradio-core/src/lib/general/gr_keep_one_in_n.cc | 24 ++++-
gnuradio-core/src/lib/general/gr_keep_one_in_n.h | 1 +
gnuradio-examples/python/ofdm/gr_plot_ofdm.py | 20 +++-
gnuradio-examples/python/pfb/channelize.py | 19 +++-
gnuradio-examples/python/pfb/chirp_channelize.py | 19 +++-
gnuradio-examples/python/pfb/decimate.py | 21 ++-
gnuradio-examples/python/pfb/fmtest.py | 40 +++++-
gnuradio-examples/python/pfb/interpolate.py | 23 +++--
gnuradio-examples/python/pfb/resampler.py | 34 +++++-
gnuradio-examples/python/pfb/synth_filter.py | 14 ++-
gnuradio-examples/python/pfb/synth_to_chan.py | 14 ++-
gnuradio-examples/python/tags/test_file_tags.py | 28 ++++-
gr-noaa/lib/noaa_hrpt_pll_cf.cc | 9 +-
gr-qtgui/apps/qt_digital.py | 39 +++++-
gr-qtgui/apps/uhd_display.py | 2 +-
gr-qtgui/examples/pyqt_example_c.py | 32 +++++-
gr-qtgui/examples/pyqt_example_f.py | 32 +++++-
gr-qtgui/examples/pyqt_time_c.py | 32 +++++-
gr-qtgui/examples/pyqt_time_f.py | 32 +++++-
gr-trellis/src/examples/fsm_utils.py | 7 +-
gr-trellis/src/examples/test_cpm.py | 15 ++-
gr-uhd/CMakeLists.txt | 1 +
{gr-wxgui/grc => gr-uhd/examples}/CMakeLists.txt | 29 +++--
gr-uhd/examples/tag_sink_demo.h | 66 ++++++++++
gr-uhd/examples/tag_source_demo.h | 129 +++++++++++++++++++
gr-uhd/examples/tags_demo.cc | 139 +++++++++++++++++++++
gr-uhd/grc/gen_uhd_usrp_blocks.py | 5 +
gr-uhd/include/gr_uhd_usrp_sink.h | 27 ++++
gr-uhd/include/gr_uhd_usrp_source.h | 23 ++++
gr-uhd/lib/gr_uhd_usrp_sink.cc | 87 ++++++++++++--
gr-uhd/lib/gr_uhd_usrp_source.cc | 27 ++++-
gr-uhd/swig/__init__.py | 6 +-
32 files changed, 903 insertions(+), 93 deletions(-)
copy {gr-wxgui/grc => gr-uhd/examples}/CMakeLists.txt (67%)
create mode 100644 gr-uhd/examples/tag_sink_demo.h
create mode 100644 gr-uhd/examples/tag_source_demo.h
create mode 100644 gr-uhd/examples/tags_demo.cc
hooks/post-receive
--
git://gnuradio.org/jblum
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] git://gnuradio.org/jblum branch, next, updated. 2ccb1266791d0e7c6a58ccd56df1b00647d52b46,
git version control <=