#124 and bump 1.2.1

elden1337 · Jun 23, 2022 · 67ad348 · 67ad348
1 parent 24400b1
commit 67ad348
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/custom_components/peaqev/__init__.py b/custom_components/peaqev/__init__.py
@@ -72,7 +72,10 @@ async def servicehandler_disable(call): # pylint:disable=unused-argument
 
     ATTR_HOURS = "hours"
     async def servicehandler_override_nonhours(call): # pylint:disable=unused-argument
-        hours = call.data.get(ATTR_HOURS)
+        try:
+            hours = call.data.get(ATTR_HOURS)
+        except:
+            hours = 1
         await hub.call_override_nonhours(hours)
 
     hass.services.async_register(DOMAIN, "enable", servicehandler_enable)

diff --git a/custom_components/peaqev/manifest.json b/custom_components/peaqev/manifest.json
@@ -10,7 +10,7 @@
     "codeowners": [
       "@elden1337"
     ],
-    "version": "1.2.0",
+    "version": "1.2.1",
     "iot_class": "calculated",
     "dependencies": [
       "recorder",

diff --git a/custom_components/peaqev/peaqservice/hub/hub.py b/custom_components/peaqev/peaqservice/hub/hub.py
@@ -88,7 +88,7 @@ def is_initialized(self) -> bool:
     @property
     def current_peak_dynamic(self):
         if self.price_aware is True and len(self.hours.dynamic_caution_hours):
-            if datetime.now().hour in self.hours.dynamic_caution_hours.keys():
+            if datetime.now().hour in self.hours.dynamic_caution_hours.keys() and self.timer.is_override is False:
                 return self.currentpeak.value * self.hours.dynamic_caution_hours[datetime.now().hour]
         return self.currentpeak.value
 

diff --git a/custom_components/peaqev/peaqservice/hub/hub_lite.py b/custom_components/peaqev/peaqservice/hub/hub_lite.py
@@ -63,7 +63,7 @@ def is_initialized(self) -> bool:
     @property
     def current_peak_dynamic(self):
         if self.price_aware is True and len(self.hours.dynamic_caution_hours):
-            if datetime.now().hour in self.hours.dynamic_caution_hours.keys():
+            if datetime.now().hour in self.hours.dynamic_caution_hours.keys() and self.timer.is_override is False:
                 return self.currentpeak.value * self.hours.dynamic_caution_hours[datetime.now().hour]
         return self.currentpeak.value