wifi_client: simplify nic object

trying to fix a bug whereby I cannot get STAT_WRONG_PASSWORD
failed in fixing, but resulting code is better

Author: jef41

bridge/lib/wifi_client.py

@@ -12,7 +12,7 @@
 from sys import platform
 
 RP2 = platform == "rp2"
-
+'''
 # cyw43_wifi_link_status
 error_codes_to_messages = {
     0: "CYW43_LINK_DOWN",
@@ -22,6 +22,16 @@
     -1: "CYW43_LINK_FAIL",
     -2: "CYW43_LINK_NONET",
     -3: "CYW43_LINK_BADAUTH",
+}'''
+# cyw43_wifi_link_status
+error_codes_to_messages = {
+    0: "STAT_IDLE",
+    1: "STAT_CONNECTING",
+    2: "STAT_GOT_IP",
+    3: "CYW43_LINK_UP",
+    -1: "STAT_CONNECT_FAIL",
+    -2: "STAT_NO_AP_FOUND",
+    -3: "STAT_WRONG_PASSWORD",
 }
 
 logger = logging.getLogger(__name__)
@@ -33,7 +43,7 @@ def __init__(self, config):
         # self._ping_interval = 20000
         # self._in_connect = False
         # self._has_connected = False  # Define 'Clean Session' value to use.
-        self._sta_if = network.WLAN(network.STA_IF)
+        self.nic = network.WLAN(network.STA_IF)
         self._ssid = config.ssid
         self._wifi_pw = config.password
         try:
@@ -46,59 +56,76 @@ def __init__(self, config):
 
     async def wifi_connect(self, onboard_led, quick=False):
         await onboard_led.set_status(onboard_led.WIFI_CONNECTING)
-        nic = self._sta_if
-        nic.active(True)
-        if RP2:  # Disable auto-sleep.
+        #nic = self._sta_if
+        #nic.disconnect()
+        #nic.active(False)
+        '''if RP2:  # Disable auto-sleep.
             # https://datasheets.raspberrypi.com/picow/connecting-to-the-internet-with-pico-w.pdf
             # para 3.6.3
             nic.config(pm=0xA11140)
             import rp2
 
             if self._country:
-                rp2.country(self._country)
+                rp2.country(self._country)'''
+        self.nic.deinit()
+        self.nic = network.WLAN(network.STA_IF)
+        network.hostname("tilt_micro_bridge")
+        self.nic.config(pm = network.WLAN.PM_PERFORMANCE)
+        if self._country:
+            network.country(self._country)
         logger.info("Attempting to connect to wifi")
-        nic.connect(self._ssid, self._wifi_pw)
-        for _ in range(60):  # Break out on fail or success. Check once per sec.
-            await asyncio.sleep(1)
+        self.nic.active(True)
+        self.nic.connect(self._ssid, self._wifi_pw)
+        catch = 0
+        for _ in range(30):  # Break out on fail or success. Check once per sec.
+            catch = self.nic.status() # can be a fleeting status, so capture it
+            # print(catch)
             # Loop while connecting or no IP
-            if nic.isconnected():
+            if self.nic.isconnected():
                 logger.info("wifi connected")
                 await onboard_led.set_status(onboard_led.WIFI_CONNECTED)
                 break
-            if RP2:  # 1 is joining. 2 is No IP, ie in process of connecting
-                if not 1 <= nic.status() <= 3:
-                    logger.warning(f"wifi reports {error_codes_to_messages[nic.status()]}")
-                    break
+            #if RP2:  # 1 is joining. 2 is No IP, ie in process of connecting
+            #    if not 1 <= nic.status() <= 3:
+            if catch < 1:
+                logger.warning(f"wifi reports {error_codes_to_messages[catch]}")
+                break
+            await asyncio.sleep(1)
         else:  # Timeout: still in connecting state
-            nic.disconnect()
-            nic.active(False)
             await onboard_led.set_status(onboard_led.WIFI_DISCONNECTED)
             await asyncio.sleep(1)
             #if not nic.isconnected():  # Timed out
-            logger.warning(f"wifi connect timed out {error_codes_to_messages[nic.status()]}")
+            logger.warning(f"wifi connect timed out {error_codes_to_messages[catch]}")
             #raise OSError("Wi-Fi connect timed out")
         #else:
-        if nic.isconnected():
+        if self.nic.isconnected():
             if not quick:  # Skip on first connection only if power saving
                 # Ensure connection stays up for a few secs.
                 logger.info("Checking wifi integrity")
                 for _ in range(5):
-                    if not nic.isconnected():
+                    if not self.nic.isconnected():
                         logger.warning("Connection Unstable")
                         #raise OSError("Connection Unstable")  # in 1st 5 secs
                     await asyncio.sleep(1)
                 logger.info("Got reliable connection")
-        return nic.status()
+        else:  # reset nic
+            self.nic.disconnect()
+            self.nic.active(False)
+            self.nic.deinit()
+        return catch #nic.status()
 
     async def connect(
         self, onboard_led, display=False, quick=False
     ):  # Quick initial connect option for battery apps
-        nic = self._sta_if
+        #nic = self._sta_if
         attempt = 0
-        while not nic.isconnected():
+        while not self.nic.isconnected():
+            if attempt > 0 and display:
+                display.show_msg("trying connection again")
+                del display.startup_msg[-1]
             attempt += 1
             result = await self.wifi_connect(onboard_led, quick)
-            if result < 0:
+            if result < 2:
                 # wifi not connected
                 if display:
                     display.show_msg(f"{error_codes_to_messages[result]} ({attempt})", append = (False if attempt>1 else True))
@@ -111,10 +138,10 @@ async def connect(
                     logger.debug("sleep 120 secs and try wifi again")
                     if display:
                         display.show_msg("trying again in 2 minutes.")
-                        del display.startup_msg[-1] #remove that last message from list - it's a hack
+                        del display.startup_msg[-1] #remove that last message from list - it's hacky
                     await asyncio.sleep(120)
 
-        if nic.isconnected():
+        if self.nic.isconnected():
             if self.check_interval > 0:
                 asyncio.create_task(self._keep_connected())
                 # Runs forever unless user issues .disconnect()
@@ -124,10 +151,10 @@ async def connect(
     # Scheduled on 1st successful connection. Runs forever maintaining wifi and
     # broker connection. Must handle conditions at edge of wifi range.
     async def _keep_connected(self):
-        nic = self._sta_if
+        #nic = self._sta_if
         while True:  # nic.active():
             logger.debug("running in _keep_connected")
-            if nic.isconnected():  # Pause for 1 second
+            if self.nic.isconnected():  # Pause for 1 second
                 # await asyncio.sleep(1) # debug
                 await asyncio.sleep(
                     randrange(
@@ -137,7 +164,7 @@ async def _keep_connected(self):
                 gc.collect()
             else:  # Link is down
                 try:
-                    nic.disconnect()
+                    self.nic.disconnect()
                 except OSError:
                     logger.error("Wi-Fi not started, unable to disconnect interface")
                 await asyncio.sleep(1)
@@ -152,7 +179,7 @@ async def _keep_connected(self):
                 except OSError as e:
                     logger.error(f"Error in reconnect. {e}")
                     # Can get ECONNABORTED or -1. The latter signifies no or bad CONNACK received.
-                    nic.disconnect()
+                    self.nic.disconnect()
         logger.warning("Disconnected, exited _keep_connected")
 
 
@@ -181,4 +208,4 @@ async def wan_ok(
     return False
 
 
-__version__ = "1.0.1"
+__version__ = "1.0.2"