Refactor Delonghi Primadonna component to support

new beverage entity feature Signed-off-by: Serge Arbuzov <info@whitediver.com>
Arbuzov · Nov 16, 2023 · 8604e58 · 8604e58
1 parent 47483a2
commit 8604e58
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 6 deletions.
diff --git a/custom_components/delonghi_primadonna/__init__.py b/custom_components/delonghi_primadonna/__init__.py
@@ -9,7 +9,7 @@
 from homeassistant.core import HomeAssistant, ServiceCall
 
 from .const import BEVERAGE_SERVICE_NAME, DOMAIN
-from .device import AvailableBeverage, DelongiPrimadonna
+from .device import AvailableBeverage, BeverageEntityFeature, DelongiPrimadonna
 
 PLATFORMS: list[str] = [
     Platform.BUTTON,
@@ -21,6 +21,11 @@
     Platform.DEVICE_TRACKER,
 ]
 
+__all__ = [
+    'async_setup_entry',
+    'async_unload_entry',
+    'BeverageEntityFeature'
+]
 
 _LOGGER = logging.getLogger(__name__)
 

diff --git a/custom_components/delonghi_primadonna/device.py b/custom_components/delonghi_primadonna/device.py
@@ -1,5 +1,6 @@
 """Delongi primadonna device description"""
 import asyncio
+from enum import IntFlag
 import logging
 import uuid
 from binascii import hexlify
@@ -27,6 +28,14 @@
 _LOGGER = logging.getLogger(__name__)
 
 
+class BeverageEntityFeature(IntFlag):
+    """Supported features of the beverage entity"""
+
+    MAKE_BEVERAGE = 1
+    SET_TEMPERATURE = 2
+    SET_INTENCE = 4
+
+
 class AvailableBeverage(StrEnum):
     """Coffee machine available beverages"""
 

diff --git a/custom_components/delonghi_primadonna/select.py b/custom_components/delonghi_primadonna/select.py
@@ -8,7 +8,10 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import AVAILABLE_PROFILES, DOMAIN, POWER_OFF_OPTIONS
-from .device import AvailableBeverage, DelonghiDeviceEntity, DelongiPrimadonna
+from .device import (AvailableBeverage,
+                     BeverageEntityFeature,
+                     DelonghiDeviceEntity,
+                     DelongiPrimadonna)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -57,8 +60,9 @@ class BeverageSelect(DelonghiDeviceEntity, SelectEntity):
 
     _attr_options = [*AvailableBeverage]
     _attr_current_option = [*AvailableBeverage][0]
-    _attr_translation_key = 'beverage'
+    _attr_translation_key = 'make_beverage'
     _attr_icon = 'mdi:coffee'
+    _attr_supported_features: BeverageEntityFeature = BeverageEntityFeature(0)
 
     async def async_select_option(self, option: str) -> None:
         """Select beverage action"""
@@ -116,6 +120,7 @@ class WaterTemperatureSelect(DelonghiDeviceEntity, SelectEntity):
     _attr_current_option = 'Low'
     _attr_translation_key = 'water_temperature'
     _attr_icon = 'mdi:thermometer'
+    _attr_supported_features: BeverageEntityFeature = BeverageEntityFeature(1)
 
     @property
     def entity_category(self, **kwargs: Any) -> None:

diff --git a/custom_components/delonghi_primadonna/services.yaml b/custom_components/delonghi_primadonna/services.yaml
@@ -3,7 +3,11 @@ make_beverage:
   description: Prepares beverages from the list of available beverages
   target:
     entity:
-      domain: select
+      domain: delonghi_primadonna
+      supported_features:
+        - delonghi_primadonna.BeverageEntityFeature.    MAKE_BEVERAGE = 1
+
+
   fields:
     beverage:
       name: Beverage
@@ -12,6 +16,7 @@ make_beverage:
       default: "none"
       selector:
         select:
+          translation_key: "fan_speed"
           options:
             - "none"
             - "steam"

diff --git a/custom_components/delonghi_primadonna/translations/en.json b/custom_components/delonghi_primadonna/translations/en.json
@@ -22,7 +22,7 @@
       "profile": {
         "name": "Profile"
       },
-      "beverage": {
+      "make_beverage": {
         "name": "Beverage"
       },
       "energy_save_mode": {

diff --git a/custom_components/delonghi_primadonna/translations/ru.json b/custom_components/delonghi_primadonna/translations/ru.json
@@ -22,7 +22,7 @@
       "profile": {
         "name": "Профиль"
       },
-      "beverage": {
+      "make_beverage": {
         "name": "Напиток"
       },
       "energy_save_mode": {