uhd: fixes to instantiating UHD devices to set the antenna and subdevice properly (patch from Sam Bretheim).

20 files changed, 151 insertions, 150 deletions

diff --git a/gr-digital/examples/narrowband/uhd_interface.py b/gr-digital/examples/narrowband/uhd_interface.py
index 27e370911..fe022c731 100644
--- a/gr-digital/examples/narrowband/uhd_interface.py
+++ b/gr-digital/examples/narrowband/uhd_interface.py
@@ -50,14 +50,6 @@ class uhd_interface:
         else:
             self.u = uhd.usrp_source(device_addr=args, stream_args=uhd.stream_args('fc32'))
 
-        self._args = args
-        self._ant  = antenna
-        self._spec = spec
-        self._gain = self.set_gain(gain)
-        self._freq = self.set_freq(freq)
-
-        self._rate, self._sps = self.set_sample_rate(sym_rate, sps)
-
         # Set the subdevice spec
         if(spec):
             self.u.set_subdev_spec(spec, 0)
@@ -66,6 +58,14 @@ class uhd_interface:
         if(antenna):
             self.u.set_antenna(antenna, 0)
         
+        self._args = args
+        self._ant  = antenna
+        self._spec = spec
+        self._gain = self.set_gain(gain)
+        self._freq = self.set_freq(freq)
+
+        self._rate, self._sps = self.set_sample_rate(sym_rate, sps)
+
     def set_sample_rate(self, sym_rate, req_sps):
         start_sps = req_sps
         while(True):
diff --git a/gr-digital/examples/ofdm/uhd_interface.py b/gr-digital/examples/ofdm/uhd_interface.py
index 14a542b0f..e4b13955d 100644
--- a/gr-digital/examples/ofdm/uhd_interface.py
+++ b/gr-digital/examples/ofdm/uhd_interface.py
@@ -50,14 +50,6 @@ class uhd_interface:
         else:
             self.u = uhd.usrp_source(device_addr=args, stream_args=uhd.stream_args('fc32'))
 
-        self._args = args
-        self._ant  = antenna
-        self._spec = spec
-        self._gain = self.set_gain(gain)
-        self._freq = self.set_freq(freq)
-
-        self._rate = self.set_sample_rate(bandwidth)
-
         # Set the subdevice spec
         if(spec):
             self.u.set_subdev_spec(spec, 0)
@@ -66,6 +58,14 @@ class uhd_interface:
         if(antenna):
             self.u.set_antenna(antenna, 0)
         
+        self._args = args
+        self._ant  = antenna
+        self._spec = spec
+        self._gain = self.set_gain(gain)
+        self._freq = self.set_freq(freq)
+
+        self._rate = self.set_sample_rate(bandwidth)
+
     def set_sample_rate(self, bandwidth):
         self.u.set_samp_rate(bandwidth)
         actual_bw = self.u.get_samp_rate()
diff --git a/gr-qtgui/apps/uhd_display.py b/gr-qtgui/apps/uhd_display.py
index 94e4f099c..30325a2c8 100755
--- a/gr-qtgui/apps/uhd_display.py
+++ b/gr-qtgui/apps/uhd_display.py
@@ -172,6 +172,10 @@ class my_top_block(gr.top_block):
         self.qapp = QtGui.QApplication(sys.argv)
 
         self.u = uhd.usrp_source(device_addr=options.address, stream_args=uhd.stream_args('fc32'))
+
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
         self.set_bandwidth(options.samp_rate)
 
         if options.gain is None:
@@ -186,9 +190,6 @@ class my_top_block(gr.top_block):
             options.freq = float(r.start()+r.stop())/2
         self.set_frequency(options.freq)
 
