diff options
| author | Johnathan Corgan | 2010-05-21 18:12:41 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-05-21 18:12:41 -0700 |
| commit | 16c0a87dc5c53ca28071b76f50b31317d4c519f1 (patch) | |
| tree | 54b06374c5a9640f95a19977d4b0b4acd91211b0 /grc | |
| parent | 58a6e6c74dcc85979682f029ccbb6039cf20ae56 (diff) | |
| parent | 2c4bb0b5ea22ed73f3de6cac8a27083d950879bb (diff) | |
| download | gnuradio-16c0a87dc5c53ca28071b76f50b31317d4c519f1.tar.gz gnuradio-16c0a87dc5c53ca28071b76f50b31317d4c519f1.tar.bz2 gnuradio-16c0a87dc5c53ca28071b76f50b31317d4c519f1.zip | |
Merge remote branch 'jblum/uhd' into next
* jblum/uhd:
using the send and recv full buffer modes, avoids extra loop in implementation
Added call to get access to the underlying uhd simple usrp object.
added docs to uhd grc blocks, added pkg config path to make support easier
typo fix, called variable ant, not antenna
added to uhd grc files, also removed warning for grc generator with uhd blocks
added more access methods to uhd source and sink
fix for paradigm shift
Use simple usrp from uhd.
gr-uhd working with io type
added swig includes and tune result return
using new streaming api
added set center freq call
Added samp rate param and using the simple device from uhd
removed timeout from here
Got the source and sink working with current uhd.
Added the uhd simple sink lib block, swig wrapper, grc wrapper.
using samples prop, added unchecked in files for utils and grc rx wrapper
recv noise with uhd
Created simple source (with nothing in it) and some swig build stuff.
Created gr uhd skeleton build.
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/python/Generator.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/grc/python/Generator.py b/grc/python/Generator.py index acd98ef84..d53802bef 100644 --- a/grc/python/Generator.py +++ b/grc/python/Generator.py @@ -58,7 +58,7 @@ class Generator(object): def write(self): #do throttle warning all_keys = ' '.join(map(lambda b: b.get_key(), self._flow_graph.get_enabled_blocks())) - if ('usrp' not in all_keys) and ('audio' not in all_keys) and ('throttle' not in all_keys) and self._generate_options != 'hb': + if ('usrp' not in all_keys) and ('uhd' not in all_keys) and ('audio' not in all_keys) and ('throttle' not in all_keys) and self._generate_options != 'hb': Messages.send_warning('''\ This flow graph may not have flow control: no audio or usrp blocks found. \ Add a Misc->Throttle block to your flow graph to avoid CPU congestion.''') |