Group :: Engineering
RPM: gr-osmosdr
Navigation
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: gr-osmosdr-0.1.4-python3-fix.patch
Download
Download
diff --git a/apps/osmocom_fft b/apps/osmocom_fft
index da38861..2653ac0 100755
--- a/apps/osmocom_fft
+++ b/apps/osmocom_fft
@@ -117,7 +117,7 @@ class app_top_block(stdgui2.std_top_block, pubsub):
try:
self.src.get_sample_rates().start()
except RuntimeError:
- print "Source has no sample rates (wrong device arguments?)."
+ print ("Source has no sample rates (wrong device arguments?).")sys.exit(1)
# Set the antenna
@@ -150,18 +150,18 @@ class app_top_block(stdgui2.std_top_block, pubsub):
gain_names = self.src.get_gain_names()
for name in gain_names:
range = self.src.get_gain_range(name)
- print "%s gain range: start %d stop %d step %d" % (name, range.start(), range.stop(), range.step())
+ print ("%s gain range: start %d stop %d step %d" % (name, range.start(), range.stop(), range.step()))if options.gains:
for tuple in options.gains.split(","): name, gain = tuple.split(":")gain = int(gain)
- print "Setting gain %s to %d." % (name, gain)
+ print ("Setting gain %s to %d." % (name, gain))self.src.set_gain(gain, name)
if self._verbose:
rates = self.src.get_sample_rates()
- print 'Supported sample rates %d-%d step %d.' % (rates.start(), rates.stop(), rates.step())
+ print ('Supported sample rates %d-%d step %d.' % (rates.start(), rates.stop(), rates.step()))if options.center_freq is None:
freq = self.src.get_center_freq()
@@ -537,14 +537,14 @@ class app_top_block(stdgui2.std_top_block, pubsub):
self.rec_file_name = self.record_to_filename()
- print "Recording samples to ", self.rec_file_name
+ print ("Recording samples to ", self.rec_file_name)self.file_sink.open(self.rec_file_name);
else:
self.sample_rate_text.Enable()
self.record_text.Enable()
self.file_sink.close()
- print "Finished recording to", self.rec_file_name
+ print ("Finished recording to", self.rec_file_name)forms.toggle_button(
sizer=rec_hbox,
@@ -732,9 +732,9 @@ class app_top_block(stdgui2.std_top_block, pubsub):
self.src.set_dc_offset( correction )
if self._verbose:
- print "Set DC offset to", correction
+ print ("Set DC offset to", correction)except RuntimeError as ex:
- print ex
+ print (ex)
def set_iq_balance_mode(self, iq_balance_mode):
if iq_balance_mode == 1:
@@ -761,16 +761,16 @@ class app_top_block(stdgui2.std_top_block, pubsub):
self.src.set_iq_balance( correction )
if self._verbose:
- print "Set IQ balance to", correction
+ print ("Set IQ balance to", correction)except RuntimeError as ex:
- print ex
+ print (ex)
def set_sample_rate(self, samp_rate):
samp_rate = self.src.set_sample_rate(samp_rate)
if hasattr(self.scope, 'set_sample_rate'):
self.scope.set_sample_rate(samp_rate)
if self._verbose:
- print "Set sample rate to:", samp_rate
+ print ("Set sample rate to:", samp_rate)try:
self[BWIDTH_KEY] = self.set_bandwidth(samp_rate)
@@ -787,13 +787,13 @@ class app_top_block(stdgui2.std_top_block, pubsub):
g = self[GAIN_RANGE_KEY(name)]
gain = float(g.start()+g.stop())/2
if self._verbose:
- print "Using auto-calculated mid-point gain"
+ print ("Using auto-calculated mid-point gain")self[GAIN_KEY(name)] = gain
return
gain = self.src.set_gain(gain, name)
if self._verbose:
- print "Set " + name + " gain to:", gain
+ print ("Set " + name + " gain to:", gain)def set_bandwidth(self, bw):
clipped_bw = self[BWIDTH_RANGE_KEY].clip(bw)
@@ -801,7 +801,7 @@ class app_top_block(stdgui2.std_top_block, pubsub):
bw = self.src.set_bandwidth(clipped_bw)
if self._verbose:
- print "Set bandwidth to:", bw
+ print ("Set bandwidth to:", bw)return bw
@@ -814,7 +814,7 @@ class app_top_block(stdgui2.std_top_block, pubsub):
f = self[FREQ_RANGE_KEY]
freq = float(f.start()+f.stop())/2.0
if self._verbose:
- print "Using auto-calculated mid-point frequency"
+ print ("Using auto-calculated mid-point frequency")self[CENTER_FREQ_KEY] = freq
return
@@ -825,22 +825,22 @@ class app_top_block(stdgui2.std_top_block, pubsub):
if freq is not None:
if self._verbose:
- print "Set center frequency to", freq
+ print ("Set center frequency to", freq)elif self._verbose:
- print "Failed to set freq."
+ print ("Failed to set freq.")return freq
def set_freq_corr(self, ppm):
if ppm is None:
ppm = 0.0
if self._verbose:
- print "Using frequency corrrection of", ppm
+ print ("Using frequency corrrection of", ppm)self[FREQ_CORR_KEY] = ppm
return
ppm = self.src.set_freq_corr(ppm)
if self._verbose:
- print "Set frequency correction to:", ppm
+ print ("Set frequency correction to:", ppm)def main ():
app = stdgui2.stdapp(app_top_block, "osmocom Spectrum Browser", nstatus=1)
diff --git a/apps/osmocom_siggen b/apps/osmocom_siggen
index bd92eac..05eb0e6 100755
--- a/apps/osmocom_siggen
+++ b/apps/osmocom_siggen
@@ -482,8 +482,8 @@ def main():
# And run it
app.MainLoop()
- except RuntimeError, e:
- print e
+ except (RuntimeError, e):
+ print (e)
sys.exit(1)
# Make sure to create the top block (tb) within a function: That code
diff --git a/apps/osmocom_siggen_nogui b/apps/osmocom_siggen_nogui
index 0283fcf..8863b21 100755
--- a/apps/osmocom_siggen_nogui
+++ b/apps/osmocom_siggen_nogui
@@ -26,15 +26,15 @@ import sys
def main():
if gr.enable_realtime_scheduling() != gr.RT_OK:
- print "Note: failed to enable realtime scheduling, continuing"
+ print ("Note: failed to enable realtime scheduling, continuing")# Grab command line options and create top block
try:
(options, args) = osmocom_siggen.get_options()
tb = osmocom_siggen.top_block(options, args)
- except RuntimeError, e:
- print e
+ except (RuntimeError, e):
+ print (e)
sys.exit(1)
tb.start()
diff --git a/apps/osmocom_spectrum_sense b/apps/osmocom_spectrum_sense
index ea365bb..6a55f10 100755
--- a/apps/osmocom_spectrum_sense
+++ b/apps/osmocom_spectrum_sense
@@ -76,8 +76,8 @@ class tune(gr.feval_dd):
return new_freq
- except Exception, e:
- print "tune: Exception: ", e
+ except (Exception, e):
+ print ("tune: Exception: ", e)class parse_msg(object):
@@ -147,7 +147,7 @@ class my_top_block(gr.top_block):
realtime = True
else:
realtime = False
- print "Note: failed to enable realtime scheduling"
+ print ("Note: failed to enable realtime scheduling")# build graph
self.u = osmosdr.source(options.args)
@@ -155,7 +155,7 @@ class my_top_block(gr.top_block):
try:
self.u.get_sample_rates().start()
except RuntimeError:
- print "Source has no sample rates (wrong device arguments?)."
+ print ("Source has no sample rates (wrong device arguments?).")sys.exit(1)
# Set the antenna
@@ -218,7 +218,7 @@ class my_top_block(gr.top_block):
options.gain = float(g.start()+g.stop())/2.0
self.set_gain(options.gain)
- print "gain =", options.gain
+ print ("gain =", options.gain)def set_next_freq(self):
target_freq = self.next_freq
@@ -227,7 +227,7 @@ class my_top_block(gr.top_block):
self.next_freq = self.min_center_freq
if not self.set_freq(target_freq):
- print "Failed to set frequency to", target_freq
+ print ("Failed to set frequency to", target_freq)sys.exit(1)
return target_freq
@@ -287,7 +287,7 @@ def main_loop(tb):
power_db = 10*math.log10(m.data[i_bin]/tb.usrp_rate) - noise_floor_db
if (power_db > tb.squelch_threshold) and (freq >= tb.min_freq) and (freq <= tb.max_freq):
- print datetime.now(), "center_freq", center_freq, "freq", freq, "power_db", power_db, "noise_floor_db", noise_floor_db
+ print (datetime.now(), "center_freq", center_freq, "freq", freq, "power_db", power_db, "noise_floor_db", noise_floor_db)
if __name__ == '__main__':
t = ThreadClass()