-        if(options.antenna):
-            self.u.set_antenna(options.antenna, 0)
-
         self._fftsize = options.fft_size
 
         self.snk = qtgui.sink_c(options.fft_size,
diff --git a/gr-shd/apps/shd_fft.py b/gr-shd/apps/shd_fft.py
index 81e84d383..46832784d 100755
--- a/gr-shd/apps/shd_fft.py
+++ b/gr-shd/apps/shd_fft.py
@@ -71,6 +71,9 @@ class app_top_block(stdgui2.std_top_block):
                                     io_type=shd.io_type.COMPLEX_FLOAT32,
                                     num_channels=1)
 
+        if(options.antenna):
+            self.src.set_antenna(options.antenna, 0)
+
         self.src.set_samp_rate(options.samp_rate)
         input_rate = self.src.get_samp_rate()
 
@@ -112,9 +115,6 @@ class app_top_block(stdgui2.std_top_block):
             
         self.set_gain(options.gain)
 
-        if(options.antenna):
-            self.src.set_antenna(options.antenna, 0)
-
         if self.show_debug_info:
             self.myform['samprate'].set_value(self.src.get_samp_rate())
             self.myform['fs@gbe'].set_value(input_rate)
diff --git a/gr-uhd/apps/uhd_fft.py b/gr-uhd/apps/uhd_fft.py
index 7ebf5e106..a9bb1435e 100755
--- a/gr-uhd/apps/uhd_fft.py
+++ b/gr-uhd/apps/uhd_fft.py
@@ -85,6 +85,10 @@ class app_top_block(stdgui2.std_top_block):
         if(options.spec):
             self.u.set_subdev_spec(options.spec, 0)
 
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
         self.u.set_samp_rate(options.samp_rate)
         input_rate = self.u.get_samp_rate()
         
@@ -128,10 +132,6 @@ class app_top_block(stdgui2.std_top_block):
             
         self.set_gain(options.gain)
 
-        # Set the antenna
-        if(options.antenna):
-            self.u.set_antenna(options.antenna, 0)
-
         if self.show_debug_info:
             self.myform['samprate'].set_value(self.u.get_samp_rate())
             self.myform['rffreq'].set_value(0)
diff --git a/gr-uhd/apps/uhd_rx_cfile.py b/gr-uhd/apps/uhd_rx_cfile.py
index 61d5342c5..ea2aad8fe 100755
--- a/gr-uhd/apps/uhd_rx_cfile.py
+++ b/gr-uhd/apps/uhd_rx_cfile.py
@@ -47,6 +47,14 @@ class rx_cfile_block(gr.top_block):
             self._u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('fc32'))
             self._sink = gr.file_sink(gr.sizeof_gr_complex, filename)
 
+        # Set the subdevice spec
+        if(options.spec):
+            self._u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self._u.set_antenna(options.antenna, 0)
+
         # Set receiver sample rate
         self._u.set_samp_rate(options.samp_rate)
 
@@ -57,14 +65,6 @@ class rx_cfile_block(gr.top_block):
 	    print "Using mid-point gain of", options.gain, "(", g.start(), "-", g.stop(), ")"
         self._u.set_gain(options.gain)
 
-        # Set the subdevice spec
-        if(options.spec):
-            self._u.set_subdev_spec(options.spec, 0)
-
-        # Set the antenna
-        if(options.antenna):
-            self._u.set_antenna(options.antenna, 0)
-
         # Set frequency (tune request takes lo_offset)
         if(options.lo_offset is not None):
             treq = uhd.tune_request(options.freq, options.lo_offset)
diff --git a/gr-uhd/apps/uhd_rx_nogui.py b/gr-uhd/apps/uhd_rx_nogui.py
index 7a2e0a07a..e692e6ea3 100755
--- a/gr-uhd/apps/uhd_rx_nogui.py
+++ b/gr-uhd/apps/uhd_rx_nogui.py
@@ -90,6 +90,14 @@ class uhd_src(gr.hier_block2):
 
         self._src = uhd.usrp_source(device_addr=args, stream_args=uhd.stream_args('fc32'))
 
