diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-27 10:29:10 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-08-27 10:29:10 -0700 |
| commit | 1c0d7cd79b245b85b516496916a55695452e34ff (patch) | |
| tree | 6acda20e055e4f69f06af39a548204d8934beb63 /gr-uhd | |
| parent | 1db4890b85375a0b9cff035c4bff3580282f7ad1 (diff) | |
| parent | 6aa8c0b0f4d0a12f53cb61f48c3dc056935634ce (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-runtime/include/gnuradio/logger.h
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/grc/gen_uhd_usrp_blocks.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gr-uhd/grc/gen_uhd_usrp_blocks.py b/gr-uhd/grc/gen_uhd_usrp_blocks.py index e99de0d7d0..8b7c58682a 100644 --- a/gr-uhd/grc/gen_uhd_usrp_blocks.py +++ b/gr-uhd/grc/gen_uhd_usrp_blocks.py @@ -517,6 +517,10 @@ PARAMS_TMPL = """ <param> <name>RX2</name> <key>RX2</key> </option> + <option> + <name>RX1</name> + <key>RX1</key> + </option> #end if <tab>RF Options</tab> </param> |