Scripts API: SuperScanner: corrected frequency inclusion/exclusion check

scriptsapi/Readme.md

@@ -3,6 +3,7 @@
 These scripts are designed to work in Python 3 preferably with version 3.6 or higher. Dependencies are installed with pip in a virtual environment. The sequence of operations is the following:
 
 ```
+sudo apt-get install virtualenv gcc g++ gfortran python3-dev
 virtualenv -p /usr/bin/python3 venv # Create virtual environment
 . ./venv/bin/activate               # Activate virtual environment
 pip install -r requirements.txt     # Install requirements

scriptsapi/requirements.txt

@@ -1,6 +1,6 @@
 requests
 Flask
 numpy
-websocket
+websockets
 websocket-client
 mock

scriptsapi/superscanner.py

@@ -257,13 +257,13 @@ def allocate_channel():
 def freq_in_ranges_check(freq):
     freqrange_inclusions = CONFIG.get('freqrange_inclusions', [])
     freqrange_exclusions = CONFIG.get('freqrange_exclusions', [])
-    for freqrange in freqrange_inclusions:
-        if not freqrange[0] <= freq <= freqrange[1]:
-            return False
     for freqrange in freqrange_exclusions:
         if freqrange[0] <= freq <= freqrange[1]:
             return False
-    return True
+    for freqrange in freqrange_inclusions:
+        if freqrange[0] <= freq <= freqrange[1]:
+            return True
+    return False
 
 # ======================================================================
 def get_hotspot_frequency(channel, hotspot):