Fixed backward compatibility

2 files changed, 8 insertions, 3 deletions

diff --git a/custom_components/skykettle/__init__.py b/custom_components/skykettle/__init__.py
index 4dc2092..19e76f3 100644
--- a/custom_components/skykettle/__init__.py
+++ b/custom_components/skykettle/__init__.py
@@ -7,8 +7,9 @@ from homeassistant.const import *
 import homeassistant.helpers.event as ev
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.entity import DeviceInfo
-from .kettle_connection import KettleConnection
 from datetime import timedelta
+from .kettle_connection import KettleConnection
+from .skykettle import SkyKettle
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -30,10 +31,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
 
     # Backward compatibility
     model = entry.data.get(CONF_FRIENDLY_NAME, None)
-    if model != None and not model.endswith("S"):
+    if model != None and model not in SkyKettle.SUPPORTED_DEVICES and model + "S" in SkyKettle.SUPPORTED_DEVICES:
         config = dict(entry.data.items())
         config[CONF_FRIENDLY_NAME] = model + "S"
         hass.config_entries.async_update_entry(entry, data=config)
+    elif model != None and model not in SkyKettle.SUPPORTED_DEVICES and model + "E" in SkyKettle.SUPPORTED_DEVICES:
+        config = dict(entry.data.items())
+        config[CONF_FRIENDLY_NAME] = model + "E"
+        hass.config_entries.async_update_entry(entry, data=config)
 
     kettle = KettleConnection(
         mac=entry.data[CONF_MAC],
diff --git a/custom_components/skykettle/skykettle.py b/custom_components/skykettle/skykettle.py
index 595a720..09de729 100644
--- a/custom_components/skykettle/skykettle.py
+++ b/custom_components/skykettle/skykettle.py
@@ -11,7 +11,7 @@ _LOGGER = logging.getLogger(__name__)
 
 class SkyKettle():
     # Source: https://github.com/mavrikkk/ha_kettler/blob/master/custom_components/ready4sky/r4sconst.py
-    SUPPORTED_DEVICES = {'RK-M170S':0, 'RK-M171S':0, 'RK-M173S':0, 'RK-G200S':1, 'RK-G201S':1, 'RK-G202S':1, 'RK-G210S':1, 'RK-G211S':1, 'RK-G212S':1, 'RK-G240S':1, 'RK-M216S':2, 'RK-M216S-E':2}
+    SUPPORTED_DEVICES = {'RK-M170S':0, 'RK-M170S-E':0, 'RK-M171S':0, 'RK-M173S':0, 'RK-G200S':1, 'RK-G201S':1, 'RK-G202S':1, 'RK-G210S':1, 'RK-G211S':1, 'RK-G212S':1, 'RK-G240S':1, 'RK-M216S':2, 'RK-M216S-E':2}
 
     MODE_BOIL = 0x00
     MODE_HEAT = 0x01