summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-18Merge remote-tracking branch 'ncorgan/volk_msvc_fix' into maintJohnathan Corgan
2013-03-18volk: fixed MSVC include directoryNicholas Corgan
2013-03-18sphinx docs: Added additional block function names to blacklist so that they ↵Ben Reynwar
are not displayed for every block.
2013-03-18docs: Adding gr-uhd to sphinx docs.Ben Reynwar
2013-03-18volk: header fixes from maintJosh Blum
2013-03-18volk: fix include typo, profile app compilesJosh Blum
2013-03-17gras: more changes to get compiling w/ maintJosh Blum
2013-03-17block: added missing include in throttleJosh Blum
2013-03-17Merge branch 'maint' of https://github.com/guruofquality/gnuradio into ↵Josh Blum
v3.6.4git_gras_support Conflicts: gnuradio-core/src/lib/runtime/gr_block.cc gnuradio-core/src/lib/runtime/gr_block.h gnuradio-core/src/lib/runtime/gr_types.h
2013-03-14modtool: fixed general python block templateMike Jameson
2013-03-14modtool: Python general blocks used grextras syntaxMartin Braun
2013-03-14docs: fixing a section name collision.Tom Rondeau
2013-03-14core: boost::filename3::path::/ operator works on older boost verions than /=Tim O'Shea
2013-03-07core: protect against popping a message off the queue if no handler is attached.Tom Rondeau
This mostly solves a problem with threads being launched in random order, so a handler might not be established yet, even if there is a message waiting. Fixes Issue #514.
2013-03-06gras: same changes to config structJosh Blum
2013-03-05prefs: pass strings by reference. Also cleans up a comma in gr_modtool that ↵Tom Rondeau
made a string into a tuple (and C++ angry).
2013-03-01gras: create packet msg overload for digital_framer_sinkJosh Blum
This will let the GrExtras PacketDeframer use messages delivered by the scheduler, as opposed to the god-awful blocking on a message queue in the work routine.
2013-02-26Update version to 3.6.5gitJohnathan Corgan
2013-02-26Update release version to 3.6.4Johnathan Corgan
2013-02-26Merge branch 'maint'Johnathan Corgan
Use merge strategy -s ours to skip release commits.
2013-02-26Update maintenance release version to 3.6.3.1Johnathan Corgan
2013-02-26Merge branch 'maint'Tom Rondeau
2013-02-26cmake: adding Boost version 104601 to list of bad Boosts.Tom Rondeau
2013-02-26core: adding a mutex as a protected member of gr_block for use in protecting ↵Tom Rondeau
set and work function access to variables. This is used in gr-analog's noise_source and gr-filter's fir_filter_XXX since these two cause particular problems (in next's channel model). This shows the use of the mutex for general protection when needed.
2013-02-26blocks: fixed typo.Tom Rondeau
2013-02-26Merge remote-tracking branch 'mbant/grmodtool'Tom Rondeau
2013-02-26Merge branch 'master' of git://github.com/gnuradio/gnuradio into grmodtoolMartin Braun
2013-02-26modtool: another fix in the SWIG generating codeMartin Braun
2013-02-25blocks: moved transcendental block to gr-blocks.Tom Rondeau
2013-02-25gras: changes for port config APIJosh Blum
2013-02-24blocks: adding threshold, strech, and throttle to gr-blocks.Tom Rondeau
2013-02-24gras: move python hier/top wrappers into init.pyJosh Blum
This also addresses a holdover bug from the last commit
2013-02-24blocks: converted peak_detector2 and regenerate to v3.7.Tom Rondeau
2013-02-23gras: fix stupid multiple type traits error x86 machineJosh Blum
2013-02-23gras: well thats a duplicate nowJosh Blum
2013-02-23whoops: revert that accidental commitJosh Blum
2013-02-23gras: implement io sig ontop of set/get size apiJosh Blum
2013-02-22Merge branch 'maint' into v3.6.4git_gras_supportJosh Blum
Conflicts: volk/apps/volk_profile.cc
2013-02-22gras: continuation from the last commitJosh Blum
Removed a bunch of GRAS_LIBRARIES, we do this in a common place to avoid extra changes. Added virtual destructors for many classes.
2013-02-22gras: linker stuff + moving around symbols and shitJosh Blum
Basically there were some issues on OSX linking, because gras wasnt explicitly specified, and was technically exposed by the gr wrappers. As part of this commit, some symbols were moved into the wrappers, and some of the interfaces which were in gras for backwards compat purposes, The compile is still going, but this already addresses a few issues. Now, I don't want to go copying every symbol over, the real solution is to link in gras into whatever library. Probably another commit to come...
2013-02-21Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau
2013-02-21blocks: fixing use of packed/unpacked from gr-blocks in QA code.Tom Rondeau
2013-02-21Merge remote-tracking branch 'ncorgan/random_pdu_fix'Johnathan Corgan
2013-02-21Merge branch 'maint'Johnathan Corgan
2013-02-21Merge remote-tracking branch 'ncorgan/volk_profile_fix' into maintJohnathan Corgan
2013-02-21Merge remote-tracking branch 'ncorgan/chrono' into maintJohnathan Corgan
2013-02-21blocks: converting blocks to v3.7 style in gr-blocks.Tom Rondeau
delay, rms, unpacked_to_packed, packed_to_unpacked
2013-02-21volk: Fixed volk_profile MSVC incompatibilityNicholas Corgan
2013-02-21Merge branch 'master' of git://github.com/gnuradio/gnuradio into grmodtoolMartin Braun
2013-02-20digital: adding simple_correlator to gr-digital's block tree.Tom Rondeau