summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-02-27Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau
2012-02-27Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau
2012-02-27Merge branch 'master' into nextJohnathan Corgan
2012-02-27Merge branch 'maint'Johnathan Corgan
2012-02-27Do not rewrite path to python interpreter for cross builds.Philip Balister
If you rewrite the path to the python interpreter during a cross build, you end up with the path to the build environment python interpreter, which may not be the same as teh path on the target. Signed-off-by: Philip Balister <philip@opensdr.com> Signed-off-by: Josh Blum <jblum@joshknows.com>
2012-02-27Merge branch 'master' into nextTom Rondeau
2012-02-27Merge remote-tracking branch 'balister/python-env'Tom Rondeau
2012-02-27Do not rewrite path to python interpreter for cross builds.Philip Balister
If you rewrite the path to the python interpreter during a cross build, you end up with the path to the build environment python interpreter, which may not be the same as teh path on the target. Signed-off-by: Philip Balister <philip@opensdr.com> Signed-off-by: Josh Blum <jblum@joshknows.com>
2012-02-27Merge branch 'master' into nextTom Rondeau
2012-02-27Merge branch 'maint'Tom Rondeau
2012-02-27Merge remote-tracking branch 'benreynwar/maint' into maintTom Rondeau
2012-02-27Fixed bug in digital_qam_demod.xmlBen Reynwar
2012-02-26Merge branch 'master' into nextJohnathan Corgan
2012-02-26Merge branch 'maint'Johnathan Corgan
2012-02-26core: add null constructors to sync_* blocksJohnathan Corgan
2012-02-24Merge branch 'master' into nextTom Rondeau
Conflicts: gr-digital/grc/Makefile.am
2012-02-24Merge branch 'maint'Tom Rondeau
2012-02-24digital: forgot to include new xml in Makefile.am.Tom Rondeau
2012-02-24Added digital_constellation_receiver_cb.xml fileBen Reynwar
2012-02-24Merge remote-tracking branch 'benreynwar/minor_fixes'Tom Rondeau
2012-02-24Added digital_constellation_receiver_cb.xml fileBen Reynwar
2012-02-23volk: float to short conversion is consistent between archs and tail cases. ↵Tom Rondeau
Rounds to nearest number.
2012-02-23Merge branch 'master' into nextTom Rondeau
2012-02-23Merge branch 'maint'Tom Rondeau
2012-02-23Try really hard to get cmake to use compiler flags from the toolchain file.Philip Balister
See: http://www.mail-archive.com/cmake@cmake.org/msg33248.html Also credit OpenEmbedded for doing something similar in the toolchain file they create. Signed-off-by: Philip Balister <philip@opensdr.com>
2012-02-23Merge remote branch 'bistromath/volk_fix' into safe_alignTom Rondeau
Conflicts: volk/apps/volk_profile.cc
2012-02-22Remove ORC invocation since // doesn't dissuade the generator.Nick Foster
2012-02-21Merge branch 'master' into nextTom Rondeau
2012-02-21Merge branch 'maint'Tom Rondeau
2012-02-21qtgui: More search options for qwt libraries, specifically for OSX.Michael Dickens
2012-02-21Volk: add scalar const support to the profiler/QA code. Disabled ↵Nick Foster
volk_32fc_s32fc_multiply_32fc_a's Orc impl due to it not working.
2012-02-20uhd: updated uhd programs to use stream_args concept from command line for ↵Marcus Leech
more than just setting the scalar.
2012-02-20Merge branch 'master' into nextTom Rondeau
2012-02-20Merge branch 'maint'Tom Rondeau
2012-02-20Merge branch 'maint' of gnuradio.org:gnuradio into maintTom Rondeau
2012-02-20digital: fixed comments for new parameters.Tom Rondeau
2012-02-17Merge branch 'master' into nextJohnathan Corgan
Conflicts: gr-vocoder/grc/Makefile.am grc/blocks/Makefile.am
2012-02-17Merge branch 'maint'Johnathan Corgan
2012-02-17vocoder: add xml blocks to autotools buildJohnathan Corgan
2012-02-17vocoder: fix typos in added block xmlJohnathan Corgan
2012-02-17Merge branch 'master' into nextTom Rondeau
2012-02-17core: protection if set_delay is called before the last delay update has ↵Tom Rondeau
finished.
2012-02-17Merge branch 'dyn_delay'Tom Rondeau
2012-02-17core: in delay block, protect against repeated calls to set_delay with the ↵Tom Rondeau
same value.
2012-02-17Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau
2012-02-17howto: moving uninstall rules into correct location.Tom Rondeau
2012-02-16copyright adjustment.Tom Rondeau
2012-02-16core: core: change to the delay QA code.Tom Rondeau
The full vector is received because of the switch to a gr_block, so we exted the expected_data vector; otherwise, the results are the same
2012-02-16core: allowing delay to be dynamic for runtime changes to set_delay.Tom Rondeau
This converts the block from a gr_sync_block to a gr_block since it has to return and consume different amounts when the delay setting changes.
2012-02-16Merge branch 'master' into nextJohnathan Corgan