summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nextTom Rondeau2013-03-074-6/+42
|\ | | | | | | | | Conflicts: gnuradio-core/src/python/gnuradio/gr/qa_pdu.py
| * core: moving over setting of max_messages option to conf.in file.Tom Rondeau2013-03-072-2/+6
| | | | | | | | blocks: these timers were actually doing much, so we can speed up the tests.
| * Merge branch 'maint'Tom Rondeau2013-03-073-6/+37
| |\ | | | | | | | | | | | | Conflicts: gnuradio-core/gnuradio-core.conf
| | * core: protect against popping a message off the queue if no handler is attached.Tom Rondeau2013-03-074-6/+41
| | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into nextTom Rondeau2013-03-071-0/+11
|\| |
| * | blocks: did my best to provide some documentation for the bin_statistics block.Tom Rondeau2013-03-071-0/+11
| | |
* | | blocks: removing bin_statistics_f from core; now in gr-blocks.Tom Rondeau2013-03-079-337/+10
| | |
* | | Merge branch 'master' into nextTom Rondeau2013-03-077-15/+341
|\| |
| * | blocks: moving bin_statistics_f into gr-blocks.Tom Rondeau2013-03-077-0/+557
| | | | | | | | | | | | QA worked, but keeping disabled for now in reference to issue #199.
* | | blocks: removing burst_tagger from core; now in gr-blocks.Tom Rondeau2013-03-0614-315/+13
| | |
* | | Merge branch 'master' into nextTom Rondeau2013-03-069-0/+402
|\| |
| * | blocks: moved burst_tagger to gr-blocks.Tom Rondeau2013-03-069-0/+402
| | |
* | | core: removing simple_framer_sync, now in gr-digital.Tom Rondeau2013-03-063-53/+1
| | |
* | | blocks: removing gr_tag_debug from core; now in gr-blocks.Tom Rondeau2013-03-0612-363/+9
| | | | | | | | | | | | Also removes stray reference to gri_fft.h.
* | | digital, blocks: some fixes to build/run after merge.Tom Rondeau2013-03-066-18/+118
| | |
* | | Merge branch 'master' into nextTom Rondeau2013-03-0614-53/+675
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-digital/include/digital_constellation.h gr-digital/lib/digital_constellation.cc gr-digital/python/qa_constellation.py gr-digital/python/qa_constellation_receiver.py gr-digital/python/qam.py gr-digital/swig/digital_constellation.i
| * | Merge remote-tracking branch 'benreynwar/large_ampls_to_corners'Tom Rondeau2013-03-068-37/+398
| |\ \
| | * | digital: Adding a QAM-like constellation with 32 points.Ben Reynwar2013-03-063-0/+80
| | | |
| | * | digital: Making qa_constellation_receiver more reliable.Ben Reynwar2013-03-062-31/+71
| | | |
| | * | digital: Adding option to QAM to help with frequency locking.Ben Reynwar2013-03-065-11/+252
| | | |
| * | | blocks: moving tag_debug block to gr-blocks.Tom Rondeau2013-03-069-0/+388
| | | |
* | | | core: cleaning up remez and firdes in gnuradio-core; now in gr-filter.Tom Rondeau2013-03-0645-3515/+110
| | | |
* | | | core: removed all complex_to_<type> blocks from core; using gr-blocks.Tom Rondeau2013-03-0643-1096/+69
| | | |
* | | | core: removing single_pole_irr header from core that is no longer used.Tom Rondeau2013-03-062-192/+0
| | | |
* | | | core: removing goertzel and fft implementations from core; see gr-fft.Tom Rondeau2013-03-0610-766/+2
| | | | | | | | | | | | | | | | Also cleaning up some other leftovers.
* | | | blocks: removing blocks moved into gr-blocks:Tom Rondeau2013-03-0666-2260/+89
| | | | | | | | | | | | | | | | message_strobe, message_debug, message_source, message_sink, message_burst_source, peak_detector, moving_average.
* | | | Merge branch 'master' into nextTom Rondeau2013-03-0636-1/+2542
|\| | | | | | | | | | | | | | | | | | | Conflicts: gr-blocks/grc/blocks_block_tree.xml
| * | | blocks: moving peak_detector and moving_average to gr-blocks.Tom Rondeau2013-03-0615-1/+920
| | | |
| * | | blocks: moving message blocks to gr-blocks.Tom Rondeau2013-03-0625-0/+1622
| | | | | | | | | | | | | | | | message_burst_source, message_source, message_sink, message_debug, message_strobe.
* | | | docs: fixing documentation for socket_pdu.Tom Rondeau2013-03-051-2/+4
| | | |
* | | | Merge branch 'master' into nextTom Rondeau2013-03-0538-14/+1626
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-atsc/src/lib/CMakeLists.txt gr-noaa/lib/CMakeLists.txt gr-trellis/src/lib/CMakeLists.txt gr-video-sdl/src/CMakeLists.txt
| * | | Added Windows DLL resource filesNicholas Corgan2013-03-0539-17/+1289
| |/ /
* | | Merge remote-tracking branch 'ncorgan/dll-rc-info_next' into nextTom Rondeau2013-03-055-3/+147
|\ \ \
| * | | Added Windows DLL resource files to next-only branchesNicholas Corgan2013-03-045-3/+147
| | | |
* | | | Merge branch 'master' into nextTom Rondeau2013-03-050-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'maint'Tom Rondeau2013-03-050-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | prefs: pass strings by reference. Also cleans up a comma in gr_modtool that ↵Tom Rondeau2013-03-054-29/+30
| | | | | | | | | | | | | | | | made a string into a tuple (and C++ angry).
* | | | Merge branch 'master' into nextTom Rondeau2013-03-056-30/+35
|\| | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/gr_prefs.cc
| * | | prefs: pass strings by reference. Also cleans up a comma in gr_modtool that ↵Tom Rondeau2013-03-054-29/+30
| | | | | | | | | | | | | | | | made a string into a tuple (and C++ angry).
| * | | blocks: added includes necessary for Windows compilationNicholas Corgan2013-03-052-0/+5
| | | |
* | | | build: adding GR_CTRLPORT definition to config.hTom Rondeau2013-03-052-0/+5
| | | |
* | | | Merge branch 'master' into nextTom Rondeau2013-03-052-0/+54
|\| | |
| * | | build: install our cmake modules into share/gnuradio/cmake/Modules.Tom Rondeau2013-03-051-0/+8
| | | |
| * | | build: create and install a config.h so external projects can know what we ↵Tom Rondeau2013-03-052-0/+46
| | | | | | | | | | | | | | | | built with.
* | | | Merge branch 'master' into nextTom Rondeau2013-03-051-5/+1
|\| | |
| * | | log: simplifying makefile since this variable is always set, even if blank.Tom Rondeau2013-03-051-5/+1
| | | |
* | | | Merge branch 'master' into nextTom Rondeau2013-03-041-6/+6
|\| | |
| * | | log: fixing build if log4cxx is not installed.Tom Rondeau2013-03-041-6/+6
| | | |
* | | | docs: fixing a section name collision.Tom Rondeau2013-03-041-1/+1
| | | |
* | | | atsc: rs.h include dir fixTim O'Shea2013-03-041-1/+1
| | | |