Merge pull request #37 from jef41/feature/wifi_reconnect

improve wifi reconnect

Author: jef41

bridge/lib/display_driver.py

@@ -60,7 +60,7 @@ def __init__(self, config: BridgeConfig):
         self.update_intvl = None
         self.brightness = None  # getattr
         self.indicator = True
-        self.startup_msg = ""
+        self.startup_msg = []
         # lcd = PicoGraphics(display=DISPLAY_PICO_DISPLAY, pen_type=PEN_P4,rotate=0)
         # lcd.set_backlight(1.0)
         # update_frequency = 3 # seconds to cycle through each screen
@@ -338,18 +338,44 @@ def update_indicator(self):
         self.indicator = not self.indicator
         self.lcd.circle(10, 60, 5) # x, y, r
 
-    def show_msg(self, msg):
+    def show_msg(self, msg, append=True):
         #self.lcd.set_font("serif")
-        self.startup_msg = self.startup_msg + "\n" + msg
+        if append:
+            #self.startup_msg = self.startup_msg + "\n" + msg
+            try:
+                self.startup_msg.append(msg)
+            except NameError:
+                self.startup_msg = [msg]
+        else:
+            # overwrite last line
+            #self.overwrite_msg(msg)
+            try:
+                self.startup_msg[-1] = msg
+            except NameError:
+                self.startup_msg = [msg]
         self.lcd.set_font("bitmap8")
         self.lcd.set_pen(self.colour_to_palette["BG"])
         self.lcd.clear()
         self.lcd.set_thickness(1)
         self.lcd.set_pen(self.colour_to_palette["WHITE"])
         #self.lcd.text(msg, 0, 65, scale=1)
-        self.lcd.text(self.startup_msg, 0, 0)
+        #self.lcd.text(self.startup_msg, 0, 0)
+        self.lcd.text('\n'.join([item for item in self.startup_msg]), 0, 0)
         self.lcd.update()
         time.sleep(1)
+    
+    '''def overwrite_msg(self, new_msg):
+        # overwrite the last line of a messgae
+        import re
+        regex = re.compile("[\n]")
+        msgs = regex.split(self.startup_msg)
+        if len(msgs)>0:
+            msgs[len(msgs)-1] = new_msg
+        else:
+            msgs[0] = new_msg
+        self.startup_msg = '\n'.join([item for item in msgs])
+        '''
+        
 
 class RGB_Driver:
     def __new__(cls, config: BridgeConfig):
@@ -409,4 +435,4 @@ def r_align(lcd_obj, txt, sz, width):
     return int(width - lcd_obj.measure_text(txt, sz))
 
 
-__version__ = "1.1.1"
+__version__ = "1.1.2"

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,54 +56,92 @@ def __init__(self, config):
 
     async def wifi_connect(self, onboard_led, quick=False):
         await onboard_led.set_status(onboard_led.WIFI_CONNECTING)
-        s = self._sta_if
-        s.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
-            s.config(pm=0xA11140)
+            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")
-        s.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 s.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 <= s.status() <= 3:
-                    logger.debug(f"wifi reports {error_codes_to_messages[s.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
-            s.disconnect()
             await onboard_led.set_status(onboard_led.WIFI_DISCONNECTED)
             await asyncio.sleep(1)
-
-        if not s.isconnected():  # Timed out
-            logger.warning("wifi connect timed out")
-            raise OSError("Wi-Fi connect timed out")
-        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 s.isconnected():
-                    logger.warning("Connection Unstable")
-                    raise OSError("Connection Unstable")  # in 1st 5 secs
-                await asyncio.sleep(1)
-            logger.info("Got reliable connection")
+            #if not nic.isconnected():  # Timed out
+            logger.warning(f"wifi connect timed out {error_codes_to_messages[catch]}")
+            #raise OSError("Wi-Fi connect timed out")
+        #else:
+        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 self.nic.isconnected():
+                        logger.warning("Connection Unstable")
+                        #raise OSError("Connection Unstable")  # in 1st 5 secs
+                    await asyncio.sleep(1)
+                logger.info("Got reliable connection")
+        else:  # reset nic
+            self.nic.disconnect()
+            self.nic.active(False)
+            self.nic.deinit()
+        return catch #nic.status()
 
     async def connect(
-        self, onboard_led, quick=False
+        self, onboard_led, display=False, quick=False
     ):  # Quick initial connect option for battery apps
-        s = self._sta_if
-        if not s.isconnected():
-            await self.wifi_connect(onboard_led, quick)
-        if s.isconnected():
+        #nic = self._sta_if
+        attempt = 0
+        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 < 2:
+                # wifi not connected
+                if display:
+                    display.show_msg(f"{error_codes_to_messages[result]} ({attempt})", append = (False if attempt>1 else True))
+                if result == -3:
+                    if display:
+                        display.show_msg("bad wifi password,\nstopping here.")
+                    logger.error("bad wifi password, stopping here.")
+                    raise OSError("Bad Password")
+                else:
+                    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 hacky
+                    await asyncio.sleep(120)
+                
+        if self.nic.isconnected():
             if self.check_interval > 0:
                 asyncio.create_task(self._keep_connected())
                 # Runs forever unless user issues .disconnect()
@@ -103,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):
-        s = self._sta_if
-        while True:  # s.active():
+        #nic = self._sta_if
+        while True:  # nic.active():
             logger.debug("running in _keep_connected")
-            if s.isconnected():  # Pause for 1 second
+            if self.nic.isconnected():  # Pause for 1 second
                 # await asyncio.sleep(1) # debug
                 await asyncio.sleep(
                     randrange(
@@ -116,7 +164,7 @@ async def _keep_connected(self):
                 gc.collect()
             else:  # Link is down
                 try:
-                    s.disconnect()
+                    self.nic.disconnect()
                 except OSError:
                     logger.error("Wi-Fi not started, unable to disconnect interface")
                 await asyncio.sleep(1)
@@ -131,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.
-                    s.disconnect()
+                    self.nic.disconnect()
         logger.warning("Disconnected, exited _keep_connected")
 
 
@@ -160,4 +208,4 @@ async def wan_ok(
     return False
 
 
-__version__ = "1.0.0"
+__version__ = "1.0.2"

bridge/tilt_micro_bridge.py

@@ -1,20 +1,3 @@
-"""latest change:
-    allow for a display rst pin
-    remove clock, introduce blinky dot
-    report some startup progress on LCD, if present
-working on:
-    1.1.1
-TODO:
-    todo refactor main & bridge lib to make more logical
-    todo remove unnecessary libs & comments
-
-ideas:
-button to set into calibration mode, use different cal_config.json ?
-display
-
-
-"""
-
 import time  # micropython-lib/python-stdlib/time extends std time module, required for strftime in debug logging
 import logging
 from logging import TimedRotatingLogFileHandler
@@ -99,12 +82,12 @@ async def hold_up():
     if wifi.has_config:
         if bridge.display:
             bridge.display.show_msg("connecting to wifi...")
-        asyncio.run(wifi.connect(onboard_led))
+        asyncio.run(wifi.connect(onboard_led, bridge.display))
 
-    if bridge.display:
-        bridge.display.show_msg("wifi connected \nget NTP time")
-    # set system time - could have a UTC offset in config, but time is only used internally at the moment
-    bridge.get_time()
+        if bridge.display:
+            bridge.display.show_msg("wifi connected \nget NTP time")
+        # set system time - could have a UTC offset in config, but time is only used internally at the moment
+        bridge.get_time()
     # provision the providers referenced in config.json, called here so the wifi referrnce doesn't have to be passed around
     bridge.set_providers(wifi.has_config)
 
@@ -143,4 +126,5 @@ async def hold_up():
     # hold here, cannot proceed, error with config.json
     onboard_led.on()
 
-__version__ = "1.1.1"
+__version__ = "1.1.2"
+

build/boot.py

@@ -93,12 +93,12 @@ async def hold_up():
     if wifi.has_config:
         if bridge.display:
             bridge.display.show_msg("connecting to wifi...")
-        asyncio.run(wifi.connect(onboard_led))
+        asyncio.run(wifi.connect(onboard_led, bridge.display))
 
-    if bridge.display:
-        bridge.display.show_msg("wifi connected \\nget NTP time")
-    # set system time - could have a UTC offset in config, but time is only used internally at the moment
-    bridge.get_time()
+        if bridge.display:
+            bridge.display.show_msg("wifi connected \\nget NTP time")
+        # set system time - could have a UTC offset in config, but time is only used internally at the moment
+        bridge.get_time()
     # provision the providers referenced in config.json, called here so the wifi referrnce doesn't have to be passed around
     bridge.set_providers(wifi.has_config)
 
@@ -137,7 +137,7 @@ async def hold_up():
     # hold here, cannot proceed, error with config.json
     onboard_led.on()
 
-__version__ = "1.1.1"
+__version__ = "1.1.2"
 
 """)