caiyu/qspectrumanalyzer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug that can happen when frequency ranges are interleaved around the stop frequency

Browse Source
This commit is contained in:
Michael Ossmann 2017-02-10 22:18:46 -07:00
parent 76c3ad2b55
commit c060f82c25
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qspectrumanalyzer/backend.py
View File

@ -285,12 +285,20 @@ class HackRFSweepThread(RtlPowerBaseThread):
if bin_size > 5000: if bin_size > 5000:
bin_size = 5000 bin_size = 5000
# We only support whole numbers of steps with bandwidth equal to the
# sample rate.
step_bandwidth = sample_rate / 1000000
total_bandwidth = stop_freq - start_freq
step_count = 1 + (total_bandwidth - 1) // step_bandwidth
total_bandwidth = step_count * step_bandwidth
stop_freq = start_freq + total_bandwidth
self.params = { self.params = {
"start_freq": start_freq, # MHz "start_freq": start_freq, # MHz
"stop_freq": stop_freq, # MHz "stop_freq": stop_freq, # MHz
"hops": 0, "hops": 0,
"device_index": 0, "device_index": 0,
"sample_rate": 20e6, # Msps "sample_rate": 20e6, # sps
"bin_size": bin_size, # kHz "bin_size": bin_size, # kHz
"interval": 0, # seconds "interval": 0, # seconds
"gain": 0, "gain": 0,
@ -328,15 +336,19 @@ class HackRFSweepThread(RtlPowerBaseThread):
data = np.fromstring(buf[16:], dtype='<f4') data = np.fromstring(buf[16:], dtype='<f4')
step = (high_edge - low_edge) / len(data) step = (high_edge - low_edge) / len(data)
if (low_edge//1000000) <= (self.params["start_freq"]):
# Reset databuffer at the start of each sweep even if we somehow
# did not complete the previous sweep.
self.databuffer = {"timestamp": [], "x": [], "y": []}
x_axis = list(np.arange(low_edge + step/2, high_edge, step)) x_axis = list(np.arange(low_edge + step/2, high_edge, step))
self.databuffer["x"].extend(x_axis) self.databuffer["x"].extend(x_axis)
for i in range(len(data)): for i in range(len(data)):
self.databuffer["y"].append(data[i]) self.databuffer["y"].append(data[i])
if (high_edge / 1e6) >= (self.params["stop_freq"]): if (high_edge / 1e6) >= (self.params["stop_freq"]):
# We've reached the end of a pass, so sort and display it.
sorted_data = sorted(zip(self.databuffer["x"], self.databuffer["y"])) sorted_data = sorted(zip(self.databuffer["x"], self.databuffer["y"]))
self.databuffer["x"], self.databuffer["y"] = [list(x) for x in zip(*sorted_data)] self.databuffer["x"], self.databuffer["y"] = [list(x) for x in zip(*sorted_data)]
self.data_storage.update(self.databuffer) self.data_storage.update(self.databuffer)
self.databuffer = {"timestamp": [], "x": [], "y": []}
def run(self): def run(self):
"""hackrf_sweep thread main loop""" """hackrf_sweep thread main loop"""