Merge pull request #574 from asantaga/dev

Minor enhancements

Author: msp1974

custom_components/wiser/sensor.py

@@ -321,8 +321,10 @@ def _get_battery_state(self) -> int | str:
         # TODO: Move this into api
         if self._device.battery.percent:
             return self._device.battery.percent
-        if self._device.battery.level == "Normal":
-            return 100
+        if self._device.battery.voltage is None:
+            # This device does not provide battery voltage.  Calc % from level text
+            levels = {"normal": 100, "twothirds": 66, "onethird": 33, "low": 10}
+            return levels.get(self._device.battery.level.lower(), 0)
         return 0
 
     @property
@@ -597,7 +599,7 @@ def _handle_coordinator_update(self) -> None:
         mode = "Manual" if self._device.mode != "Auto" else "Auto"
         state = ""
         if self._device.is_boosted:
-            state = f"Boost {int(self._device.boost_time_remaining/60)}m"
+            state = f"Boost {int(self._device.boost_time_remaining / 60)}m"
         elif self._device.is_override:
             state = "Override"
         elif self._device.is_away_mode:

custom_components/wiser/switch.py

@@ -6,6 +6,7 @@
 """
 
 import asyncio
+import datetime as dt
 import logging
 import voluptuous as vol
 
@@ -346,6 +347,9 @@ def extra_state_attributes(self):
         if self._name == "Away Mode":
             attrs["away_mode_temperature"] = self._away_temperature
 
+        if self._name == "Daylight Saving":
+            attrs["hub_time"] = self._data.wiserhub.system.hub_time
+
         return attrs