repaired pase error

Rain1971 · Mar 29, 2024 · 6226f40 · 6226f40
1 parent ebd7700
commit 6226f40
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 63 deletions.
diff --git a/custom_components/v2c_trydan/const.py b/custom_components/v2c_trydan/const.py
@@ -1,9 +1,5 @@
-from homeassistant.helpers.dispatcher import SignalType
-
 DOMAIN = "v2c_trydan"
 CONF_IP_ADDRESS = "ip_address"
 CONF_KWH_PER_100KM = "kwh_per_100km"
 CONF_KM_TO_CHARGE = "km_to_charge"
-CONF_PRECIO_LUZ = "precio_luz"
-
-DATA_UPDATED = f"{DOMAIN}_update"
+CONF_PRECIO_LUZ = "precio_luz"
diff --git a/custom_components/v2c_trydan/manifest.json b/custom_components/v2c_trydan/manifest.json
@@ -11,6 +11,6 @@
   "quality_scale": "internal",
   "requirements": ["aiohttp", "tenacity"],
   "ssdp": [],
-  "version": "2.9.7",
+  "version": "2.9.8",
   "zeroconf": []
 }
diff --git a/custom_components/v2c_trydan/number.py b/custom_components/v2c_trydan/number.py
@@ -1,10 +1,8 @@
-from homeassistant.components.number import NumberEntity, RestoreNumber
+from homeassistant.components.number import NumberEntity
 from homeassistant.const import DEVICE_DEFAULT_NAME
-from homeassistant.core import callback
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers import config_validation as cv
 import logging
-from .const import DOMAIN, DATA_UPDATED
+from . import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -140,7 +138,7 @@ async def async_set_native_value(self, value):
         else:
             _LOGGER.error("v2c_dynamic_power_mode must be between 0 and 7")
 
-class KmToChargeNumber(RestoreNumber):
+class KmToChargeNumber(NumberEntity):
     def __init__(self, hass):
         self._hass = hass
         self._state = 0
@@ -180,21 +178,6 @@ async def async_set_native_value(self, value):
         else:
             _LOGGER.error("v2c_km_to_charge must be between 0 and 1000")
 
-    async def async_added_to_hass(self) -> None:
-        await super().async_added_to_hass()
-        value = await self.async_get_last_number_data()
-        if not value:
-            return
-        self._state = value.native_value
-
-        async_dispatcher_connect(
-            self._hass, DATA_UPDATED, self._schedule_immediate_update
-        )
-
-    @callback
-    def _schedule_immediate_update(self):
-        self.async_schedule_update_ha_state(True)
-
 class IntensityNumber(NumberEntity):
     def __init__(self, hass):
         self._hass = hass
@@ -236,7 +219,7 @@ async def async_set_native_value(self, value):
         else:
             _LOGGER.error("v2c_intensity must be between {} and {}".format(self.native_min_value, self.native_max_value))
 
-class MaxPrice(RestoreNumber):
+class MaxPrice(NumberEntity):
     def __init__(self, hass):
         self._hass = hass
         self._state = 0
@@ -274,19 +257,4 @@ async def async_set_native_value(self, value):
             self._state = value
             self.async_write_ha_state()
         else:
-            _LOGGER.error("v2c_MaxPrice must be between 0 and 1")
-
-    async def async_added_to_hass(self) -> None:
-        await super().async_added_to_hass()
-        value = await self.async_get_last_number_data()
-        if not value:
-            return
-        self._state = value.native_value
-
-        async_dispatcher_connect(
-            self._hass, DATA_UPDATED, self._schedule_immediate_update
-        )
-
-    @callback
-    def _schedule_immediate_update(self):
-        self.async_schedule_update_ha_state(True)
+            _LOGGER.error("v2c_MaxPrice must be between 0 and 1")
diff --git a/custom_components/v2c_trydan/switch.py b/custom_components/v2c_trydan/switch.py
@@ -7,19 +7,17 @@
 
 from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
 from homeassistant.const import CONF_IP_ADDRESS
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
     UpdateFailed,
 )
 
 from .coordinator import V2CtrydanDataUpdateCoordinator
-from .const import DOMAIN, CONF_PRECIO_LUZ, DATA_UPDATED
+from .const import DOMAIN, CONF_PRECIO_LUZ
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -84,7 +82,7 @@ async def async_turn_off(self, **kwargs):
         except Exception as e:
             _LOGGER.error(f"Error turning off switch: {e}")
 
-class V2CCargaPVPCSwitch(SwitchEntity, RestoreEntity):
+class V2CCargaPVPCSwitch(SwitchEntity):
     def __init__(self, precio_luz_entity):
         self._is_on = False
         self.precio_luz_entity = precio_luz_entity
@@ -109,18 +107,3 @@ async def async_turn_on(self, **kwargs):
 
     async def async_turn_off(self, **kwargs):
         self._is_on = False
-
-    async def async_added_to_hass(self) -> None:
-        await super().async_added_to_hass()
-        state = await self.async_get_last_state()
-        if not state:
-            return
-        self._is_on = state.state
-
-        async_dispatcher_connect(
-            self.hass, DATA_UPDATED, self._schedule_immediate_update
-        )
-
-    @callback
-    def _schedule_immediate_update(self):
-        self.async_schedule_update_ha_state(True)