Stable work of connecting

emlid · Sep 20, 2016 · 496c3fe · 496c3fe
1 parent a6c9c7a
commit 496c3fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='wificontrol',
-    version='0.0.8',
+    version='0.0.9',
     author='Ivan Sapozhkov',
     author_email='ivan.sapozhkov@emlid.com',
     py_modules=['wificontrol'],

diff --git a/wificontrol.py b/wificontrol.py
@@ -340,7 +340,8 @@ def get_network_state(self):
     # OLNY FOR THREAD!!!
     def try_to_connect(self, mac_ssid):
         index_network_for_connect = self.find_network_id_from_ssid(mac_ssid["ssid"])
-        if self.enable_network(index_network_for_connect):
+        if (self.reconnect() and
+            self.enable_network(index_network_for_connect)):
             if self.wait_untill_connection_complete():
                 return True
         return False
@@ -356,12 +357,12 @@ def enable_network(self, network_id):
     def wait_untill_connection_complete(self):
         while self.network_parameter("wpa_state") != "COMPLETED":
             if not self.connection_event.is_set():
+                print "Can't connect to network"
                 return False
         return True
 
     def check_correct_connection(self, mac_ssid):
-        if ((self.network_parameter("ssid") != mac_ssid["ssid"]) or
-                (self.network_parameter("bssid") != mac_ssid["mac address"])):
+        if ((self.network_parameter("ssid") != mac_ssid["ssid"])):
             return False
         return True