[Commit-gnuradio] [gnuradio] 01/03: gr-uhd: dont assign back to args

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit af029df341a41af276387256205f251c0594faea
Author: Andrej Rode <address@hidden>
Date:   Fri Apr 14 15:17:42 2017 -0700

    gr-uhd: dont assign back to args
    
    don't assign values back to args since that breaks apps who use the same
    args to instantiate multiple usrp objects (e.g. tx and rx) with the same
    arguments
---
 gr-uhd/apps/uhd_app.py | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/gr-uhd/apps/uhd_app.py b/gr-uhd/apps/uhd_app.py
index 82124fe..7fccf85 100644
--- a/gr-uhd/apps/uhd_app.py
+++ b/gr-uhd/apps/uhd_app.py
@@ -61,6 +61,11 @@ class UHDApp(object):
         self.freq = None
         self.channels = None
         self.cpu_format = None
+        self.spec = None
+        self.clock_source = None
+        self.time_source = None
+        self.lo_source = None
+        self.lo_export = None
 
     def vprint(self, *args):
         """
@@ -152,31 +157,31 @@ class UHDApp(object):
             )
         )
         # Set the subdevice spec:
-        args.spec = self.normalize_sel("mboards", "subdev",
+        self.spec = self.normalize_sel("mboards", "subdev",
                                        self.usrp.get_num_mboards(), args.spec)
-        if args.spec:
+        if self.spec:
             for mb_idx in xrange(self.usrp.get_num_mboards()):
-                if len(args.spec) == 1:
-                    self.usrp.set_subdev_spec(args.spec, mb_idx)
+                if len(self.spec) == 1:
+                    self.usrp.set_subdev_spec(self.spec, mb_idx)
                 else:
-                    self.usrp.set_subdev_spec(args.spec[mb_idx], mb_idx)
+                    self.usrp.set_subdev_spec(self.spec[mb_idx], mb_idx)
         # Set the clock and/or time source:
         if args.clock_source is not None:
-            args.clock_source = self.normalize_sel("mboards", "clock-source",
+            self.clock_source = self.normalize_sel("mboards", "clock-source",
                                                    
self.usrp.get_num_mboards(), args.clock_source)
             for mb_idx in xrange(self.usrp.get_num_mboards()):
-                if len(args.time_source) == 1:
-                    self.usrp.set_clock_source(args.clock_source[0], mb_idx)
+                if len(self.clock_source) == 1:
+                    self.usrp.set_clock_source(self.clock_source[0], mb_idx)
                 else:
-                    self.usrp.set_clock_source(args.clock_source[mb_idx], 
mb_idx)
+                    self.usrp.set_clock_source(self.clock_source[mb_idx], 
mb_idx)
         if args.time_source is not None:
-            args.time_source = self.normalize_sel("mboards", "time-source",
+            self.time_source = self.normalize_sel("mboards", "time-source",
                                                   self.usrp.get_num_mboards(), 
args.time_source)
             for mb_idx in xrange(self.usrp.get_num_mboards()):
-                if len(args.time_source) == 1:
-                    self.usrp.set_time_source(args.time_source[0], mb_idx)
+                if len(self.time_source) == 1:
+                    self.usrp.set_time_source(self.time_source[0], mb_idx)
                 else:
-                    self.usrp.set_time_source(args.time_source[mb_idx], mb_idx)
+                    self.usrp.set_time_source(self.time_source[mb_idx], mb_idx)
         # Sampling rate:
         self.usrp.set_samp_rate(args.samp_rate)
         self.samp_rate = self.usrp.get_samp_rate()
@@ -206,9 +211,9 @@ class UHDApp(object):
         self.has_lo_sensor = 'lo_locked' in self.usrp.get_sensor_names()
         # Set LO export and LO source operation
         if (args.lo_export is not None) and (args.lo_source is not None):
-            args.lo_source = self.normalize_sel("channels", "lo-source", 
len(args.channels), args.lo_source)
-            args.lo_export = self.normalize_sel("channels", "lo-export", 
len(args.channels), args.lo_export)
-            for chan,lo_source,lo_export in 
zip(self.channels,args.lo_source,args.lo_export):
+            self.lo_source = self.normalize_sel("channels", "lo-source", 
len(self.channels), args.lo_source)
+            self.lo_export = self.normalize_sel("channels", "lo-export", 
len(self.channels), args.lo_export)
+            for chan, lo_source, lo_export in zip(self.channels, 
self.lo_source, self.lo_export):
                 if (lo_source == "None") or (lo_export == "None"):
                     continue
                 if lo_export == "True":