core 19.0.0a25

elden1337 · Jun 25, 2023 · 8c14476 · 8c14476
1 parent 65c4ee1
commit 8c14476
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 40 deletions.
diff --git a/custom_components/peaqev/manifest.json b/custom_components/peaqev/manifest.json
@@ -22,7 +22,7 @@
   "iot_class": "calculated",
   "issue_tracker": "https://github.com/elden1337/hass-peaq/issues",
   "requirements": [
-    "peaqevcore==19.0.0a23"
+    "peaqevcore==19.0.0a25"
   ],
   "version": "3.0.0a0"
 }
diff --git a/custom_components/peaqev/sensors/money_sensor.py b/custom_components/peaqev/sensors/money_sensor.py
@@ -7,7 +7,6 @@
 
 from homeassistant.helpers.restore_state import RestoreEntity
 
-from custom_components.peaqev.peaqservice.chargecontroller.const import CHARGING_ALLOWED
 from custom_components.peaqev.peaqservice.util.constants import HOURCONTROLLER
 from custom_components.peaqev.sensors.money_sensor_helpers import *
 from custom_components.peaqev.sensors.sensorbase import SensorBase
@@ -34,8 +33,8 @@ def __init__(self, hub: HomeAssistantHub, entry_id):
         self._max_charge = None
         self._max_min_price = None
         self._max_price_based_on = None
-        self._average_nordpool = None
-        self._average_data_30 = None
+        #self._average_nordpool = None
+        #self._average_data_30 = None
         self._average_data_current_month = None
         self._charge_permittance = None
         self._offsets = {}
@@ -60,17 +59,12 @@ async def async_update(self) -> None:
             "current_peak",
             "avg_kwh_price",
             "max_charge",
-            "average_weekly",
-            "average_monthly",
             "max_price",
             "min_price",
-            "average_30",
             "future_hours",
         )
         if ret is not None:
-            self._state = await self.async_state_display(
-                ret.get("non_hours", []), ret.get("dynamic_caution_hours", {})
-            )
+            self._state = await self.async_state_display()
             self._all_hours = set_all_hours_display(ret.get("future_hours", []))
             self._nonhours = set_non_hours_display(ret.get("non_hours", []))
             self._dynamic_caution_hours = set_caution_hours_display(
@@ -83,28 +77,17 @@ async def async_update(self) -> None:
             self._charge_permittance = set_current_charge_permittance_display(
                 ret.get("non_hours"), ret.get("dynamic_caution_hours")
             )
-
             self._avg_cost = set_avg_cost(
                 avg_cost=ret.get("avg_kwh_price"),
                 currency=ret.get("currency"),
                 use_cent=ret.get("use_cent"),
             )
-
-            self._average_nordpool = currency_translation(
-                value=ret.get("average_weekly"),
-                currency=ret.get("currency"),
-                use_cent=ret.get("use_cent", False),
-            )
             self._average_data_current_month = currency_translation(
                 value=ret.get("average_monthly"),
                 currency=ret.get("currency"),
                 use_cent=ret.get("use_cent", False),
             )
-            self._average_data_30 = currency_translation(
-                value=ret.get("average_30"),
-                currency=ret.get("currency"),
-                use_cent=ret.get("use_cent", False),
-            )
+
             if self.hub.options.price.dynamic_top_price:
                 _maxp = currency_translation(
                     value=ret.get("max_price") if ret.get("max_price", 0) > 0 else None,
@@ -130,9 +113,6 @@ def extra_state_attributes(self) -> dict:
             "Current hour charge permittance": self._charge_permittance,
             "Avg price per kWh": self._avg_cost,
             "Max charge amount": self._max_charge,
-            #"Nordpool average 7 days": self._average_nordpool,
-            #"Nordpool average 30 days": self._average_data_30,
-            #"nordpool_average_this_month": self._average_data_current_month,
             "Nordpool average data": self._average_nordpool_data,
             "All hours": self._all_hours,
         }
@@ -160,22 +140,11 @@ async def async_added_to_hass(self):
         else:
             self._average_nordpool = f"- {self._currency}"
 
-    async def async_state_display(
-        self, non_hours: list, dynamic_caution_hours: dict
-    ) -> str:
-        hour = datetime.now().replace(microsecond=0, second=0, minute=0)
-        ret = CHARGING_ALLOWED.capitalize()
+    async def async_state_display(self) -> str:
+        ret = self.hub.hours._core.service.stopped_string  # todo: composition
         if getattr(self.hub.hours.timer, "is_override", False):  # todo: composition
             self._icon = "mdi:car-electric-outline"
             return getattr(
                 self.hub.hours.timer, "override_string", ""
             )  # todo: composition
-        # if hour in non_hours:
-        #     self._icon = "mdi:car-clock"
-        #     ret = self.hub.hours.service.stopped_string #todo: composition
-        if hour in dynamic_caution_hours.keys():
-            val = dynamic_caution_hours.get(hour)
-            ret += f" at {int(val * 100)}% of peak"
-        else:
-            ret = self.hub.hours._core.service.stopped_string  # todo: composition
         return ret
diff --git a/custom_components/peaqev/sensors/money_sensor_helpers.py b/custom_components/peaqev/sensors/money_sensor_helpers.py
@@ -114,9 +114,9 @@ def set_caution_hours_display(dynamic_caution_hours: dict[datetime, float]) -> d
     return ret
 
 
-def set_current_charge_permittance_display(non_hours, dynamic_caution_hours) -> str:
+def set_current_charge_permittance_display(non_hours:list[datetime], dynamic_caution_hours:dict[datetime, float]) -> str:
     ret = 100
-    hour = datetime.now().hour
+    hour = datetime.now().replace(minute=0, second=0, microsecond=0)
     if hour in non_hours:
         ret = 0
     elif hour in dynamic_caution_hours.keys():