diff --git a/scanner.py b/scanner.py index a01eb32..8e17457 100644 --- a/scanner.py +++ b/scanner.py @@ -17,6 +17,8 @@ state = { "freq": 10000.0, "freq_step_multiply": 0.85, "stop_freq": 0.1, + "interference_freq": 0.052, + "interference_bandwidth": 0.008, "initializing": 1, "noise_scan": False } @@ -247,18 +249,15 @@ class TelnetReader: freq_multiplier = state["freq_step_multiply"] ** 2 # skip 1/2 steps to speed up else: freq_multiplier = state["freq_step_multiply"] ** 4 # skip 3/4 steps to speed up - if state["noise_scan"]==True: - state["freq"] *= freq_multiplier ** 2 # noise scans step twice as quickly - else: - state["freq"] *= freq_multiplier + state["freq"] *= freq_multiplier 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 - 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"] 1: + if state["freq"] > 0.01: response = f"\rf{state["freq"]:.1f}\r" # new freq else: response = f"\rf{state["freq"]:.3f}\r" # new freq @@ -300,6 +299,8 @@ if __name__ == "__main__": state["freq_step_multiply"] = 0.95; state["stop_freq"] = 0.1; state["initializing"] = 1; + state["interference_freq"] = 0.052; + state["interference_bandwidth"] = 0.008 reader.read_loop() finally: reader.disconnect()