1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-02 13:17:48 -04:00

Adapted to Python3

This commit is contained in:
f4exb 2018-09-11 00:23:22 +02:00
parent 1590db3ce2
commit d3455d9cdf

View File

@ -95,7 +95,7 @@ def callAPI(url, method, params, json, text):
if request_method is not None: if request_method is not None:
# print(base_url, url, json) # print(base_url, url, json)
r = request_method(url=base_url + url, params=params, json=json) r = request_method(url=base_url + url, params=params, json=json)
if r.status_code / 100 == 2: if r.status_code // 100 == 2:
print(text + " succeeded") print(text + " succeeded")
printResponse(r) printResponse(r)
return r.json() # all 200 yield application/json response return r.json() # all 200 yield application/json response
@ -137,9 +137,9 @@ def setupDevice(deviceset_url, options):
exit(-1) exit(-1)
# calculate RF analog and FIR optimal bandpass filters bandwidths # calculate RF analog and FIR optimal bandpass filters bandwidths
lpFIRBW = options.sample_rate * 1000 / (1 << options.log2_decim) lpFIRBW = options.sample_rate * 1000 // (1 << options.log2_decim)
if options.fc_pos == 2: # center of passband if options.fc_pos == 2: # center of passband
lpfBW = options.sample_rate * 1000 / (1 << options.log2_decim) lpfBW = options.sample_rate * 1000 // (1 << options.log2_decim)
else: # side of passband else: # side of passband
if options.log2_decim == 0: if options.log2_decim == 0:
lpfBW = options.sample_rate * 1000 lpfBW = options.sample_rate * 1000
@ -253,7 +253,7 @@ def setupChannel(deviceset_url, options):
settings["NFMDemodSettings"]["rfBandwidth"] = options.rf_bw settings["NFMDemodSettings"]["rfBandwidth"] = options.rf_bw
settings["NFMDemodSettings"]["volume"] = options.volume settings["NFMDemodSettings"]["volume"] = options.volume
settings["NFMDemodSettings"]["squelch"] = options.squelch_db * 10 # centi-Bels settings["NFMDemodSettings"]["squelch"] = options.squelch_db * 10 # centi-Bels
settings["NFMDemodSettings"]["squelchGate"] = options.squelch_gate / 10 # 10's of ms settings["NFMDemodSettings"]["squelchGate"] = options.squelch_gate // 10 # 10's of ms
settings["NFMDemodSettings"]["title"] = "Channel %d" % i settings["NFMDemodSettings"]["title"] = "Channel %d" % i
elif options.channel_id == "BFMDemod": elif options.channel_id == "BFMDemod":
settings["BFMDemodSettings"]["inputFrequencyOffset"] = options.channel_freq settings["BFMDemodSettings"]["inputFrequencyOffset"] = options.channel_freq