summaryrefslogtreecommitdiff
path: root/gnuradio-core/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nextTom Rondeau2012-08-053-2/+5
|\
| * arm: better support for ARM processors without NEON.Jaroslav Skarvada2012-08-053-2/+5
| |
* | Merge branch 'qtsink_menus' into nextTom Rondeau2012-07-296-9/+70
|\ \
| * \ Merge branch 'next' into qtsink_menusTom Rondeau2012-07-1771-4420/+62
| |\ \
| * | | core: adding ability to change and reset skiphead parameters.Tom Rondeau2012-07-053-4/+54
| | | |
| * | | fft: adding a malloc for doubles.Tom Rondeau2012-07-032-5/+15
| | | | | | | | | | | | | | | | In core for master, also exporting symbols for use externally.
| * | | Merge branch 'master' into my_qtsinkTom Rondeau2012-06-241221-7966/+9486
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-qtgui/include/qtgui_sink_c.h gr-qtgui/include/qtgui_sink_f.h gr-qtgui/include/qtgui_util.h gr-qtgui/lib/ConstellationDisplayPlot.cc gr-qtgui/lib/FrequencyDisplayPlot.cc gr-qtgui/lib/SpectrumGUIClass.cc gr-qtgui/lib/TimeDomainDisplayPlot.cc gr-qtgui/lib/WaterfallDisplayPlot.cc gr-qtgui/lib/qtgui_sink_c.cc gr-qtgui/lib/qtgui_sink_f.cc gr-qtgui/lib/spectrumdisplayform.cc
* | | | | tags: some fixes to the tagged_file_sink block.Jeff Long2012-07-291-5/+18
| | | | | | | | | | | | | | | | | | | | The name of the tag was incorrect and improved behavior when updating info.
* | | | | Merge branch 'master' into nextTom Rondeau2012-07-195-0/+256
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | core: added message source that takes in tags for controlling bursts.Nick Foster2012-07-195-0/+256
| | | |
* | | | Merge branch 'master' into nextJohnathan Corgan2012-07-079-900/+2
|\| | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt
| * | | Revert "Merge remote branch 'jblum-github/python_blocks2' into master"Johnathan Corgan2012-07-079-900/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit f8581fb475267e1a97eaab962e423559fb4bfce2, reversing changes made to 73800434abfb8c6efcf069222b5f0fea9c86870b.
* | | | Merge branch 'master' into nextJohnathan Corgan2012-07-034-334/+31
|\| | |
| * | | Merge branch 'maint'Johnathan Corgan2012-07-033-334/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: gruel/src/swig/CMakeLists.txt
| | * | | swig: added additional swig dependencies gruel/coreJohnathan Corgan2012-07-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pmt swig gen depends upon the generated header core depends upon pmt swig custom target Conflicts: gruel/src/swig/CMakeLists.txt
| | * | | core: added general_generated to swig depsJosh Blum2012-07-033-334/+5
| | | | | | | | | | | | | | | | | | | | We generate the docs so its important that the docs see this header generated first.
| * | | | core: moved VMCIRCBUF related code to runtimeJosh Blum2012-07-031-0/+23
| | | | | | | | | | | | | | | | | | | | This build stuff should not be at the top level.
* | | | | Merge branch 'master' into nextJohnathan Corgan2012-07-019-2/+900
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt
| * | | | Merge remote branch 'jblum-github/python_blocks2' into masterJohnathan Corgan2012-07-019-2/+900
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/CMakeLists.txt gnuradio-core/src/lib/general/general.i
| | * | | | python-blocks: replace assertItemsEqual with assertEqualJosh Blum2012-04-271-6/+6
| | | | | |
| | * | | | this is squashed python blocks supportJosh Blum2012-04-179-2/+900
| | | | | |
* | | | | | Merge branch 'master' into nextJohnathan Corgan2012-06-291-17/+29
|\| | | | |
| * | | | | core: fix for gri wave byteswappingJosh Blum2012-06-281-17/+29
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorry guys, I misunderstood the comments. Wave data is specifically in little endian format. Therefore we should only be swapping on big endian machines. Since systems only provide network endian macros: The following commit provides a cross platform byteswap and macros for host to/from worknet short and long.
* | | | | Merge branch 'master' into nextTom Rondeau2012-06-236-0/+266
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt gnuradio-core/src/lib/general/general.i
| * | | | Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau2012-06-231-8/+8
| |\ \ \ \
| * | | | | core: adds a tag debug sink to display all tags coming into it.Tom Rondeau2012-06-226-0/+266
| | | | | | | | | | | | | | | | | | | | | | | | This block is meant to help debug applications that use stream tags.
* | | | | | Merge branch 'master' into nextJohnathan Corgan2012-06-221-8/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | gruel: got rid of inet.h and adjusted only file that depended on itNicholas Corgan2012-06-221-8/+8
| |/ / / /
* | | | | Merge branch 'master' into nextTom Rondeau2012-06-213-116/+36
|\| | | |
| * | | | core: tiny performance boost, and it looks tidier.Martin Braun2012-06-211-4/+3
| | | | |
| * | | | core: fixes a very minor bug in gri_wavfile.cc and also makes a FIXME obsoleteMartin Braun2012-06-212-112/+33
| | | | |
* | | | | Merge branch 'master' into nextTom Rondeau2012-06-201-1/+1
|\| | | |
| * | | | Merge branch 'master-mods'Tom Rondeau2012-06-201-1/+1
| |\ \ \ \
| | * | | | 1. handle pmt serialize and deserialize for tuplesTim O'Shea2012-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 2. fix offset checking in pmt_annotator_raw
* | | | | | Merge branch 'master' into nextJohnathan Corgan2012-06-201-1/+33
|\| | | | |
| * | | | | Merge branch 'gr_filter'Johnathan Corgan2012-06-201-1/+33
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | filter: adding freq_xlating_filter.Tom Rondeau2012-06-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes QA and GRC. Update to build_utils adds a FIR_TYPE for the type of filter and CFIR_TYPE for the type of filter where the taps are always complex (needed for freq_xlating_filter).
| | * | | | filter: Reworking filter to have a set of basic implementation classes for ↵Tom Rondeau2012-05-021-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filters of different kinds. The GR blocks are templated now and call from fir_filters for the volk-specific implemenation. Note the modification to build_utils.py to accomodate these changes.
* | | | | | Merge branch 'master' into nextTom Rondeau2012-06-161-3/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-digital/grc/digital_dxpsk_demod.xml gr-digital/grc/digital_dxpsk_mod.xml
| * | | | | cmake: add support for SYSCONFDIRChí-Thanh Christopher Nguyễn2012-06-161-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set with 'cmake -DSYSCONFDIR=target ...' This fixes http://gnuradio.org/redmine/issues/492
* | | | | | Merge branch 'master' into nextTom Rondeau2012-06-161-1/+1
|\| | | | |
| * | | | | Merge branch 'master-mods'Tom Rondeau2012-06-161-1/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master-mods' of git://github.com/osh/gnuradio-1 into master-modsTom Rondeau2012-06-161-1/+1
| | |\ \ \ \ \
| | | * | | | | New Features:Tim O'Shea2012-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added support for pmt_serialize and pmt_deserialize for uint64_t type pmts added gr_add_const_bb typed block to gr_add_const_XX gengen
* | | | | | | | Merge branch 'master' into nextJohnathan Corgan2012-06-141-2/+0
|\| | | | | | |
| * | | | | | | Merge branch 'maint'Johnathan Corgan2012-06-141-2/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | core: remove extraneous include statementJohnathan Corgan2012-06-141-2/+0
| | | | | | | |
* | | | | | | | Merge branch 'master' into nextTom Rondeau2012-06-135-0/+204
|\| | | | | | |
| * | | | | | | Merge branch 'master-mods'Tom Rondeau2012-06-135-0/+204
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | core: modifications to gr_annotator_raw.Tom Rondeau2012-06-132-42/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using mutex to make add_tag and work thread safe. Throwing exception intead of asserting on error.