From aa0cca173047fc268eb3acfcb7cc8cbb2d8c7581 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Wed, 14 Dec 2011 22:21:51 -0500
Subject: uhd: removes usrpm that should not have been there anymore (patch
 from Sam Bretheim).

---
 gr-uhd/examples/usrp_nbfm_ptt.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gr-uhd/examples/usrp_nbfm_ptt.py')

diff --git a/gr-uhd/examples/usrp_nbfm_ptt.py b/gr-uhd/examples/usrp_nbfm_ptt.py
index 3b28bc2ea..a2b6bae41 100755
--- a/gr-uhd/examples/usrp_nbfm_ptt.py
+++ b/gr-uhd/examples/usrp_nbfm_ptt.py
@@ -28,7 +28,6 @@ from optparse import OptionParser
 from gnuradio import gr, audio, blks2, uhd
 from gnuradio.eng_option import eng_option
 from gnuradio.wxgui import stdgui2, fftsink2, scopesink2, slider, form
-from usrpm import usrp_dbid
 
 from numpy import convolve, array
 
-- 
cgit 


From e4cf0d1b51b7bc9843e76e8d6e35097664b6f2b3 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Wed, 14 Dec 2011 22:23:50 -0500
Subject: uhd: fixes to instantiating UHD devices to set the antenna and
 subdevice properly (patch from Sam Bretheim).

---
 gr-uhd/examples/usrp_nbfm_ptt.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'gr-uhd/examples/usrp_nbfm_ptt.py')

diff --git a/gr-uhd/examples/usrp_nbfm_ptt.py b/gr-uhd/examples/usrp_nbfm_ptt.py
index a2b6bae41..075604af3 100755
--- a/gr-uhd/examples/usrp_nbfm_ptt.py
+++ b/gr-uhd/examples/usrp_nbfm_ptt.py
@@ -282,6 +282,14 @@ class transmit_path(gr.hier_block2):
 				
         self.u = uhd.usrp_sink(device_addr=args, stream_args=uhd.stream_args('fc32'))
 
+        # Set the subdevice spec
+        if(spec):
+            self.u.set_subdev_spec(spec, 0)
+
+        # Set the antenna
+        if(antenna):
+            self.u.set_antenna(antenna, 0)
+
         self.if_rate = 320e3
         self.audio_rate = 32e3
 
@@ -332,14 +340,6 @@ class transmit_path(gr.hier_block2):
 
         self.set_enable(False)
 
-        # Set the subdevice spec
-        if(spec):
-            self.u.set_subdev_spec(spec, 0)
-
-        # Set the antenna
-        if(antenna):
-            self.u.set_antenna(antenna, 0)
-
     def set_freq(self, target_freq):
         """
         Set the center frequency we're interested in.
-- 
cgit