summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-09-28Merge branch 'next' into digitalJosh Blum
Conflicts: gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h gnuradio-core/src/lib/general/general.i gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc gnuradio-core/src/lib/general/gr_pll_refout_cc.cc gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py
2011-09-27core: add link with librt for shm_* callsJosh Blum
2011-09-26uhd: cmake support for example applicationJosh Blum
2011-09-26Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum
2011-09-26Merge branch 'master' into nextTom Rondeau
2011-09-26uhd: can't be const to go into tag_work, which might change it.Tom Rondeau
2011-09-26Merge branch 'mergme/uhd_tags_impl_on_master'Tom Rondeau
2011-09-26uhd: tweaks for some minor detailsJosh Blum
2011-09-24gruel: added missing pmt swig install ruleJosh Blum
2011-09-24Merge master into next, skipping version number changeJohnathan Corgan
2011-09-24Update revision to 3.4.2gitJohnathan Corgan
2011-09-24Merge 'master' into next, skipping version change commitJohnathan Corgan
2011-09-24Update revision to 3.4.1 releaseJohnathan Corgan
2011-09-24howto: various fixes for howto exampleJosh Blum
2011-09-24Merge branch 'master' into nextTom Rondeau
2011-09-24Merge branch 'keep1n'Tom Rondeau
2011-09-24Merge branch 'master' into nextJohnathan Corgan
2011-09-24Merge branch 'maint'Johnathan Corgan
2011-09-24gr-noaa: fix PLL to generate output, then update errorJohnathan Corgan
2011-09-24Merge branch 'master' into nextJohnathan Corgan
Conflicts: gr-qtgui/apps/usrp_display.py
2011-09-24Merge branch 'maint'Johnathan Corgan
2011-09-24comedi: fix to use comedi 0.8 APIJohnathan Corgan
(this was done on master but not maint, backporting)
2011-09-24uhd: added tags_demo c++ example applicationJosh Blum
2011-09-24uhd: tweaks + tested working tags implementationJosh Blum
2011-09-24uhd: added documentation and tag implementationsJosh Blum
2011-09-24gr-uhd: remove unused _tmp_buffs variableThomas Tsou
The code section that used this variable was removed in Commit 081497e7 "uhd: work on gr_uhd_source work() function to reduce latency"
2011-09-24uhd: added kwargs to construct individual struct elements in tune_request_tJosh Blum
2011-09-24Merge branch 'digital' of https://github.com/trondeau/gnuradio into digitalJosh Blum
2011-09-24Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum
2011-09-24howto: updated find gruel and core modules to match recommended styleJosh Blum
2011-09-23qtgui: removed usrp and usrp2-specific apps; replaced with a UHD version.Tom Rondeau
2011-09-23qtgui: moved actual examples to new examples directory.Tom Rondeau
2011-09-23examples: fixed import statements.Tom Rondeau
2011-09-23trellis: fixed import statements; fixed test_cpm to convert numpy stuff to ↵Tom Rondeau
types GNU Radio blocks can handle.
2011-09-23examples: fixed examples (pfb and tags) to print an error when python ↵Tom Rondeau
modules are not available.
2011-09-23qtgui: fixing import statements in qtgui apps to print an error if extra ↵Tom Rondeau
python modules are not available.
2011-09-23updated QA codes for fixed PLL blocks.Tom Rondeau
2011-09-23Merge branch 'master' into nextTom Rondeau
2011-09-23Merge branch 'maint'Tom Rondeau
2011-09-23fixed QA code for PLL changesTom Rondeau
2011-09-23fixing PLL's using new control_loop class so their output update is done at ↵Tom Rondeau
the right time; were lagging by a sample before.
2011-09-23Merge branch 'master' into nextTom Rondeau
2011-09-23Merge branch 'maint'Tom Rondeau
2011-09-23Merge branch 'maint' of gnuradio.org:gnuradio into maintTom Rondeau
2011-09-23fixing PLL's so their output update is done at the right time; were lagging ↵Tom Rondeau
by a sample before.
2011-09-22Fixing keep_one_in_n to allow for large values of n. Performs tag ↵Tom Rondeau
propagation locally.
2011-09-22Merge branch 'next' of gnuradio.org:gnuradio into nextJosh Blum
Conflicts: gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h volk/bootstrap
2011-09-22Merge branch 'master' into nextTom Rondeau
2011-09-22Merge branch 'maint'Tom Rondeau
2011-09-22grc: one line fix to fix port duplicator when removing portsJosh Blum
was an issue when removing more than one port