interference_freq is now a separate state variable
This commit is contained in:
parent
0744c060f1
commit
8086e3298e
1 changed files with 7 additions and 6 deletions
13
scanner.py
13
scanner.py
|
|
@ -17,6 +17,8 @@ state = {
|
||||||
"freq": 10000.0,
|
"freq": 10000.0,
|
||||||
"freq_step_multiply": 0.85,
|
"freq_step_multiply": 0.85,
|
||||||
"stop_freq": 0.1,
|
"stop_freq": 0.1,
|
||||||
|
"interference_freq": 0.052,
|
||||||
|
"interference_bandwidth": 0.008,
|
||||||
"initializing": 1,
|
"initializing": 1,
|
||||||
"noise_scan": False
|
"noise_scan": False
|
||||||
}
|
}
|
||||||
|
|
@ -247,18 +249,15 @@ class TelnetReader:
|
||||||
freq_multiplier = state["freq_step_multiply"] ** 2 # skip 1/2 steps to speed up
|
freq_multiplier = state["freq_step_multiply"] ** 2 # skip 1/2 steps to speed up
|
||||||
else:
|
else:
|
||||||
freq_multiplier = state["freq_step_multiply"] ** 4 # skip 3/4 steps to speed up
|
freq_multiplier = state["freq_step_multiply"] ** 4 # skip 3/4 steps to speed up
|
||||||
if state["noise_scan"]==True:
|
state["freq"] *= freq_multiplier
|
||||||
state["freq"] *= freq_multiplier ** 2 # noise scans step twice as quickly
|
|
||||||
else:
|
|
||||||
state["freq"] *= freq_multiplier
|
|
||||||
if (state["freq"]>40) and (state["freq"]<660) and ((state["freq"]%50<2.5) or (-state["freq"]%50<2.5)):
|
if (state["freq"]>40) and (state["freq"]<660) and ((state["freq"]%50<2.5) or (-state["freq"]%50<2.5)):
|
||||||
state["freq"] *= freq_multiplier # if near a 50Hz harmonic, skip to the next frequency
|
state["freq"] *= freq_multiplier # if near a 50Hz harmonic, skip to the next frequency
|
||||||
while (state["freq"]<0.6) and ((state["freq"]%0.053<0.008) or (-state["freq"]%0.053<0.008)):
|
while (state["freq"]<0.6) and ((state["freq"]%state["interference_freq"]<state["interference_bandwidth"]) or (-state["freq"]<state["interference_freq"]<state["interference_bandwidth"])):
|
||||||
state["freq"] *= freq_multiplier # if near a 0.052Hz harmonic, skip to the next frequency
|
state["freq"] *= freq_multiplier # if near a 0.052Hz harmonic, skip to the next frequency
|
||||||
if state["freq"] <= state["stop_freq"]:
|
if state["freq"] <= state["stop_freq"]:
|
||||||
print("Reached stop frequency")
|
print("Reached stop frequency")
|
||||||
else:
|
else:
|
||||||
if state["freq"] > 1:
|
if state["freq"] > 0.01:
|
||||||
response = f"\rf{state["freq"]:.1f}\r" # new freq
|
response = f"\rf{state["freq"]:.1f}\r" # new freq
|
||||||
else:
|
else:
|
||||||
response = f"\rf{state["freq"]:.3f}\r" # new freq
|
response = f"\rf{state["freq"]:.3f}\r" # new freq
|
||||||
|
|
@ -300,6 +299,8 @@ if __name__ == "__main__":
|
||||||
state["freq_step_multiply"] = 0.95;
|
state["freq_step_multiply"] = 0.95;
|
||||||
state["stop_freq"] = 0.1;
|
state["stop_freq"] = 0.1;
|
||||||
state["initializing"] = 1;
|
state["initializing"] = 1;
|
||||||
|
state["interference_freq"] = 0.052;
|
||||||
|
state["interference_bandwidth"] = 0.008
|
||||||
reader.read_loop()
|
reader.read_loop()
|
||||||
finally:
|
finally:
|
||||||
reader.disconnect()
|
reader.disconnect()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue