Fixed weater forecast unreachable state

Author: OSi (Ondrej Sienczak)

esp32/micropython.bin

@@ -89,17 +89,22 @@ def ifconfig(self):
     def http_get_json(self, url):
         logger.info(f"HTTP GET: {url}")
 
-        for retry in range(CONN_RETRY_CNT):
+        for _ in range(CONN_RETRY_CNT):
             try:
                 return urequests.get(url).json()
                 collect()
                 return
             except OSError as e:
-                logger.warning("ECONNRESET -> retry")
                 if e.errno == ECONNRESET:
+                    logger.warning("ECONNRESET -> retry")
                     continue
+                logger.error(f"Connection error: {e}")
+                ...
+            except Exception as e:
+                logger.error(f"Connection error: {e}")
+                ...
 
-                raise e
+        raise OSError("Page does not respond")
 
     def _attach(self):
         # Activate WiFi interface

micropython/net.py

@@ -38,7 +38,9 @@ def run():
                 app.hotspot()
 
         # And finally - meteostation display - basic functionality ;-)
-        else:
+        # Checks if we will display RAW image from remote display server
+        # or makes own meteostation screen based on openweathermap data.
+        elif not app.remote_display():
             # Once we are connected to network, we can download forecast.
             # Just note that once forecast is download, WiFi is disconnected
             # to save as much battery capacity as possible.
@@ -193,12 +195,28 @@ def web_server(self):
 
         reset()
 
+    def remote_display(self):
+        if not behavior.get("remote_display", True):
+            return False
+
+        self.net.connect()
+        addr = self.net.config.get("remote_display", None)
+
+        if addr is None:
+            return False
+
+        logger.info(f"Connecting to display server: {addr}")
+        return False
+
     def forecast(self):
         if self.net is None:
             return None
         else:
             self.net.connect()
-            return Forecast(self.net, self.temp)
+            try:
+                return Forecast(self.net, self.temp)
+            except OSError:
+                return None
 
     def repaint(self, forecast):
         from ui.main import MeteoUi

simulator/app.py

@@ -13,6 +13,8 @@
 elif v == "epd47":
     from .gs.fonts import FONTS
     from .gs.bmp import BMP
-    from .bwy.wind import WIND
+
+    WIND = None
+    # from .bwy.wind import WIND
 else:
     raise TypeError(f"Don't know display type for variant {v}")

simulator/bitmap/__init__.py

@@ -86,7 +86,7 @@
 
 behavior = Json(
     "cfg/behavior.json",
-    {"refresh": 15, "dbl": (0, 7), "show_radar": 5},
+    {"refresh": 15, "dbl": (0, 7), "show_radar": 5, "remote_display": True},
 )
 
 hw = Json(

simulator/config/__init__.py

@@ -6,7 +6,7 @@
 from machine import Pin, deepsleep, RTC
 from micropython import const
 from collections import namedtuple
-from config import api, sys, location, hw
+from config import api, location, hw
 from ltime import Time
 from buzzer import play
 

simulator/forecast.py

@@ -53,11 +53,13 @@
     "Submit": "Potvrdit",
     "Summer time": "Letní čas",
     "Two days": "Dvoudenní",
+    "Unable to download": "Nepodařilo se stáhnout",
     "Units": "Jednotky",
     "Use with BSSID": "použít včetně BSSID",
     "Use": "Použít",
     "Variant": "Varianta",
     "WiFi setup": "Nastavení WiFi",
+    "weather data!": "stav počasí!",
     "{} min (doubled from {}:00 to {}:00)": "{} min (mezi {}:00 a {}:00 dvakrát delší)",
 }
 

simulator/lang/lang_cz.py

@@ -54,17 +54,22 @@ def ifconfig(self):
     def http_get_json(self, url):
         logger.debug("HTTP GET: " + url)
 
-        for retry in range(CONN_RETRY_CNT):
+        for _ in range(CONN_RETRY_CNT):
             try:
                 return urequests.get(url).json()
                 collect()
                 return
-            except OSError as font:
-                logger.info("ECONNRESET -> retry")
-                if font.errno == ECONNRESET:
+            except OSError as e:
+                if e.errno == ECONNRESET:
+                    logger.warning("ECONNRESET -> retry")
                     continue
+                logger.error(f"Connection error: {e}")
+                ...
+            except Exception as e:
+                logger.error(f"Connection error: {e}")
+                ...
 
-                raise font
+        raise OSError("Page does not respond")
 
     def disconnect(self):
         ...

simulator/net.py

@@ -3,4 +3,4 @@
 logger = getLogger(__name__)
 
 from micropython import const
-from .base import Vect, ZERO, ONE, TWO, Bitmap, UiFrame, Ui
+from .base import Vect, ZERO, ONE, TWO, Bitmap, UiFrame, Ui, with_forecast

simulator/ui/__init__.py

@@ -2,16 +2,16 @@
 
 logger = getLogger(__name__)
 
-from ui import UiFrame, Vect, ZERO
+from ui import UiFrame, Vect, ZERO, with_forecast
 from display.epd import BLACK, GREEN
 from micropython import const
 from lang import day_of_week
 from config import api
 
 
 class UiCalendar(UiFrame):
-    def draw(self, show_days):
-        forecast = self.ui.forecast.forecast
+    @with_forecast
+    def draw(self, forecast, show_days):
         block = self.ui.block
         h_space = const(4)
 
@@ -27,18 +27,18 @@ def draw(self, show_days):
             self.canvas.hline(ZERO, self.dim.x - 1)
 
         # Find time related to next day
-        week_day = self.ui.forecast.time.get_date_time(forecast[0].dt)[6]
+        week_day = forecast.time.get_date_time(forecast.forecast[0].dt)[6]
 
-        for i in range(len(forecast)):
-            dt = self.ui.forecast.time.get_date_time(forecast[i].dt)
+        for i in range(len(forecast.forecast)):
+            dt = forecast.time.get_date_time(forecast.forecast[i].dt)
             if not week_day == dt[6]:
                 dh = dt[3]
                 break
 
         # Draw all items related to forecast
         first = True
         for x, f in self.ui.forecast_singles():
-            dt = self.ui.forecast.time.get_date_time(f.dt)
+            dt = forecast.time.get_date_time(f.dt)
             hour = dt[3] - dh
 
             # Draw weekends