summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-03-08Merge branch 'master' into nextJohnathan Corgan
2012-03-08Merge branch 'maint'Johnathan Corgan
2012-03-08build: updated ignoresJohnathan Corgan
2012-03-05Merge branch 'master' into nextJohnathan Corgan
Use merge strategy '-s ours' to skip release commits.
2012-03-05Merge remote branch 'gnuradio/master' into nextJohnathan Corgan
2012-03-05build: update revision to 3.5.3gitJohnathan Corgan
2012-03-05build: update revision to 3.5.2Johnathan Corgan
2012-03-05build: update from canonical config filesJohnathan Corgan
2012-03-04testing something.Tom Rondeau
2012-03-03Merge branch 'master' into nextTom Rondeau
2012-03-03volk: include config.h to have rintf in windows/msvc.Tom Rondeau
2012-03-03volk: include config.h to have rintf in windows/msvc.Tom Rondeau
2012-03-02grc: updating to new name of pfb synthesizer block.Tom Rondeau
2012-03-02examples: fixing synthesizer examples to use new block name.Tom Rondeau
2012-03-02core: changed name of gr_pfb_synthesis_filterbank_ccf to gr_pfb_synthesizer ↵Tom Rondeau
to make it easier to write and remember.
2012-03-01Merge branch 'master' into nextJohnathan Corgan
Conflicts: config/grc_volk.m4 gnuradio-core/src/guile/tests/gengen_ctors.test gnuradio-core/src/lib/Makefile.am gnuradio-core/src/lib/general/.gitignore gnuradio-core/src/lib/general/Makefile.am gnuradio-core/src/lib/gengen/.gitignore gnuradio-core/src/python/gnuradio/gr/Makefile.am volk/include/volk/Makefile.am
2012-03-01Merge remote branch 'tom/safe_align'Johnathan Corgan
2012-03-01Merge branch 'master' into nextTom Rondeau
2012-03-01Merge branch 'maint'Tom Rondeau
2012-03-01docs: setting up ability to link to example files in the Doxygen manual. ↵Tom Rondeau
Using the PFB channelize.py as a test.
2012-02-29Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau
2012-02-29grc: grc PFB channelizer and synthesize to set channel map defaults on startup.Tom Rondeau
2012-02-29Merge branch 'master' into nextJohnathan Corgan
2012-02-29Merge branch 'maint'Johnathan Corgan
2012-02-29Changes Windows installer filename to match naming convention of Ubuntu and ↵Nicholas Corgan
Fedora installers
2012-02-28Merge branch 'synth' into nextTom Rondeau
2012-02-28Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau
2012-02-28grc: adding new inputs to channelizer and synthesizer xml.Tom Rondeau
2012-02-28Merge branch 'master' into nextJohnathan Corgan
2012-02-28Merge branch 'maint'Johnathan Corgan
2012-02-28Installer filename more clearly separates "gnuradio", version, and distroNicholas Corgan
2012-02-28core: simple formatting.Tom Rondeau
2012-02-28examples: adding an example of using the channelizer and synthesize together ↵Tom Rondeau
to reconstruct a signal.
2012-02-28core: pfb channelizer: can now set a channel map to direct the channels to a ↵Tom Rondeau
specific output stream. Now, not all output channels must be connected; can connect M of N channels (M <= N) and use the channel_map to set which channel from the original wideband signal go to which output streams.
2012-02-28core: pfb synth: can now set channel map and to use 1 or 2 sps on output.Tom Rondeau
The channel map allows the user to set the streams anywhere in the channel output.
2012-02-27core: wip on pfb synthesis. It works, but is a bit hacked together.Tom Rondeau
Need to determine the best way to handle the two filter cases, with and without oversampling.
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