+        # Set the subdevice spec
+        if(spec):
+            self._src.set_subdev_spec(spec, 0)
+            
+        # Set the antenna
+        if(antenna):
+            self._src.set_antenna(antenna, 0)
+        
         self._src.set_samp_rate(samp_rate)
 	dev_rate = self._src.get_samp_rate()
         self._samp_rate = samp_rate
@@ -99,20 +107,12 @@ class uhd_src(gr.hier_block2):
         self._resamp = blks2.pfb_arb_resampler_ccf(self._rrate)
         
 	# If no gain specified, set to midrange
+        gain_range = self._src.get_gain_range()
 	if gain is None:
-	    g = self._src.get_gain_range()
-	    gain = (g.start()+g.stop())/2.0
+	    gain = (gain_range.start()+gain_range.stop())/2.0
             print "Using gain: ", gain
         self._src.set_gain(gain)
 
-        # Set the subdevice spec
-        if(spec):
-            self._src.set_subdev_spec(spec, 0)
-            
-        # Set the antenna
-        if(antenna):
-            self._src.set_antenna(antenna, 0)
-        
         self._cal = calibration
 	self.connect(self._src, self._resamp, self)
 
@@ -205,12 +205,12 @@ def main():
     parser.add_option("-c",   "--calibration", type="eng_float",
                       default=0.0, metavar="Hz",
                       help="set frequency offset to Hz [default=%default]")
-    parser.add_option("-g", "--gain", type="int",
+    parser.add_option("-g", "--gain", type="eng_float",
                       metavar="dB", default=None,
                       help="set RF gain [default is midpoint]")
     parser.add_option("-m", "--modulation", type="choice", choices=('AM','FM','WFM'),
                       metavar="TYPE", default=None,
-                      help="set modulation type (AM,FM) [default=%default]")
+                      help="set modulation type (AM,FM,WFM) [default=%default]")
     parser.add_option("-o", "--output-rate", type="eng_float",
                       default=32000, metavar="RATE",
                       help="set audio output rate to RATE [default=%default]")
diff --git a/gr-uhd/examples/fm_tx4.py b/gr-uhd/examples/fm_tx4.py
index 2972e728d..aecb35b54 100755
--- a/gr-uhd/examples/fm_tx4.py
+++ b/gr-uhd/examples/fm_tx4.py
@@ -118,6 +118,14 @@ class fm_tx_block(stdgui2.std_top_block):
 
         self.u = uhd.usrp_sink(device_addr=options.args, stream_args=uhd.stream_args('fc32'))
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
         self.usrp_rate = options.samp_rate
         self.u.set_samp_rate(self.usrp_rate)
         self.usrp_rate = self.u.get_samp_rate()
@@ -133,14 +141,6 @@ class fm_tx_block(stdgui2.std_top_block):
         self.set_gain(options.gain)
         self.set_freq(options.freq)
 
-        # Set the subdevice spec
-        if(options.spec):
-            self.u.set_subdev_spec(options.spec, 0)
-
-        # Set the antenna
-        if(options.antenna):
-            self.u.set_antenna(options.antenna, 0)
-
         self.sum = gr.add_cc ()
 
         # Instantiate N NBFM channels
diff --git a/gr-uhd/examples/usrp_am_mw_rcv.py b/gr-uhd/examples/usrp_am_mw_rcv.py
index 09f85516a..85ffd7632 100755
--- a/gr-uhd/examples/usrp_am_mw_rcv.py
+++ b/gr-uhd/examples/usrp_am_mw_rcv.py
@@ -76,6 +76,14 @@ class wfm_rx_block (stdgui2.std_top_block):
         # build graph
         self.u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('fc32'))
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
         usrp_rate  = 256e3
         demod_rate = 64e3
         audio_rate = 32e3
@@ -149,14 +157,6 @@ class wfm_rx_block (stdgui2.std_top_block):
         if not(self.set_freq(options.freq)):
             self._set_status_msg("Failed to set initial frequency")
 
