Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge branch 'next' of gnuradio.org:gnuradio into next | Tom Rondeau | 2013-02-27 | 18 | -715/+15 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | core: removed gr_tuntap_pdu | Johnathan Corgan | 2013-02-27 | 5 | -252/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced by gr::blocks:tuntap_pdu | |||||
| * | | | | | | Merge branch 'master' into next | Johnathan Corgan | 2013-02-27 | 3 | -14/+15 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/io/gr_pdu_to_tagged_stream.cc gnuradio-core/src/lib/io/gr_tagged_stream_to_pdu.cc | |||||
| | * | | | | | Merge branch 'wip/pdu-tuntap' | Johnathan Corgan | 2013-02-27 | 3 | -14/+15 | |
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-blocks/include/blocks/CMakeLists.txt gr-blocks/lib/CMakeLists.txt gr-blocks/swig/blocks_swig.i | |||||
| | | * | | | | blocks: added gr::blocks::tuntap_pdu | Johnathan Corgan | 2013-02-27 | 3 | -14/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linux only | |||||
| * | | | | | | blocks: removing (un)pack_k_bits from gnuradio-core. | Tom Rondeau | 2013-02-27 | 10 | -449/+0 | |
| | | | | | | | ||||||
* | | | | | | | ctrlport: adding option to toggle export of the list of edges on/off. | Tom Rondeau | 2013-02-27 | 1 | -7/+9 | |
| | | | | | | | ||||||
* | | | | | | | ctrlport: adding minor protection for dropped data onto plot so we don't ↵ | Tom Rondeau | 2013-02-27 | 2 | -7/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | just try and plot random stuff. | |||||
* | | | | | | | ctrlport: Allows drag-and-drop from table list to a plotter to add a new ↵ | Tom Rondeau | 2013-02-27 | 2 | -424/+298 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | curve to the plot. | |||||
* | | | | | | | ctrlport: turn off controlport inside gr-ctrlport-monitor for plotters. | Tom Rondeau | 2013-02-26 | 1 | -3/+8 | |
| | | | | | | | ||||||
* | | | | | | | ctrlport: fixed example's use of blocks.throttle. | Tom Rondeau | 2013-02-26 | 1 | -32/+32 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'next' of gnuradio.org:gnuradio into next | Tom Rondeau | 2013-02-26 | 6 | -238/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Merge branch 'master' into next | Tom Rondeau | 2013-02-26 | 1 | -0/+6 | |
| |\| | | | | | ||||||
| | * | | | | | core: adding a mutex as a protected member of gr_block for use in protecting ↵ | Tom Rondeau | 2013-02-26 | 1 | -1/+7 | |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set and work function access to variables. This is used in gr-analog's noise_source and gr-filter's fir_filter_XXX since these two cause particular problems (in next's channel model). This shows the use of the mutex for general protection when needed. | |||||
| * | | | | | blocks: removing gr_transcendental from gnuradio-core. | Tom Rondeau | 2013-02-26 | 5 | -238/+0 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'next' of gnuradio.org:gnuradio into next | Tom Rondeau | 2013-02-26 | 24 | -1110/+24 | |
|\| | | | | | |_|/ / / |/| | | | | ||||||
| * | | | | blocks: removing throttle, threshold, stretch from gnuradio-core. | Tom Rondeau | 2013-02-24 | 17 | -549/+24 | |
| | | | | | ||||||
| * | | | | blocks: removed peak_detector2 and regenerate blocks from gnuradio-core. | Tom Rondeau | 2013-02-24 | 9 | -561/+0 | |
| | | | | | ||||||
* | | | | | core: adds a function to top_block to get a list of edges as a string. | Tom Rondeau | 2013-02-22 | 8 | -1/+51 | |
|/ / / / | | | | | | | | | | | | | Also exports it through ControlPort. | |||||
* | | | | ctrlport: added an option to allow enabling/disable of perfcounters over ↵ | Tom Rondeau | 2013-02-22 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | ctrlport. | |||||
* | | | | Merge branch 'next' of gnuradio.org:gnuradio into next | Tom Rondeau | 2013-02-21 | 1 | -3/+5 | |
|\ \ \ \ | ||||||
| * | | | | Merge branch 'master' into next | Johnathan Corgan | 2013-02-21 | 1 | -3/+5 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/general/gr_random_pdu.cc volk/apps/volk_profile.cc | |||||
| | * | | | Merge remote-tracking branch 'ncorgan/random_pdu_fix' | Johnathan Corgan | 2013-02-21 | 1 | -3/+4 | |
| | |\ \ \ | ||||||
| | | * | | | core: fixed gr_random_pdu MSVC incompatibility issue | Nicholas Corgan | 2013-02-18 | 1 | -3/+4 | |
| | | | | | | ||||||
| | * | | | | core: removed vestigial debug line. | Tom Rondeau | 2013-02-19 | 1 | -1/+0 | |
| | | | | | | ||||||
| | * | | | | core: prefs setup looks for a local .gnuradio/config.conf to use. | Tom Rondeau | 2013-02-19 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Order of precedence: env. vars -> .gnuradio/config.conf -> ${prefix}/etc/gnuradio/conf.d/* | |||||
* | | | | | | blocks: removing blocks from gnuradio-core. | Tom Rondeau | 2013-02-21 | 25 | -1770/+177 | |
|/ / / / / | | | | | | | | | | | | | | | | delay, rms, packed_to_unpacked, unpacked_to_packed. | |||||
* | | | | | ctrlport: made display type in ControlPort setup field into an options mask. | Tom Rondeau | 2013-02-20 | 12 | -83/+143 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Options are used to determine default plot type, type of plots available, initial states. qtgui: fixed enabling stem plot to properly check the menu option. | |||||
* | | | | | digital: cleaning up conversion to 3.7 for simple_correlator. | Tom Rondeau | 2013-02-20 | 7 | -510/+0 | |
| | | | | | | | | | | | | | | | | | | | | blocks: same for count_bits. | |||||
* | | | | | core: removed vestigial debug line. | Tom Rondeau | 2013-02-19 | 1 | -1/+0 | |
| | | | | | ||||||
* | | | | | core: prefs setup looks for a local .gnuradio/config.conf to use. | Tom Rondeau | 2013-02-19 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Order of precedence: env. vars -> .gnuradio/config.conf -> ${prefix}/etc/gnuradio/conf.d/* | |||||
* | | | | | core: use prefs file to enable/disable ctrlport export of perf. counters. | Tom Rondeau | 2013-02-19 | 1 | -5/+8 | |
| | | | | | ||||||
* | | | | | ctrlport: using prefs files to configure ctrlport. | Tom Rondeau | 2013-02-19 | 1 | -29/+9 | |
| | | | | | | | | | | | | | | | | | | | | Prefs file points to ctrlport config file and uses it to set the properties. | |||||
* | | | | | ctrlport: adding a config param to enable/disable controlport, default=disabled. | Tom Rondeau | 2013-02-18 | 4 | -7/+23 | |
| | | | | | | | | | | | | | | | | | | | | Also updates QA code for ctrlport to turn controlport on via env var. | |||||
* | | | | | core: prefs updated to handle cases of env var delared properly. | Tom Rondeau | 2013-02-18 | 2 | -12/+22 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into next | Johnathan Corgan | 2013-02-17 | 1 | -0/+1 | |
|\| | | | | ||||||
| * | | | | Merge branch 'maint' | Johnathan Corgan | 2013-02-17 | 1 | -0/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | core: added missing include for gruel thread | Josh Blum | 2013-02-17 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | ctrlport: fixing typo in gr_throttle RPC export. | Tom Rondeau | 2013-02-17 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' into next | Tom Rondeau | 2013-02-17 | 6 | -12/+160 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/python/gnuradio/gr/__init__.py | |||||
| * | | | | | core: if the config files don't exist, just return an empty list; don't fail. | Tom Rondeau | 2013-02-17 | 1 | -2/+3 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'cpp_prefs' | Tom Rondeau | 2013-02-17 | 6 | -12/+159 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | core: prefs of true/on/1 and false/off/0 are translated to bools. | Tom Rondeau | 2013-02-16 | 1 | -2/+2 | |
| | | | | | | | ||||||
| | * | | | | | core: add ability to override config files with environmental variables. | Tom Rondeau | 2013-02-16 | 1 | -2/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Env variables are named GR_CONF_<SECTION>_<OPTION> where the section is the [<section>] name from the config file and the option is the actual option name, all in upercase. | |||||
| | * | | | | | core: only query preferences database once at start of block_executor. | Tom Rondeau | 2013-02-16 | 2 | -4/+11 | |
| | | | | | | | ||||||
| | * | | | | | core: adding and using a PerfCounters section to the config files. | Tom Rondeau | 2013-02-16 | 1 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | gr_block_executor will read the config files to determine if the perf counters are on or off. | |||||
| | * | | | | | core: Making an all C++ version of the preferences/config file readers. | Tom Rondeau | 2013-02-16 | 4 | -10/+133 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces the Python config parser stuff; should have same functionality that we need. | |||||
| * | | | | | | Merge branch 'master' of gnuradio.org:gnuradio | Tom Rondeau | 2013-02-17 | 3 | -5/+19 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge branch 'next' of gnuradio.org:gnuradio into next | Tom Rondeau | 2013-02-17 | 3 | -5/+21 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-channels/lib/fading_model_impl.cc | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into next | Johnathan Corgan | 2013-02-17 | 3 | -5/+21 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/src/lib/io/gr_message_debug.cc gnuradio-core/src/python/gnuradio/gr/qa_pdu.py |