summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-04-01Merge remote branch 'tom/cmake_version' into nextJohnathan Corgan
* Changed version to make it build 3.6git, not 3.6.0.0
2012-04-01Merge branch 'master' into nextJohnathan Corgan
2012-04-01fcd: adds setter function to configure mixer gainDimitri Stolnikov
2012-04-01wavelet: converted blocks to private implementation patternJohnathan Corgan
2012-04-01wavelet: move wavelet blocks to new top-level componentJohnathan Corgan
2012-04-01Merge branch 'master' into nextJohnathan Corgan
Conflicts: gr-fcd/lib/Makefile.am
2012-04-01Merge remote branch 'jcorgan/gr-fcd'Johnathan Corgan
2012-04-01cmake: remove version.sh since we don't need it for autotools. Set version ↵Tom Rondeau
info in CMakeLists.txt.
2012-03-27Merge branch 'master' into nextTom Rondeau
2012-03-27Merge branch 'maint'Tom Rondeau
2012-03-27doc: fix documentation for wavsink (thanks to John Coppens for point it out).Tom Rondeau
2012-03-27core: when reseting buffers, make sure that the read/write pointers are ↵Tom Rondeau
always algined. This fixes problems when disconnecting and reconnecting blocks to a flowgraph.
2012-03-27Merge branch 'ch_bw'Tom Rondeau
2012-03-27Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau
2012-03-27Merge branch 'master' into nextJohnathan Corgan
2012-03-27Merge branch 'maint'Johnathan Corgan
2012-03-27uhd: fix dc offset call in uhd sourceJosh Blum
SWIG/python cannot differentiate the calls set_dc_offset with an complex number or a boolean paramater. It seems to take the boolean as a complex number 1 or 0. Since the overloading is not working right: renamed set_dc_offset to set_auto_dc_offset for the boolean enable/disable paramater
2012-03-24Merge branch 'master' into nextJohnathan Corgan
Conflicts: gr-uhd/lib/Makefile.am
2012-03-24Merge remote branch 'jblum/mergeme_uhd'Johnathan Corgan
2012-03-24Merge branch 'maint'Johnathan Corgan
2012-03-24Merge remote branch 'jblum/fix_uhd_device_addr_python' into maintJohnathan Corgan
2012-03-23Merge branch 'master' into nextJohnathan Corgan
2012-03-23Merge branch 'maint'Johnathan Corgan
2012-03-23Changes preinst.in from running 'ls' to running 'echo'Nicholas Corgan
2012-03-23uhd: finite_acquisition_v timeout should be >> than stream timeJosh Blum
2012-03-23uhd: add a flush to finite_acquisition_vJosh Blum
2012-03-23uhd: perform abi compat check before making a blockJosh Blum
2012-03-23uhd: added set_start_time calls to source/sinkJosh Blum
2012-03-23uhd: added multi-finite-aquisitionJosh Blum
2012-03-23uhd: fix device_addr init issueJosh Blum
2012-03-23fcd: convert to private implementation patternJohnathan Corgan
2012-03-23Merge branch 'master' into nextJohnathan Corgan
2012-03-23Merge branch 'maint'Johnathan Corgan
2012-03-23cmake: fix include path order in gruelJohnathan Corgan
2012-03-22Merge branch 'master' into nextJohnathan Corgan
Conflicts: config/Makefile.am configure.ac
2012-03-22Merge branch 'gr-fcd'Johnathan Corgan
2012-03-22Merge branch 'master' into nextJohnathan Corgan
2012-03-22Merge branch 'maint'Johnathan Corgan
2012-03-22Implement conditionalized build for WIN32Johnathan Corgan
2012-03-22volk: added volk as depedency for various componentsJosh Blum
Its important to list the dependent libraries for a test so the library path can be correctly set. This is necessary on platforms without dynamic re-linking.
2012-03-22volk: fix for load prefs (config path)Josh Blum
1) add APPDATA to search path for windows 2) graceful fail and env vars not defined
2012-03-22volk: make both test cases look and function the same.Tom Rondeau
2012-03-21volk: add include for config.h to cc fileJosh Blum
volk_32f_s32f_convert_16i_a was also a problem, previously volk_32f_s32f_convert_16i_u was fixed to have config.h. I heard putting config h stuff into public headers was bad practice. Including config.h into the generated cc file should fix this issue from now on.
2012-03-20Merge branch 'master' into nextTom Rondeau
2012-03-20howto: fixed cmake project definition to include C.Tom Rondeau
Fixes a problem with finding PythonLibs.
2012-03-19digital: in narrowband examples, added the ability to change the channel ↵Tom Rondeau
bandwidth. When the frequency factor is off significantly, the signal can be outside the range of the channel filter. This allows a user to open up the filter to acquire these signals.
2012-03-19Merge branch 'master' into nextTom Rondeau
Conflicts: volk/config/orc.m4
2012-03-19Merge branch 'maint'Tom Rondeau
2012-03-19volk: change minimum acceptable ORC version to 4.12 (in cmake and updating ↵Tom Rondeau
version in autotools).
2012-03-18Merge branch 'master' into nextTom Rondeau