diff options
| author | Clayton Smith <argilo@gmail.com> | 2019-10-01 10:48:01 -0400 |
|---|---|---|
| committer | Marcus Müller <mmueller@gnuradio.org> | 2019-10-19 23:20:53 +0200 |
| commit | c919c7c7d269ca9d0cd2fc13a3619f04239f9f26 (patch) | |
| tree | 5ba824b5d2c576106241da9e60ce41f7ee9f8a0a | |
| parent | ec9eacc862817c7d5973e51f950800dfff814684 (diff) | |
Python 3 fixes
| -rwxr-xr-x | gr-uhd/apps/uhd_fft | 9 | ||||
| -rwxr-xr-x | gr-uhd/apps/uhd_rx_cfile | 9 | ||||
| -rwxr-xr-x | gr-uhd/apps/uhd_rx_nogui | 9 |
3 files changed, 15 insertions, 12 deletions
diff --git a/gr-uhd/apps/uhd_fft b/gr-uhd/apps/uhd_fft index eab9155df0..c9607670cf 100755 --- a/gr-uhd/apps/uhd_fft +++ b/gr-uhd/apps/uhd_fft @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python # # Copyright 2015-2016,2018 Free Software Foundation, Inc. # @@ -34,6 +34,8 @@ UHD FFT: Simple Spectrum Analyzer for UHD. # Note this is a heavily modified version of a # the uhd_fft.grc example. +from __future__ import print_function +from __future__ import division import ctypes import sys import sip @@ -244,9 +246,9 @@ class uhd_fft(UHDApp, gr.top_block, Qt.QWidget): self.qtgui_time_sink_x_0.disable_legend() for i in range(2*len(self.channels)): if(i % 2 == 0): - self.qtgui_time_sink_x_0.set_line_label(i, "Re{{Channel {0}}}".format(i/2)) + self.qtgui_time_sink_x_0.set_line_label(i, "Re{{Channel {0}}}".format(i//2)) else: - self.qtgui_time_sink_x_0.set_line_label(i, "Im{{Channel {0}}}".format(i/2)) + self.qtgui_time_sink_x_0.set_line_label(i, "Im{{Channel {0}}}".format(i//2)) self.qtgui_time_sink_x_0.set_line_width(i, widths[i]) self.qtgui_time_sink_x_0.set_line_color(i, colors[i]) self.qtgui_time_sink_x_0.set_line_style(i, styles[i]) @@ -510,4 +512,3 @@ if __name__ == '__main__': except: print("Warning: failed to XInitThreads()") main() - diff --git a/gr-uhd/apps/uhd_rx_cfile b/gr-uhd/apps/uhd_rx_cfile index d41027ff39..2b61597b00 100755 --- a/gr-uhd/apps/uhd_rx_cfile +++ b/gr-uhd/apps/uhd_rx_cfile @@ -26,6 +26,7 @@ outputs single precision complex float values or complex short values (interleaved 16 bit signed short integers). """ +from __future__ import print_function import sys import os import pmt @@ -179,13 +180,13 @@ class rx_cfile_block(gr.top_block): rx_serial = info["rx_serial"] rx_antenna = info["rx_antenna"] rx_subdev_spec = info["rx_subdev_spec"] - print "[UHD_RX] Motherboard: %s (%s)" % (mboard_id, mboard_serial) + print("[UHD_RX] Motherboard: %s (%s)" % (mboard_id, mboard_serial)) if "B200" in mboard_id or "B210" in mboard_id or "E310" in mboard_id: - print "[UHD_RX] Daughterboard: %s (%s, %s)" % (mboard_id, rx_antenna, rx_subdev_spec) + print("[UHD_RX] Daughterboard: %s (%s, %s)" % (mboard_id, rx_antenna, rx_subdev_spec)) else: - print "[UHD_RX] Daughterboard: %s (%s, %s, %s)" % (rx_id, rx_serial, rx_antenna, rx_subdev_spec) + print("[UHD_RX] Daughterboard: %s (%s, %s, %s)" % (rx_id, rx_serial, rx_antenna, rx_subdev_spec)) except KeyError: - print "[UHD_RX] Args: ", options.args + print("[UHD_RX] Args: ", options.args) print("[UHD_RX] Receiving on {} channels.".format(len(self.channels))) print("[UHD_RX] Rx gain: {gain}".format(gain=gain)) print("[UHD_RX] Rx frequency: {freq}".format(freq=freq)) diff --git a/gr-uhd/apps/uhd_rx_nogui b/gr-uhd/apps/uhd_rx_nogui index 82f72c4b25..30c4a53f8a 100755 --- a/gr-uhd/apps/uhd_rx_nogui +++ b/gr-uhd/apps/uhd_rx_nogui @@ -61,6 +61,7 @@ blocks. """ from __future__ import print_function +from __future__ import division import sys from argparse import ArgumentParser from gnuradio import gr, gru, uhd, audio @@ -146,8 +147,8 @@ class app_top_block(gr.top_block): dev.tune(options.frequency) if_rate = dev.rate() - channel_decim = int(if_rate // channel_rate) - audio_decim = int(channel_rate // audio_rate) + channel_decim = if_rate // channel_rate + audio_decim = channel_rate // audio_rate chan_taps = filter.optfir.low_pass(1.0, # Filter gain if_rate, # Sample rate @@ -188,8 +189,8 @@ class app_top_block(gr.top_block): if options.output_rate != audio_rate: out_lcm = gru.lcm(audio_rate, options.output_rate) - out_interp = int(out_lcm // audio_rate) - out_decim = int(out_lcm // options.output_rate) + out_interp = out_lcm // audio_rate + out_decim = out_lcm // options.output_rate rsamp = filter.rational_resampler_fff(out_interp, out_decim) self.connect(tail, rsamp) tail = rsamp |