diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-02-21 07:33:02 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-02-21 07:33:02 -0800 |
| commit | e34866dad21a98e901c188df7e87f37ae5502a88 (patch) | |
| tree | fb5dd0f2c395b31c70e65f127ce0190ec2b90a56 /gr-uhd | |
| parent | 4aabba72f0d268174855fce97a80bd55acb1358c (diff) | |
| parent | 762a08915c252e0604b466dc97d5e51b0a86562d (diff) | |
Merge branch 'master' into next
Conflicts:
gr-utils/python/modtool/templates.py
Diffstat (limited to 'gr-uhd')
| -rwxr-xr-x | gr-uhd/apps/uhd_rx_cfile | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/gr-uhd/apps/uhd_rx_cfile b/gr-uhd/apps/uhd_rx_cfile index 85a7562d08..f76dc2ed68 100755 --- a/gr-uhd/apps/uhd_rx_cfile +++ b/gr-uhd/apps/uhd_rx_cfile @@ -82,20 +82,21 @@ class rx_cfile_block(gr.top_block): for mb_idx in xrange(self._u.get_num_mboards()): self._u.set_subdev_spec(options.spec, mb_idx) # Set the antenna: - self.antenna = [x.strip() for x in options.antenna.split(",")] - if len(self.antenna) != 1 and len(self.antenna) != len(self.channels): - sys.stderr.write("[UHD_RX] [ERROR] Invalid antenna setting for {} channels: {}".format( - len(self.channels), options.antenna - )) - exit(1) - if len(self.antenna) == 1 and len(self.channels) > 1: - self.antenna = [self.antenna[0],] * len(self.channels) - for i, chan in enumerate(self.channels): - self._u.set_antenna(self.antenna[i], chan) - if options.verbose: - print("[UHD_RX] Channel {chan}: Using antenna {ant}.".format( - chan=chan, ant=self._u.get_antenna(chan) + if options.antenna is not None: + self.antenna = [x.strip() for x in options.antenna.split(",")] + if len(self.antenna) != 1 and len(self.antenna) != len(self.channels): + sys.stderr.write("[UHD_RX] [ERROR] Invalid antenna setting for {} channels: {}".format( + len(self.channels), options.antenna )) + exit(1) + if len(self.antenna) == 1 and len(self.channels) > 1: + self.antenna = [self.antenna[0],] * len(self.channels) + for i, chan in enumerate(self.channels): + self._u.set_antenna(self.antenna[i], chan) + if options.verbose: + print("[UHD_RX] Channel {chan}: Using antenna {ant}.".format( + chan=chan, ant=self._u.get_antenna(chan) + )) # Set receiver sample rate: self._u.set_samp_rate(options.samp_rate) samp_rate = self._u.get_samp_rate() |