Add beverage selector options to translations

Signed-off-by: Serge Arbuzov <info@whitediver.com>
Arbuzov · Nov 18, 2023 · f8f0e71 · f8f0e71
1 parent e633679
commit f8f0e71
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@
 
 
 [![Open your Home Assistant instance and open a repository inside the Home Assistant Community Store.](https://my.home-assistant.io/badges/hacs_repository.svg)](https://my.home-assistant.io/redirect/hacs_repository/?owner=Arbuzov&repository=home_assistant_delonghi_primadonna&category=integration)
+
+
 [![Open your Home Assistant instance and start setting up a new integration.](https://my.home-assistant.io/badges/config_flow_start.svg)](https://my.home-assistant.io/redirect/config_flow_start/?domain=home_assistant_delonghi_primadonna)
 
 ![Company logo](https://brands.home-assistant.io/delonghi_primadonna/logo.png)

diff --git a/custom_components/delonghi_primadonna/__init__.py b/custom_components/delonghi_primadonna/__init__.py
@@ -36,9 +36,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         hass.data[DOMAIN] = {}
     delonghi_device = DelongiPrimadonna(entry.data, hass)
     hass.data[DOMAIN][entry.unique_id] = delonghi_device
+    _LOGGER.warning('Device id %s', entry.unique_id)
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     async def make_beverage(call: ServiceCall) -> None:
+        _LOGGER.warning('Make beverage %s', call.data)
         await delonghi_device.beverage_start(call.data['beverage'])
 
     hass.services.async_register(
@@ -47,6 +49,8 @@ async def make_beverage(call: ServiceCall) -> None:
         make_beverage,
         schema=vol.Schema({
             vol.Required('beverage'): vol.In([*AvailableBeverage]),
+            vol.Optional('entity_id'): vol.Coerce(str),
+            vol.Optional('device_id'): vol.Coerce(str),
         })
     )
 

diff --git a/custom_components/delonghi_primadonna/device.py b/custom_components/delonghi_primadonna/device.py
@@ -105,6 +105,7 @@ def __init__(self):
 
 
 BEVERAGE_COMMANDS = {
+    AvailableBeverage.NONE: BeverageCommand(DEBUG, DEBUG),
     AvailableBeverage.STEAM: BeverageCommand(STEAM_ON, STEAM_OFF),
     AvailableBeverage.LONG: BeverageCommand(LONG_ON, LONG_OFF),
     AvailableBeverage.COFFEE: BeverageCommand(COFFE_ON, COFFE_OFF),

diff --git a/custom_components/delonghi_primadonna/manifest.json b/custom_components/delonghi_primadonna/manifest.json
@@ -19,5 +19,5 @@
     "documentation": "https://github.com/Arbuzov/home_assistant_delonghi_primadonna",
     "iot_class": "local_polling",
     "issue_tracker": "https://github.com/Arbuzov/home_assistant_delonghi_primadonna/issues",
-    "version": "1.5.3-beta"
+    "version": "1.5.3"
 }
diff --git a/custom_components/delonghi_primadonna/services.yaml b/custom_components/delonghi_primadonna/services.yaml
@@ -7,6 +7,9 @@ make_beverage:
       # supported_features:
       #   - delonghi_primadonna.BeverageEntityFeature.MAKE_BEVERAGE
   fields:
+    entity_id:
+      description: "some select"
+      example: "someexample"
     beverage:
       name: Beverage
       description: Beverage to prepare

diff --git a/custom_components/delonghi_primadonna/translations/en.json b/custom_components/delonghi_primadonna/translations/en.json
@@ -40,18 +40,6 @@
         "name": "Turn on"
       }
     },
-    "services": {
-      "make_beverage": {
-        "name": "Make beverage",
-        "description": "Prepare a beverage from the list below",
-        "fields": {
-          "beverage": {
-            "name": "Beverage",
-            "description": "Beverage to prepare"
-          }
-        }
-      }
-    },
     "switch": {
       "cup_light": {
         "name": "Cup light"
@@ -66,5 +54,36 @@
         "name": "Sounds"
       }
     }
+  },
+  "services": {
+    "make_beverage": {
+      "name": "Make beverage",
+      "description": "Prepare a beverage from the list below",
+      "fields": {
+        "beverage": {
+          "name": "Beverage",
+          "description": "Beverage to prepare"
+        },
+        "entity_id": {
+          "name": "Entity ID",
+          "description": "Entity ID of the coffee machine"
+        }
+      }
+    }
+  },
+  "selector": {
+    "beverage": {
+      "options": {
+        "none": "None",
+        "steam": "Steam",
+        "long": "Long",
+        "coffee": "Coffee",
+        "dopio": "Dopio",
+        "hot_water": "Hot water",
+        "espresso": "Espresso",
+        "americano": "Americano",
+        "espresso2": "Espresso 2"
+      }
+    }
   }
-}
+}
diff --git a/custom_components/delonghi_primadonna/translations/ru.json b/custom_components/delonghi_primadonna/translations/ru.json
@@ -40,18 +40,6 @@
         "name": "Включить"
       }
     },
-    "services": {
-      "make_beverage": {
-        "name": "Приготовить напиток",
-        "description": "Приготовить напиток из заданного списка",
-        "fields": {
-          "beverage": {
-            "name": "Напиток",
-            "description": "Напиток который будет приготовлен"
-          }
-        }
-      }
-    },
     "switch": {
       "cup_light": {
         "name": "Подсветка чашки"
@@ -66,5 +54,36 @@
         "name": "Звук кнопок"
       }
     }
+  },
+  "services": {
+    "make_beverage": {
+      "name": "Приготовить напиток",
+      "description": "Приготовить напиток из заданного списка",
+      "fields": {
+        "beverage": {
+          "name": "Напиток",
+          "description": "Напиток который будет приготовлен"
+        },
+        "entity_id": {
+          "name": "Сущность",
+          "description": "Сущность которая будет использована для приготовления напитка"
+        }
+      }
+    }
+  },
+  "selector": {
+    "beverage": {
+      "options": {
+        "none": "Нет",
+        "steam": "Пар",
+        "long": "Лунго",
+        "coffee": "Кофе",
+        "dopio": "Допио",
+        "hot_water": "Горячая вода",
+        "espresso": "Эспрессо",
+        "americano": "Американо",
+        "espresso2": "Эспрессо 2"
+      }
+    }
   }
-}
+}