-        # Set the subdevice spec
-        if(options.spec):
-            self.u.set_subdev_spec(options.spec, 0)
-
-        # Set the antenna
-        if(options.antenna):
-            self.u.set_antenna(options.antenna, 0)
-
     def _set_status_msg(self, msg, which=0):
         self.frame.GetStatusBar().SetStatusText(msg, which)
 
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.
diff --git a/gr-uhd/examples/usrp_nbfm_rcv.py b/gr-uhd/examples/usrp_nbfm_rcv.py
index 7e15abbcf..6fdf95a30 100755
--- a/gr-uhd/examples/usrp_nbfm_rcv.py
+++ b/gr-uhd/examples/usrp_nbfm_rcv.py
@@ -268,6 +268,14 @@ class receive_path(gr.hier_block2):
 
         self.u = uhd.usrp_source(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    = 256e3
         self.quad_rate  = 64e3
         self.audio_rate = 32e3
@@ -320,14 +328,6 @@ class receive_path(gr.hier_block2):
         s = self.squelch_range()
         self.set_squelch((s[0]+s[1])/2)
 
-        # 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 volume_range(self):
         return (-20.0, 0.0, 0.5)
 
diff --git a/gr-uhd/examples/usrp_spectrum_sense.py b/gr-uhd/examples/usrp_spectrum_sense.py
index ceb95ea2a..55e0c6152 100755
--- a/gr-uhd/examples/usrp_spectrum_sense.py
+++ b/gr-uhd/examples/usrp_spectrum_sense.py
@@ -133,6 +133,14 @@ class my_top_block(gr.top_block):
         # build graph
         self.u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('fc32'))
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
         usrp_rate = options.samp_rate
         self.u.set_samp_rate(usrp_rate)
         dev_rate = self.u.get_samp_rate()
@@ -182,14 +190,6 @@ class my_top_block(gr.top_block):
         self.set_gain(options.gain)
 	print "gain =", options.gain
 
-        # Set the subdevice spec
-        if(options.spec):
-            self.u.set_subdev_spec(options.spec, 0)
-
-        # Set the antenna
-        if(options.antenna):
-            self.u.set_antenna(options.antenna, 0)
-
     def set_next_freq(self):
         target_freq = self.next_freq
         self.next_freq = self.next_freq + self.freq_step
diff --git a/gr-uhd/examples/usrp_tv_rcv.py b/gr-uhd/examples/usrp_tv_rcv.py
index 6e61eceec..700915bf8 100755
--- a/gr-uhd/examples/usrp_tv_rcv.py
+++ b/gr-uhd/examples/usrp_tv_rcv.py
@@ -133,6 +133,14 @@ class tv_rx_block (stdgui2.std_top_block):
         else: # use a UHD device
           self.u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('fc32'))
 
+          # Set the subdevice spec
+          if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+            
+          # Set the antenna
+          if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
           self.u.set_samp_rate(usrp_rate)
           dev_rate = self.u.get_samp_rate()
 
@@ -143,14 +151,6 @@ class tv_rx_block (stdgui2.std_top_block):
 
           self.src=self.u
 
-          # Set the subdevice spec
-          if(options.spec):
-            self.u.set_subdev_spec(options.spec, 0)
-            
-          # Set the antenna
-          if(options.antenna):
-            self.u.set_antenna(options.antenna, 0)
-
         self.gain = options.gain        
 
         f2uc=gr.float_to_uchar()
diff --git a/gr-uhd/examples/usrp_tv_rcv_nogui.py b/gr-uhd/examples/usrp_tv_rcv_nogui.py
index f6a40d675..870e65b27 100755
--- a/gr-uhd/examples/usrp_tv_rcv_nogui.py
+++ b/gr-uhd/examples/usrp_tv_rcv_nogui.py
@@ -133,6 +133,14 @@ class my_top_block(gr.top_block):
           # build the graph
           self.u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('fc32'))
 
+          # Set the subdevice spec
+          if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+          # Set the antenna
+          if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+          
           self.u.set_samp_rate(input_rate)
           dev_rate = self.u.get_samp_rate()
 
