diff --git a/clock.py b/clock.py index 1027632..c9eb881 100644 --- a/clock.py +++ b/clock.py @@ -13,6 +13,7 @@ from sounds import WakeUpSounds import json from hsluv import hsluv_to_rgb, rgb_to_hsluv import requests +import urllib.parse def is_arm(): if (uname()[4][:3] == 'arm') or (uname()[4][:7] == 'aarch64'): @@ -151,6 +152,10 @@ class ClockSettings(): self.reading_light_brightness = j["reading_light_brightness"] self.display_brightness = j["display_brightness"] self.alarm_activated = j["alarm_activated"] + try: + self.address = j["address"] + except: + pass hour = j["alarm_time_hour"] minute = j["alarm_time_minute"] @@ -305,7 +310,13 @@ class MyClockWidget(FloatLayout): return x def get_air_quality(self, *args): - response = requests.get("https://sinoptik.luon.net/forecast?address=telefoonstraat%2018,%20eindhoven&metrics=precipitation&metrics=UVI&metrics=AQI&metrics=pollen&metrics=PAQI") + if hasattr(self.settings, "address") == False: + print("No address specified") + return + + url = "https://sinoptik.luon.net/forecast?address=" + urllib.parse.quote(self.settings.address, safe="") + "&metrics=precipitation&metrics=UVI&metrics=AQI&metrics=pollen&metrics=PAQI" + print("URL: " + url) + response = requests.get(url) self.rain = [] self.pollen = [] diff --git a/settings.json b/settings.json index b268727..f62cc65 100644 --- a/settings.json +++ b/settings.json @@ -3,9 +3,10 @@ "volume": 1, "wake_up_sound": "Birds", "wake_up_brightness": 20, - "reading_light_brightness": 2, + "reading_light_brightness": 1, "display_brightness": 20, "alarm_activated": false, - "alarm_time_hour": 9, - "alarm_time_minute": 9 -} \ No newline at end of file + "alarm_time_hour": 7, + "alarm_time_minute": 27, + "address": "Utrechtseweg 297, Utrecht" +}