Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | core: dont export totally inline classes | Josh Blum | 2012-09-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | These classes have no symbols actually grounded in the core library. Due to this exporting the class seems to confuse MSVC. Commenting out GR_CORE_API makes MSVC and gcc happy. | |||||
* | | Merge branch 'master' into next | Tom Rondeau | 2012-08-30 | 5 | -0/+192 | |
|\| | ||||||
| * | adding gr_endian_swap block | Tim O'Shea | 2012-08-30 | 5 | -0/+192 | |
| | | ||||||
* | | Merge remote branch 'jblum/fix_private_access' into next | Johnathan Corgan | 2012-08-28 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | core: fix use of private vars in place of API accessor | Josh Blum | 2012-08-14 | 1 | -1/+1 | |
| | | | ||||||
* | | | docs: fixed doxygen markup issues. | Tom Rondeau | 2012-08-28 | 1 | -0/+4 | |
| | | | ||||||
* | | | core: removed fft blocks from core (now only in gr-fft). | Tom Rondeau | 2012-08-20 | 10 | -643/+0 | |
| | | | ||||||
* | | | core: allowing gri_control_loop to be a pure-virtual parent class. | Tom Rondeau | 2012-08-20 | 1 | -0/+1 | |
|/ / | ||||||
* | | Merge branch 'next' into qtsink_menus | Tom Rondeau | 2012-07-17 | 56 | -3464/+6 | |
|\ \ | ||||||
| * | | Merge branch 'master' into next | Johnathan Corgan | 2012-07-07 | 5 | -445/+1 | |
| |\| | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt | |||||
| | * | Revert "Merge remote branch 'jblum-github/python_blocks2' into master" | Johnathan Corgan | 2012-07-07 | 5 | -445/+1 | |
| | | | | | | | | | | | | | | | This reverts commit f8581fb475267e1a97eaab962e423559fb4bfce2, reversing changes made to 73800434abfb8c6efcf069222b5f0fea9c86870b. | |||||
| * | | Merge branch 'master' into next | Johnathan Corgan | 2012-07-03 | 1 | -0/+4 | |
| |\| | ||||||
| | * | Merge branch 'maint' | Johnathan Corgan | 2012-07-03 | 1 | -0/+4 | |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: gruel/src/swig/CMakeLists.txt | |||||
| | | * | core: added general_generated to swig deps | Josh Blum | 2012-07-03 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | We generate the docs so its important that the docs see this header generated first. | |||||
| * | | | Merge branch 'master' into next | Johnathan Corgan | 2012-07-01 | 5 | -1/+445 | |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt | |||||
| | * | | Merge remote branch 'jblum-github/python_blocks2' into master | Johnathan Corgan | 2012-07-01 | 5 | -1/+445 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/CMakeLists.txt gnuradio-core/src/lib/general/general.i | |||||
| | | * | | this is squashed python blocks support | Josh Blum | 2012-04-17 | 5 | -1/+445 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into next | Tom Rondeau | 2012-06-23 | 5 | -0/+223 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt gnuradio-core/src/lib/general/general.i | |||||
| * | | | | Merge branch 'master' into next | Tom Rondeau | 2012-06-20 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | 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 | |||||
| * \ \ \ \ \ | Merge branch 'master' into next | Tom Rondeau | 2012-06-13 | 5 | -0/+204 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into next | Tom Rondeau | 2012-06-10 | 3 | -21/+38 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * | | | | | | | Merge branch 'master' into next | Tom Rondeau | 2012-06-10 | 16 | -29/+29 | |
| |\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'wip/digital-rm-next' into next | Johnathan Corgan | 2012-06-08 | 56 | -3464/+2 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/CMakeLists.txt gnuradio-core/src/lib/general/general.i grc/blocks/block_tree.xml | |||||
| | * | | | | | | | | core: removed gr_simple_framer after move to gr-digital | Johnathan Corgan | 2012-06-08 | 5 | -194/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | core: removed gr_packet_sink after move to gr-digital | Johnathan Corgan | 2012-06-08 | 5 | -363/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | core: remove gr_framer_sink_1 after move to gr-digital | Johnathan Corgan | 2012-06-08 | 5 | -335/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | core: remove gr_correlate_access_code_tag_bb after move to gr-digital | Johnathan Corgan | 2012-06-08 | 5 | -279/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | core: removed gr_diff_phasor_cc after move to gr-digital | Johnathan Corgan | 2012-06-08 | 5 | -151/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | core: remove gr_diff_encoder and gr_diff_decoder after move to gr-digital | Johnathan Corgan | 2012-06-07 | 8 | -298/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | core: removed gr_chunks_to_symbols_XX after move to gr-digital | Johnathan Corgan | 2012-06-06 | 1 | -12/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | core: removed gr_scrambler_bb after move to gr-digital | Johnathan Corgan | 2012-06-06 | 5 | -150/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | core: removed gr_probe_density_b after moving to gr-digital | Johnathan Corgan | 2012-06-06 | 5 | -180/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | core: removed gr_map_bb after transition to gr-digital | Johnathan Corgan | 2012-06-06 | 5 | -148/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | core: removed gr_glfsr* and gr_pn_correlator after transition to gr-digital | Johnathan Corgan | 2012-05-04 | 16 | -867/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | core: removed gr_descrambler_bb after transition to gr-digital | Johnathan Corgan | 2012-05-03 | 5 | -150/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | core: removed gr_bytes_to_syms after transition to gr-digital | Johnathan Corgan | 2012-05-03 | 5 | -168/+0 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | core: removed gr_additive_scrambler after transition to gr-digital | Johnathan Corgan | 2012-05-03 | 5 | -167/+0 | |
| | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
* | | | | | | | | | 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 | 450 | -2384/+3408 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | | | | | | core: adds a tag debug sink to display all tags coming into it. | Tom Rondeau | 2012-06-22 | 5 | -0/+223 | |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | This block is meant to help debug applications that use stream tags. | |||||
| * | | | | | | | 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 | |||||
| * | | | | | | 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-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. | |||||
| | * | | | | Merge branch 'master-mods' of git://github.com/osh/gnuradio-1 into master-mods | Tom Rondeau | 2012-06-13 | 5 | -0/+194 | |
| | |\ \ \ \ | ||||||
| | | * | | | | new block, gr_annotator_raw | Tim O'Shea | 2012-06-12 | 5 | -0/+194 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allows passing a raw pmt k->v pair from outside the flowgraph/python in at exact samples also added GRUEL autogenerated .i files to gnuradio-core-swig include line | |||||
| * | | | | | | Merge branch 'master-mods'maint-3.6.0 | Tom Rondeau | 2012-06-10 | 3 | -21/+38 | |
| |\| | | | | | | |_|_|_|/ | |/| | | | | ||||||
| | * | | | | Merge branch 'master-mods' of git://github.com/osh/gnuradio-1 into master-mods | Tom Rondeau | 2012-06-10 | 3 | -21/+38 | |
| | |\| | | |