Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into next | Tom Rondeau | 2012-08-05 | 3 | -2/+5 |
|\ | |||||
| * | arm: better support for ARM processors without NEON. | Jaroslav Skarvada | 2012-08-05 | 3 | -2/+5 |
| | | |||||
* | | Merge branch 'qtsink_menus' into next | Tom Rondeau | 2012-07-29 | 6 | -9/+70 |
|\ \ | |||||
| * \ | Merge branch 'next' into qtsink_menus | Tom Rondeau | 2012-07-17 | 71 | -4420/+62 |
| |\ \ | |||||
| * | | | core: adding ability to change and reset skiphead parameters. | Tom Rondeau | 2012-07-05 | 3 | -4/+54 |
| | | | | |||||
| * | | | fft: adding a malloc for doubles. | Tom Rondeau | 2012-07-03 | 2 | -5/+15 |
| | | | | | | | | | | | | | | | | In core for master, also exporting symbols for use externally. | ||||
| * | | | Merge branch 'master' into my_qtsink | Tom Rondeau | 2012-06-24 | 1221 | -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 Long | 2012-07-29 | 1 | -5/+18 |
| | | | | | | | | | | | | | | | | | | | | The name of the tag was incorrect and improved behavior when updating info. | ||||
* | | | | | Merge branch 'master' into next | Tom Rondeau | 2012-07-19 | 5 | -0/+256 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | core: added message source that takes in tags for controlling bursts. | Nick Foster | 2012-07-19 | 5 | -0/+256 |
| | | | | |||||
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-07-07 | 9 | -900/+2 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt | ||||
| * | | | Revert "Merge remote branch 'jblum-github/python_blocks2' into master" | Johnathan Corgan | 2012-07-07 | 9 | -900/+2 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit f8581fb475267e1a97eaab962e423559fb4bfce2, reversing changes made to 73800434abfb8c6efcf069222b5f0fea9c86870b. | ||||
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-07-03 | 4 | -334/+31 |
|\| | | | |||||
| * | | | Merge branch 'maint' | Johnathan Corgan | 2012-07-03 | 3 | -334/+8 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: gruel/src/swig/CMakeLists.txt | ||||
| | * | | | swig: added additional swig dependencies gruel/core | Johnathan Corgan | 2012-07-03 | 1 | -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 deps | Josh Blum | 2012-07-03 | 3 | -334/+5 |
| | | | | | | | | | | | | | | | | | | | | We generate the docs so its important that the docs see this header generated first. | ||||
| * | | | | core: moved VMCIRCBUF related code to runtime | Josh Blum | 2012-07-03 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | This build stuff should not be at the top level. | ||||
* | | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-07-01 | 9 | -2/+900 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt | ||||
| * | | | | Merge remote branch 'jblum-github/python_blocks2' into master | Johnathan Corgan | 2012-07-01 | 9 | -2/+900 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/CMakeLists.txt gnuradio-core/src/lib/general/general.i | ||||
| | * | | | | python-blocks: replace assertItemsEqual with assertEqual | Josh Blum | 2012-04-27 | 1 | -6/+6 |
| | | | | | | |||||
| | * | | | | this is squashed python blocks support | Josh Blum | 2012-04-17 | 9 | -2/+900 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-06-29 | 1 | -17/+29 |
|\| | | | | | |||||
| * | | | | | core: fix for gri wave byteswapping | Josh Blum | 2012-06-28 | 1 | -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 next | Tom Rondeau | 2012-06-23 | 6 | -0/+266 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt gnuradio-core/src/lib/general/general.i | ||||
| * | | | | Merge branch 'master' of gnuradio.org:gnuradio | Tom Rondeau | 2012-06-23 | 1 | -8/+8 |
| |\ \ \ \ | |||||
| * | | | | | core: adds a tag debug sink to display all tags coming into it. | Tom Rondeau | 2012-06-22 | 6 | -0/+266 |
| | | | | | | | | | | | | | | | | | | | | | | | | This block is meant to help debug applications that use stream tags. | ||||
* | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-06-22 | 1 | -8/+8 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | gruel: got rid of inet.h and adjusted only file that depended on it | Nicholas Corgan | 2012-06-22 | 1 | -8/+8 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' into next | Tom Rondeau | 2012-06-21 | 3 | -116/+36 |
|\| | | | | |||||
| * | | | | core: tiny performance boost, and it looks tidier. | Martin Braun | 2012-06-21 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | core: fixes a very minor bug in gri_wavfile.cc and also makes a FIXME obsolete | Martin Braun | 2012-06-21 | 2 | -112/+33 |
| | | | | | |||||
* | | | | | Merge branch 'master' into next | Tom Rondeau | 2012-06-20 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Merge branch 'master-mods' | Tom Rondeau | 2012-06-20 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | 1. handle pmt serialize and deserialize for tuples | Tim O'Shea | 2012-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | 2. fix offset checking in pmt_annotator_raw | ||||
* | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2012-06-20 | 1 | -1/+33 |
|\| | | | | | |||||
| * | | | | | Merge branch 'gr_filter' | Johnathan Corgan | 2012-06-20 | 1 | -1/+33 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | filter: adding freq_xlating_filter. | Tom Rondeau | 2012-06-16 | 1 | -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 Rondeau | 2012-05-02 | 1 | -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 next | Tom Rondeau | 2012-06-16 | 1 | -3/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-digital/grc/digital_dxpsk_demod.xml gr-digital/grc/digital_dxpsk_mod.xml | ||||
| * | | | | | cmake: add support for SYSCONFDIR | Chí-Thanh Christopher Nguyễn | 2012-06-16 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set with 'cmake -DSYSCONFDIR=target ...' This fixes http://gnuradio.org/redmine/issues/492 | ||||
* | | | | | | Merge branch 'master' into next | Tom Rondeau | 2012-06-16 | 1 | -1/+1 |
|\| | | | | | |||||
| * | | | | | Merge branch 'master-mods' | Tom Rondeau | 2012-06-16 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master-mods' of git://github.com/osh/gnuradio-1 into master-mods | Tom Rondeau | 2012-06-16 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | New Features: | Tim O'Shea | 2012-06-15 | 1 | -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 next | Johnathan Corgan | 2012-06-14 | 1 | -2/+0 |
|\| | | | | | | | |||||
| * | | | | | | | Merge branch 'maint' | Johnathan Corgan | 2012-06-14 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | core: remove extraneous include statement | Johnathan Corgan | 2012-06-14 | 1 | -2/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'master' into next | Tom Rondeau | 2012-06-13 | 5 | -0/+204 |
|\| | | | | | | | |||||
| * | | | | | | | Merge branch 'master-mods' | Tom Rondeau | 2012-06-13 | 5 | -0/+204 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / | |||||
| | * | | | | | core: modifications to gr_annotator_raw. | Tom Rondeau | 2012-06-13 | 2 | -42/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using mutex to make add_tag and work thread safe. Throwing exception intead of asserting on error. |