Add additional functions and error handling

Author: jsa91

build-ESP32_GENERIC_250127.bin renamed to build-ESP32_GENERIC_250223.bin

@@ -3,6 +3,7 @@
 """
 
 import cmath
+import ujson
 from gui.fonts import arial10, arial35, freesans20
 from gui.core.writer import CWriter
 from gui.core.fplot import CartesianGraph, TSequence
@@ -23,6 +24,10 @@ def __init__(self):
         """
         Constructor
         """
+
+        with open("config.json", "r") as f:
+            self.config = ujson.load(f)
+
         y_axis_division = [249, 225, 202, 179, 155]
         x_axis_division = [15, 30, 48, 66, 83, 98, 115, 133, 150, 168, 186, 204]
         arrows_division = [
@@ -125,6 +130,24 @@ def __init__(self):
             arrow_label = Label(self.wri, 279, arrow, "^", fgcolor=BLACK, align=2)
             self.arrows[f"arrow_{hour}"] = arrow_label
 
+    @staticmethod
+    def set_error():
+        # type: () -> None
+        """
+        Set config error message on the display.
+        """
+        refresh(ssd, True)
+
+        Label(
+            CWriter(ssd, arial35, RED, BLACK, verbose=False),
+            30,
+            15,
+            "Config Error!",
+            align=2,
+        )
+
+        refresh(ssd)
+
     def plot_prices(self, prices_today, prices_tomorrow):
         # type: (list, list) -> None
         """
@@ -157,15 +180,24 @@ def set_price(self, current_hour, prices_today):
 
         price_levels = ("Billigt", "Normalt", "Dyrt")
 
-        if prices_today[current_hour] < 0.5:
-            color = GREEN
-            price = price_levels[0]
-        elif 0.5 <= prices_today[current_hour] < 1.5:
-            color = YELLOW
-            price = price_levels[1]
-        else:
-            color = RED
-            price = price_levels[2]
+        try:
+            if prices_today[current_hour] < self.config["billigt<"]:
+                color = GREEN
+                price = price_levels[0]
+            elif (
+                self.config["billigt<"]
+                <= prices_today[current_hour]
+                < self.config["normalt<"]
+            ):
+                color = YELLOW
+                price = price_levels[1]
+            else:
+                color = RED
+                price = price_levels[2]
+        except (TypeError, KeyError, IndexError) as e:
+            print(f"Error in config file: {e}")
+            GUI.set_error()
+            raise
 
         cost = prices_today[current_hour]
 
@@ -205,25 +237,25 @@ def set_clock(self):
         uv = lambda phi: cmath.rect(1, phi)
         pi = cmath.pi
         days = (
-            "Monday",
-            "Tuesday",
-            "Wednesday",
-            "Thursday",
-            "Friday",
-            "Saturday",
-            "Sunday",
+            "Måndag",
+            "Tisdag",
+            "Onsdag",
+            "Torsdag",
+            "Fredag",
+            "Lördag",
+            "Söndag",
         )
         months = (
             "Jan",
             "Feb",
-            "March",
+            "Mar",
             "April",
-            "May",
-            "June",
-            "July",
+            "Maj",
+            "Juni",
+            "Juli",
             "Aug",
             "Sept",
-            "Oct",
+            "Okt",
             "Nov",
             "Dec",
         )

esp32/app/ili9341.py

@@ -2,10 +2,10 @@
 Instantiates class to fetch spot prices.
 """
 
-from datetime import datetime, timedelta, timezone
 import urequests
 import ujson
 import machine
+from datetime import datetime, timedelta, timezone
 
 DAYS = (
     datetime.now(timezone(timedelta())),
@@ -43,6 +43,20 @@ def get_url(self):
             for day in DAYS
         ]
 
+    def get_url_tomorrow(self):
+        # type: () -> str
+        """
+        Get the URL for the API for tomorrow which causes desplay to reboot.
+
+        Returns:
+            str: A URL for fetching the electricity prices for tomorrow.
+
+        """
+
+        tomorrow = datetime.now(timezone(timedelta())) + timedelta(hours=24)
+
+        return f"{self.config['url']}{self.config['api']}{tomorrow.year:04}/{tomorrow.month:02}-{tomorrow.day:02}_{self.config['zone']}.json"
+
     def get_prices(self):
         # type: () -> None
         """
@@ -64,10 +78,12 @@ def get_prices(self):
                             ]
                         }
                     )
+                    response.close()
                 else:
                     print(
-                        f"Failed to fetch JSON, status code: {response.status_code}\nPrices might not be published yet."
+                        f"Failed to fetch JSON, status code: {response.status_code}\nPrices might not be published yet or URL is incorrect."
                     )
+                    response.close()
                     continue
 
             except OSError as e:

esp32/app/price.py

@@ -9,12 +9,13 @@
 - Update the display with current prices
 """
 
-from datetime import timedelta
 import ujson
 import network
 import ntptime
 import machine
 import urequests
+from datetime import timedelta
+from app.ili9341 import GUI
 
 
 def wifi():
@@ -28,8 +29,14 @@ def wifi():
     wlan.config(pm=0)
     wlan.config(txpower=20)
     if not wlan.isconnected():
-        with open("config.json", "r") as f:
-            config = ujson.load(f)
+        try:
+            with open("config.json", "r") as f:
+                config = ujson.load(f)
+        except ValueError as e:
+            print(f"Error reading config file: {e}")
+            GUI.set_error()
+            raise
+
         print(f"Connecting to {config['ssid']}...")
         wlan.connect(config["ssid"], config["password"])
         while not wlan.isconnected():
@@ -67,6 +74,7 @@ def ntp_sync():
             print(f"Failed to sync time: {e}")
             machine.soft_reset()
 
+
 def fetch_prices_from_file(api, time):
     # type: (ElectricityPriceAPI, SweTime) -> tuple
     """
@@ -115,6 +123,7 @@ def update_display(
 
     hour = swe_localtime.hour
     minute = swe_localtime.minute
+    second = swe_localtime.second
 
     if hour != current_hour:
         if hour == 0:
@@ -125,11 +134,13 @@ def update_display(
         gui.set_price(hour, prices_today)
         gui.set_arrow(hour)
 
+    # Checking if new prices are available.
     if hour >= 13 and prices_tomorrow is None:
-        print(f"Checking if new prices are available @ {hour}:{minute}...")
-        response = urequests.get(api.get_url()[1])
-        if response.status_code != 404:
-            print(f"New prices available, rebooting @ {hour}:{minute}...")
+        response = urequests.get(api.get_url_tomorrow())
+        if response.status_code == 200:
+            print(
+                f"New prices available, fetching from: {api.get_url_tomorrow()} and rebooting @ {hour}:{minute}:{second}..."
+            )
             machine.soft_reset()
         response.close()