@@ -149,14 +157,6 @@ class my_top_block(gr.top_block):
               sys.stderr.write('Failed to set frequency\n')
               raise SystemExit, 1
           
-          # Set the subdevice spec
-          if(options.spec):
-            self.u.set_subdev_spec(options.spec, 0)
-
-          # Set the antenna
-          if(options.antenna):
-            self.u.set_antenna(options.antenna, 0)
-          
 
         self.agc = gr.agc_cc(1e-7,1.0,1.0) #1e-7
         self.am_demod = gr.complex_to_mag ()
diff --git a/gr-uhd/examples/usrp_wfm_rcv.py b/gr-uhd/examples/usrp_wfm_rcv.py
index a4abdd2a7..f6c5cf853 100755
--- a/gr-uhd/examples/usrp_wfm_rcv.py
+++ b/gr-uhd/examples/usrp_wfm_rcv.py
@@ -71,6 +71,14 @@ class wfm_rx_block (stdgui2.std_top_block):
         # build graph
         self.u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('fc32'))
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
         usrp_rate  = 320e3
         demod_rate = 320e3
         audio_rate = 32e3
@@ -129,14 +137,6 @@ class wfm_rx_block (stdgui2.std_top_block):
         if not(self.set_freq(options.freq)):
             self._set_status_msg("Failed to set initial frequency")
 
-        # Set the subdevice spec
-        if(options.spec):
-            self.u.set_subdev_spec(options.spec, 0)
-
-        # Set the antenna
-        if(options.antenna):
-            self.u.set_antenna(options.antenna, 0)
-
     def _set_status_msg(self, msg, which=0):
         self.frame.GetStatusBar().SetStatusText(msg, which)
 
diff --git a/gr-uhd/examples/usrp_wfm_rcv_fmdet.py b/gr-uhd/examples/usrp_wfm_rcv_fmdet.py
index 225c9607b..9649857c0 100755
--- a/gr-uhd/examples/usrp_wfm_rcv_fmdet.py
+++ b/gr-uhd/examples/usrp_wfm_rcv_fmdet.py
@@ -73,6 +73,14 @@ class wfm_rx_block (stdgui2.std_top_block):
         # build graph
         self.u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('fc32'))
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
         usrp_rate  = 320e3
         demod_rate = 320e3
         audio_rate = 48e3
@@ -151,14 +159,6 @@ class wfm_rx_block (stdgui2.std_top_block):
         if not(self.set_freq(options.freq)):
             self._set_status_msg("Failed to set initial frequency")
 
-        # Set the subdevice spec
-        if(options.spec):
-            self.u.set_subdev_spec(options.spec, 0)
-
-        # Set the antenna
-        if(options.antenna):
-            self.u.set_antenna(options.antenna, 0)
-
     def _set_status_msg(self, msg, which=0):
         self.frame.GetStatusBar().SetStatusText(msg, which)
 
diff --git a/gr-uhd/examples/usrp_wfm_rcv_nogui.py b/gr-uhd/examples/usrp_wfm_rcv_nogui.py
index 498d2dec6..f0195bcb5 100755
--- a/gr-uhd/examples/usrp_wfm_rcv_nogui.py
+++ b/gr-uhd/examples/usrp_wfm_rcv_nogui.py
@@ -65,6 +65,14 @@ class wfm_rx_block (gr.top_block):
         # build graph
         self.u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('fc32'))
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
         usrp_rate  = 320e3
         demod_rate = 320e3
         audio_rate = 32e3
@@ -119,14 +127,6 @@ class wfm_rx_block (gr.top_block):
         if not(self.set_freq(options.freq)):
             self._set_status_msg("Failed to set initial frequency")
 
-        # Set the subdevice spec
-        if(options.spec):
-            self.u.set_subdev_spec(options.spec, 0)
-
-        # Set the antenna
-        if(options.antenna):
-            self.u.set_antenna(options.antenna, 0)
-
     def set_vol (self, vol):
         g = self.volume_range()
         self.vol = max(g[0], min(g[1], vol))
