Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into next | Tom Rondeau | 2013-03-07 | 1 | -2/+1 |
|\ | | | | | | | | | Conflicts: gnuradio-core/src/python/gnuradio/gr/qa_pdu.py | ||||
| * | core: moving over setting of max_messages option to conf.in file. | Tom Rondeau | 2013-03-07 | 1 | -2/+1 |
| | | | | | | | | blocks: these timers were actually doing much, so we can speed up the tests. | ||||
* | | blocks: removing bin_statistics_f from core; now in gr-blocks. | Tom Rondeau | 2013-03-07 | 1 | -7/+6 |
| | | |||||
* | | Merge branch 'master' into next | Tom Rondeau | 2013-03-07 | 1 | -15/+11 |
|\| | |||||
| * | blocks: moving bin_statistics_f into gr-blocks. | Tom Rondeau | 2013-03-07 | 1 | -0/+227 |
| | | | | | | | | QA worked, but keeping disabled for now in reference to issue #199. | ||||
* | | blocks: removing burst_tagger from core; now in gr-blocks. | Tom Rondeau | 2013-03-06 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into next | Tom Rondeau | 2013-03-06 | 1 | -0/+60 |
|\| | |||||
| * | blocks: moved burst_tagger to gr-blocks. | Tom Rondeau | 2013-03-06 | 1 | -0/+60 |
| | | |||||
* | | blocks: removing gr_tag_debug from core; now in gr-blocks. | Tom Rondeau | 2013-03-06 | 2 | -3/+3 |
| | | | | | | | | Also removes stray reference to gri_fft.h. | ||||
* | | Merge branch 'master' into next | Tom Rondeau | 2013-03-06 | 1 | -0/+44 |
|\| | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | blocks: moving tag_debug block to gr-blocks. | Tom Rondeau | 2013-03-06 | 1 | -0/+44 |
| | | |||||
* | | blocks: removing blocks moved into gr-blocks: | Tom Rondeau | 2013-03-06 | 2 | -3/+3 |
| | | | | | | | | message_strobe, message_debug, message_source, message_sink, message_burst_source, peak_detector, moving_average. | ||||
* | | Merge branch 'master' into next | Tom Rondeau | 2013-03-06 | 4 | -1/+338 |
|\| | | | | | | | | | Conflicts: gr-blocks/grc/blocks_block_tree.xml | ||||
| * | blocks: moving peak_detector and moving_average to gr-blocks. | Tom Rondeau | 2013-03-06 | 3 | -1/+189 |
| | | |||||
| * | blocks: moving message blocks to gr-blocks. | Tom Rondeau | 2013-03-06 | 1 | -0/+149 |
| | | | | | | | | message_burst_source, message_source, message_sink, message_debug, message_strobe. | ||||
* | | Merge branch 'master' into next | Tom Rondeau | 2013-03-02 | 3 | -10/+149 |
|\| | | | | | | | | | | | Conflicts: gr-blocks/python/qa_probe_signal.py gr-blocks/swig/blocks_swig.i | ||||
| * | blocks: moving mute, probe_signal, probe_signal_v, and sample_and_hold to ↵ | Tom Rondeau | 2013-03-02 | 3 | -0/+208 |
| | | | | | | | | gr-blocks. | ||||
* | | Merge branch 'master' into next | Tom Rondeau | 2013-02-28 | 2 | -44/+33 |
|\| | | | | | | | | | | | Conflicts: gr-blocks/python/qa_argmax.py gr-blocks/python/qa_max.py | ||||
| * | blocks: moving argmax and max to gr-blocks. | Tom Rondeau | 2013-02-28 | 2 | -0/+138 |
| | | |||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2013-02-28 | 1 | -0/+92 |
|\| | | | | | | | | | Conflicts: gr-blocks/lib/stream_pdu_base.cc | ||||
| * | blocks: added gr::blocks::tagged_stream_to_pdu | Johnathan Corgan | 2013-02-28 | 1 | -0/+92 |
| | | |||||
* | | Merge branch 'master' into next | Tom Rondeau | 2013-02-27 | 2 | -0/+125 |
|\| | |||||
| * | blocks: moved pack_k_bits to gr-blocks. | Tom Rondeau | 2013-02-26 | 1 | -0/+68 |
| | | |||||
| * | blocks: moving unpack_k_bits to gr-blocks. | Tom Rondeau | 2013-02-26 | 1 | -0/+57 |
| | | |||||
* | | blocks: turning off controlport for these tests. If a port is specified, it ↵ | Tom Rondeau | 2013-02-26 | 2 | -0/+3 |
| | | | | | | | | can clash. | ||||
* | | Merge branch 'master' into next | Tom Rondeau | 2013-02-26 | 1 | -0/+90 |
|\| | |||||
| * | blocks: moved transcendental block to gr-blocks. | Tom Rondeau | 2013-02-25 | 1 | -0/+90 |
| | | |||||
* | | blocks: removing throttle, threshold, stretch from gnuradio-core. | Tom Rondeau | 2013-02-24 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into next | Tom Rondeau | 2013-02-24 | 5 | -0/+308 |
|\| | | | | | | | | | Conflicts: gr-blocks/grc/blocks_block_tree.xml | ||||
| * | blocks: adding threshold, strech, and throttle to gr-blocks. | Tom Rondeau | 2013-02-24 | 3 | -0/+160 |
| | | |||||
| * | blocks: converted peak_detector2 and regenerate to v3.7. | Tom Rondeau | 2013-02-24 | 2 | -0/+148 |
| | | |||||
| * | blocks: fixing use of packed/unpacked from gr-blocks in QA code. | Tom Rondeau | 2013-02-21 | 1 | -28/+28 |
| | | |||||
* | | blocks: removing blocks from gnuradio-core. | Tom Rondeau | 2013-02-21 | 1 | -28/+28 |
| | | | | | | | | delay, rms, packed_to_unpacked, unpacked_to_packed. | ||||
* | | Merge branch 'master' into next | Tom Rondeau | 2013-02-21 | 4 | -2/+494 |
|\| | |||||
| * | blocks: converting blocks to v3.7 style in gr-blocks. | Tom Rondeau | 2013-02-21 | 4 | -2/+494 |
| | | | | | | | | delay, rms, unpacked_to_packed, packed_to_unpacked | ||||
* | | Merge branch 'pmt_rename' into next | Tom Rondeau | 2013-01-02 | 2 | -60/+59 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/io/gr_pdu.cc gruel/src/lib/pmt/pmt.cc gruel/src/lib/pmt/qa_pmt_prims.cc gruel/src/lib/pmt/unv_template.cc.t gruel/src/swig/pmt_swig.i | ||||
| * | | gruel: using new pmt naming. | Tom Rondeau | 2012-12-21 | 2 | -60/+59 |
| |/ | |||||
* / | blocks: removes blocks moved to gr-blocks from gnuradio-core. | Tom Rondeau | 2012-12-21 | 9 | -60/+616 |
|/ | | | | Also fixes up some other missing moves. | ||||
* | blocks: fixing up QA of metadata to not rely on non-dependency components. | Tom Rondeau | 2012-12-15 | 1 | -17/+22 |
| | |||||
* | blocks: fixing up metadata parser. | Tom Rondeau | 2012-12-15 | 1 | -3/+8 |
| | |||||
* | blocks: moving file metadata sink/source to gr-blocks. | Tom Rondeau | 2012-12-14 | 3 | -0/+386 |
| | |||||
* | blocks: fix for qa_patterned_interleaver. | Tom Rondeau | 2012-11-28 | 1 | -1/+1 |
| | |||||
* | patterned qa added, bugs fixed | Tim O'Shea | 2012-11-28 | 1 | -0/+56 |
| | |||||
* | gr: apply pattern for g37f7522 and gc4c0ce9 to gr-analog and gr-blocks | Johnathan Corgan | 2012-11-14 | 1 | -7/+7 |
| | |||||
* | Merge branch 'maint' | Johnathan Corgan | 2012-11-04 | 1 | -1/+1 |
| | | | | (commit chunk for gr-blocks added back in) | ||||
* | blocks: added gr::blocks::vector_to_streams | Johnathan Corgan | 2012-09-04 | 1 | -2/+2 |
| | |||||
* | blocks: added gr::blocks::vector_to_stream | Johnathan Corgan | 2012-09-04 | 1 | -2/+1 |
| | |||||
* | blocks: added gr::blocks::streams_to_stream | Johnathan Corgan | 2012-09-04 | 1 | -1/+2 |
| | |||||
* | blocks: added gr::blocks::stream_to_streams | Johnathan Corgan | 2012-08-30 | 1 | -0/+138 |
| | |||||
* | blocks: added gr::blocks::stream_mux | Johnathan Corgan | 2012-08-30 | 1 | -0/+169 |
| |