Add bugfix that interrupted boot process

Author: jsa91

README.md

@@ -1,6 +1,5 @@
 # kwh_display
 
-
 *kwh_display* is a project developed in MicroPython aimed at creating a compact display solution using an ESP32 and an ILI9341 screen. The primary functionality of this project is to fetch electricity price data via API and display it on the screen.
 
 ![IMG_2749](https://github.com/user-attachments/assets/1165a0df-f645-466b-9224-a323dd0af6c2)
@@ -41,13 +40,13 @@ IO12  MISO
 
 ## ESP32
 
-To use *kwh_display*, start by flashing the ESP32 with firmware `build-ESP32_GENERIC_250224.bin`, which is compiled from the [MicroPython](https://docs.micropython.org/en/latest/esp32/tutorial/intro.html) repository.
+To use *kwh_display*, start by flashing the ESP32 with firmware `build-ESP32_GENERIC_250228.bin`, which is compiled from the [MicroPython](https://docs.micropython.org/en/latest/esp32/tutorial/intro.html) repository.
 
 
 Erase and the flash the ESP32 using [esptool](https://github.com/espressif/esptool).
 
 ```
-esptool.py --port /dev/ttyUSB0 erase_flash && esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 460800 write_flash -z 0x1000 build-ESP32_GENERIC_250224.bin
+esptool.py --port /dev/ttyUSB0 erase_flash && esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 460800 write_flash -z 0x1000 build-ESP32_GENERIC_250228.bin
 ```
 
 Edit ```/kwh_display/config.json``` to match your preferred settings. You can customize the price interval to your preference (float). The default price settings are explained in the table below.

esp32/app/price.py

@@ -5,27 +5,24 @@
 import urequests
 import ujson
 import machine
-from datetime import datetime, timedelta, timezone
-
-DAYS = (
-    datetime.now(timezone(timedelta())),
-    datetime.now(timezone(timedelta())) + timedelta(hours=24),
-)
+from datetime import timedelta
 
 
 class ElectricityPriceAPI:
     """
     Fetch spot prices.
     """
 
-    def __init__(self):
-        # type: () -> None
+    def __init__(self, swe_localtime):
+        # type: (datetime) -> None
         """
         Initialize the ElectricityPriceAPI instance by loading the configuration.
         """
         with open("config.json", "r") as f:
             self.config = ujson.load(f)
 
+        self.days = (swe_localtime, swe_localtime + timedelta(hours=24))
+
     def get_url(self):
         # type: () -> list
         """
@@ -40,11 +37,11 @@ def get_url(self):
 
         return [
             f"{self.config['url']}{self.config['api']}{day.year:04}/{day.month:02}-{day.day:02}_{self.config['zone']}.json"
-            for day in DAYS
+            for day in self.days
         ]
 
-    def get_url_tomorrow(self):
-        # type: () -> str
+    def get_url_tomorrow(self, swe_localtime):
+        # type: (datetime) -> str
         """
         Get the URL for the API for tomorrow which causes desplay to reboot.
 
@@ -53,7 +50,7 @@ def get_url_tomorrow(self):
 
         """
 
-        tomorrow = datetime.now(timezone(timedelta())) + timedelta(hours=24)
+        tomorrow = swe_localtime + timedelta(hours=24)
 
         return f"{self.config['url']}{self.config['api']}{tomorrow.year:04}/{tomorrow.month:02}-{tomorrow.day:02}_{self.config['zone']}.json"
 
@@ -64,36 +61,32 @@ def get_prices(self):
         """
 
         send_to_file = []
-        failure_count = 0  # Initialize a counter for failures
-
-        for request, day in zip(self.get_url(), DAYS):
-            try:
-                print(f"Fetching JSON from: {request}")
-                response = urequests.get(request)
-
-                if response.status_code == 200:
-                    send_to_file.append(
-                        {
-                            str((day.year, day.month, day.day)): [
-                                price["SEK_per_kWh"] for price in response.json()
-                            ]
-                        }
-                    )
-                    response.close()
-                else:
-                    print(
-                        f"Failed to fetch JSON, status code: {response.status_code}\nPrices might not be published yet or URL is incorrect."
-                    )
-                    response.close()
-                    failure_count += 1  # Increment the counter on failure
-                    if failure_count >= 2:
-                        print("Failed to fetch JSON twice, rebooting...")
-                        machine.soft_reset()
-                    continue
-
-            except OSError as e:
-                print(f"An error occurred while fetching JSON: {e}\nRebooting...")
-                machine.soft_reset()
+        failure_count = 0
+
+        for request, day in zip(self.get_url(), self.days):
+
+            print(f"Fetching JSON from: {request}")
+            response = urequests.get(request)
+
+            if response.status_code == 200:
+                send_to_file.append(
+                    {
+                        str((day.year, day.month, day.day)): [
+                            price["SEK_per_kWh"] for price in response.json()
+                        ]
+                    }
+                )
+                response.close()
+            else:
+                print(
+                    f"Failed to fetch JSON, status code: {response.status_code}\nPrices might not be published yet or URL is incorrect."
+                )
+                response.close()
+                failure_count += 1  # Increment the counter on failure
+                if failure_count == 2:
+                    print("Failed to fetch JSON twice, rebooting...")
+                    machine.soft_reset()
+                continue
 
         print(send_to_file)
         with open("prices.json", "a") as f:

esp32/app/swe_time.py

@@ -6,6 +6,8 @@
 - Get the current local time in Sweden
 """
 
+import ntptime
+import machine
 from datetime import datetime, timezone, timedelta
 
 
@@ -20,12 +22,36 @@ def __init__(self):
         Initialize the SweTime class and set the timezone.
         """
 
-        # Swedish timezone offset
+        print("Synchronizing time with NTP server...")
+        ntptime.timeout = 3
+        try:
+            ntptime.settime()
+            print("UTC time synchronized successfully!")
+        except OSError as e:
+            print(f"Failed to sync time: {e}")
+            machine.soft_reset()
+
+        now = datetime.now(timezone(timedelta()))
+
+        print(f"UTC time is: {now}")
+
+        # Determine if DST is in effect
+        self.offset = self._determine_offset(now)
+
+    def _determine_offset(self, now):
+        # type: (datetime) -> int
+        """
+        Determine the Swedish timezone offset considering DST.
+
+        Args:
+            now (datetime): The current datetime.
+
+        Returns:
+            int: The timezone offset.
+        """
         utc_offset = 1  # Standard time
         dst_offset = 2  # Daylight saving time
 
-        # Determine if DST is in effect
-        now = datetime.now(timezone(timedelta()))
         month, day = now.month, now.day
         weekday = now.weekday()
 
@@ -34,11 +60,9 @@ def __init__(self):
             or (month == 3 and day - weekday >= 25)
             or (month == 10 and day - weekday < 25)
         ):
-            offset = dst_offset
+            return dst_offset
         else:
-            offset = utc_offset
-
-        self.offset = offset
+            return utc_offset
 
     def swe_localtime(self):
         # type: () -> datetime

esp32/app/utils.py

@@ -11,7 +11,6 @@
 
 import ujson
 import network
-import ntptime
 import machine
 import urequests
 from datetime import timedelta
@@ -58,23 +57,6 @@ def hotspot():
     print(f"Access Point @ {ap.ifconfig()}")
 
 
-def ntp_sync():
-    # type: () -> None
-    """
-    Sync UTC time with NTP
-    """
-    print("Synchronizing time with NTP server...")
-    ntptime.timeout = 3
-    for _ in range(3):  # Try sync time three times before reset
-        try:
-            ntptime.settime()
-            print("UTC time synchronized successfully!")
-            return
-        except OSError as e:
-            print(f"Failed to sync time: {e}")
-            machine.soft_reset()
-
-
 def fetch_prices_from_file(api, time):
     # type: (ElectricityPriceAPI, SweTime) -> tuple
     """
@@ -136,10 +118,10 @@ def update_display(
 
     # Checking if new prices are available.
     if hour >= 13 and prices_tomorrow is None:
-        response = urequests.get(api.get_url_tomorrow())
+        response = urequests.get(api.get_url_tomorrow(swe_localtime))
         if response.status_code == 200:
             print(
-                f"New prices available, fetching from: {api.get_url_tomorrow()} and rebooting @ {hour}:{minute}:{second}..."
+                f"New prices available, fetching from: {api.get_url_tomorrow(swe_localtime)} and rebooting @ {hour}:{minute}:{second}..."
             )
             machine.soft_reset()
         response.close()

esp32/main.py

@@ -31,12 +31,11 @@ def main():
 
     else:
         utils.wifi()
-        utils.ntp_sync()
 
         time = SweTime()
         current_hour = time.swe_localtime().hour
 
-        api = ElectricityPriceAPI()
+        api = ElectricityPriceAPI(time.swe_localtime())
         prices_today, prices_tomorrow = utils.fetch_prices_from_file(api, time)
 
         gui = GUI()