diff --git a/gr-uhd/examples/usrp_wfm_rcv_pll.py b/gr-uhd/examples/usrp_wfm_rcv_pll.py
index 383670c75..b0744b00b 100755
--- a/gr-uhd/examples/usrp_wfm_rcv_pll.py
+++ b/gr-uhd/examples/usrp_wfm_rcv_pll.py
@@ -73,6 +73,14 @@ class wfm_rx_block (stdgui2.std_top_block):
         # build graph
         self.u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('fc32'))
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
         usrp_rate  = 320e3
         demod_rate = 320e3
         audio_rate = 48e3
@@ -149,14 +157,6 @@ class wfm_rx_block (stdgui2.std_top_block):
         if not(self.set_freq(options.freq)):
             self._set_status_msg("Failed to set initial frequency")
 
-        # Set the subdevice spec
-        if(options.spec):
-            self.u.set_subdev_spec(options.spec, 0)
-
-        # Set the antenna
-        if(options.antenna):
-            self.u.set_antenna(options.antenna, 0)
-
     def _set_status_msg(self, msg, which=0):
         self.frame.GetStatusBar().SetStatusText(msg, which)
 
diff --git a/gr-uhd/examples/usrp_wfm_rcv_sca.py b/gr-uhd/examples/usrp_wfm_rcv_sca.py
index 9b233a7fb..224f30cf8 100755
--- a/gr-uhd/examples/usrp_wfm_rcv_sca.py
+++ b/gr-uhd/examples/usrp_wfm_rcv_sca.py
@@ -102,6 +102,14 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
 
         self.u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('fc32'))
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+            
         usrp_rate  = 320e3
         demod_rate = 320e3
         audio_rate = 32e3
@@ -210,14 +218,6 @@ class wfm_rx_sca_block (stdgui2.std_top_block):
         if not(self.set_freq(options.freq)):
             self._set_status_msg("Failed to set initial frequency")
         self.set_sca_freq(67000)  # A common SCA Frequency
-
-        # Set the subdevice spec
-        if(options.spec):
-            self.u.set_subdev_spec(options.spec, 0)
-            
-        # Set the antenna
-        if(options.antenna):
-            self.u.set_antenna(options.antenna, 0)
             
     def _set_status_msg(self, msg, which=0):
         self.frame.GetStatusBar().SetStatusText(msg, which)
diff --git a/gr-uhd/examples/usrp_wxapt_rcv.py b/gr-uhd/examples/usrp_wxapt_rcv.py
index 78cc7bd08..d9b1a0188 100755
--- a/gr-uhd/examples/usrp_wxapt_rcv.py
+++ b/gr-uhd/examples/usrp_wxapt_rcv.py
@@ -71,6 +71,14 @@ class wxapt_rx_block (stdgui2.std_top_block):
         # build graph
         self.u = uhd.usrp_source(device_addr=options.args, stream_args=uhd.stream_args('fc32'))
 
+        # Set the subdevice spec
+        if(options.spec):
+            self.u.set_subdev_spec(options.spec, 0)
+
+        # Set the antenna
+        if(options.antenna):
+            self.u.set_antenna(options.antenna, 0)
+
         usrp_rate  = 320e3
         demod_rate = 320e3
         audio_rate = 32e3
@@ -124,14 +132,6 @@ class wxapt_rx_block (stdgui2.std_top_block):
         if not(self.set_freq(options.freq)):
             self._set_status_msg("Failed to set initial frequency")
 
-        # Set the subdevice spec
-        if(options.spec):
-            self.u.set_subdev_spec(options.spec, 0)
-
-        # Set the antenna
-        if(options.antenna):
-            self.u.set_antenna(options.antenna, 0)
-
     def _set_status_msg(self, msg, which=0):
         self.frame.GetStatusBar().SetStatusText(msg, which)