add select entity and extra sensors

Author: kbirger

custom_components/smarter/const.py

@@ -21,6 +21,7 @@
     Platform.NUMBER,
     Platform.SENSOR,
     Platform.SWITCH,
+    Platform.SELECT,
 ]
 
 SERVICE_QUICK_BOIL = "quick_boil"

custom_components/smarter/devices/smarter_coffee_SMCOF01.yaml

@@ -10,12 +10,14 @@ primary_entity:
 secondary_entities:
   - entity: sensor
     translation_key: brewed_keeping_warm
-    state_field: status.brewed_keeping_warm
-    state_class: measurement
+    state_field: brewed_keeping_warm.ts
+    device_class: timestamp
+    enabled_default: false
   - entity: sensor
     translation_key: brewing_started
-    state_field: status.brewing_started
-    state_class: measurement
+    state_field: brewing_started.ts
+    enabled_default: false
+    unit: datetime
   - entity: sensor
     translation_key: number_of_cups_since_descale
     state_class: measurement
@@ -47,15 +49,35 @@ secondary_entities:
     icon: "mdi:cup"
   - entity: binary_sensor
     translation_key: carafe_is_present
+  - entity: select
+    translation_key: coffee_strength
+    state_field: coffee_strength
+    setter: set_coffee_strength
+    mapping:
+      - value: 20
+        native_value: "Weak"
+      - value: 50
+        native_value: "Medium"
+      - value: 80
+        native_value: "Strong"
+    setter_mapping:
+      - value: 20
+        native_value: "Weak"
+      - value: 50
+        native_value: "Medium"
+      - value: 80
+        native_value: "Strong"
   - entity: number
     translation_key: coffee_strength
-    unit: "%"
     state_class: measurement
     setter: set_coffee_strength
-    range:
-      min: 20
-      max: 80
-    step: 30
+    mapping:
+      - value: 20
+        native_value: "Weak"
+      - value: 50
+        native_value: "Medium"
+      - value: 80
+        native_value: "Strong"
     icon: "mdi:wifi-strength-1"
   - entity: number
     translation_key: number_of_cups

custom_components/smarter/devices/smarter_kettle_SMKET01.yaml

@@ -8,6 +8,26 @@ primary_entity:
   translation_key: state
   icon: "mdi:kettle"
 secondary_entities:
+  - entity: sensor
+    translation_key: boiling_started
+    state_field: boiling_started.ts
+    device_class: timestamp
+    enabled_default: false
+  - entity: sensor
+    translation_key: keep_warm_finished
+    state_field: keep_warm_finished.ts
+    device_class: timestamp
+    enabled_default: false
+  - entity: sensor
+    translation_key: cooled_keeping_warm
+    state_field: cooled_keeping_warm.ts
+    device_class: timestamp
+    enabled_default: false
+  - entity: sensor
+    translation_key: boiled_keeping_warm
+    state_field: boiled_keeping_warm.ts
+    device_class: timestamp
+    enabled_default: false
   - entity: sensor
     translation_key: "water_temperature"
     unit: C
@@ -112,3 +132,9 @@ secondary_entities:
       min: 0
       max: 40
     step: 1
+  - entity: sensor
+    translation_key: keep_warm_time_remaining
+    unit: min
+    device_class: duration
+    state_class: measurement
+    icon: "mdi:clock"

custom_components/smarter/helpers/device_config.py

@@ -4,14 +4,16 @@
 
 import logging
 from collections.abc import Iterable
+from datetime import datetime
 from fnmatch import fnmatch
 from os import walk
 from os.path import dirname, join, splitext
 from typing import Any
 
 from homeassistant.components.binary_sensor import BinarySensorEntityDescription
 from homeassistant.components.number import NumberEntityDescription, NumberMode
-from homeassistant.components.sensor import SensorEntityDescription
+from homeassistant.components.select import SelectEntityDescription
+from homeassistant.components.sensor import SensorDeviceClass, SensorEntityDescription
 from homeassistant.components.switch import SwitchEntityDescription
 from homeassistant.const import EntityCategory, Platform, UnitOfTemperature
 from homeassistant.helpers.entity import EntityDescription
@@ -221,11 +223,31 @@ def max(self):
         """Return maximum valid value."""
         return self._range["max"]
 
+    @property
+    def entity_registry_enabled_default(self):
+        """Return true if entity should be enabled by default."""
+        return self._config.get("enabled_default", True)
+
+    @property
+    def entity_registry_visible_default(self):
+        """Return true if entity should be visible by default."""
+        return self.entity_registry_enabled_default and self._config.get("visible_default", True)
+
+    @property
+    def options(self):
+        """Return options for select entity."""
+        return [mapping["value"] for mapping in self._mappings]
+
     @property
     def _mappings(self):
         return self._config.get("mapping", [])
 
     def _get_value_for_native(self, native_value: Any):
+        if self.device_class == SensorDeviceClass.TIMESTAMP:
+            now = datetime.now()
+            local_now = now.astimezone()
+            local_tz = local_now.tzinfo
+            return datetime.fromtimestamp(native_value, tz=local_tz)
         for mapping in self._mappings:
             if mapping.get("native_value") == native_value:
                 value = mapping.get("value")
@@ -343,6 +365,8 @@ def entity_description(self) -> EntityDescription:
             translation_key=self.translation_key,
             translation_placeholders=self.translation_placeholders,
             name=None if self.is_primary else self.name,
+            entity_registry_enabled_default=self.entity_registry_enabled_default,
+            entity_registry_visible_default=self.entity_registry_visible_default,
             has_entity_name=True,
         )
 
@@ -367,6 +391,14 @@ def switch_entity_description(self) -> SwitchEntityDescription:
         """Return switch entity description."""
         return SwitchEntityDescription(**self.entity_description.__dict__)
 
+    @property
+    def select_entity_description(self) -> SelectEntityDescription:
+        """Return select entity description."""
+        return SelectEntityDescription(
+            key=self.key,
+            options=[mapping["value"] for mapping in self._mappings],
+        )
+
     @property
     def number_entity_description(self) -> NumberEntityDescription:
         """Return number entity description."""

custom_components/smarter/manifest.json

@@ -17,6 +17,6 @@
     "smarter-client==0.3.0-dev.3"
   ],
   "ssdp": [],
-  "version": "0.4.0-dev.10",
+  "version": "0.4.0-dev.11",
   "zeroconf": []
 }

custom_components/smarter/select.py

@@ -0,0 +1,71 @@
+"""Support for Smarter number fields."""
+
+from __future__ import annotations
+
+from homeassistant.components.select import SelectEntity, SelectEntityDescription
+from homeassistant.config_entries import ConfigEntry
+
+# from custom_components.smarter.entity import (
+#     SmarterEntity,
+#     SmarterSensorEntityDescription,
+# )
+# from custom_components.smarter.helpers.base import ServiceMetadata
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from smarter_client.managed_devices.base import BaseDevice
+
+from custom_components.smarter.helpers.device_config import SmarterEntityConfig
+
+# from custom_components.smarter.entity import SmarterEntity
+# from custom_components.smarter.helpers.config import async_setup_smarter_platform
+# from custom_components.smarter.helpers.device_config import SmarterEntityConfig
+from .entity import SmarterEntity
+from .helpers.config import async_setup_smarter_platform
+
+# from custom_components.smarter.entity import (
+#     SmarterEntity,
+#     SmarterSensorEntityDescription,
+# )
+# from custom_components.smarter.helpers.base import ServiceMetadata
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up Smarter sensors."""
+    data = {**config_entry.data, **config_entry.options}
+    await async_setup_smarter_platform(
+        hass,
+        data,
+        async_add_entities,
+        Platform.SELECT,
+        SmarterSelect,
+    )
+
+
+class SmarterSelect(SmarterEntity, SelectEntity):
+    """Representation of a Smarter number."""
+
+    entity_description: SelectEntityDescription
+    _attr_has_entity_name = True
+
+    def __init__(self, device: BaseDevice, config: SmarterEntityConfig):
+        """Create instance."""
+        super().__init__(device, config, config.select_entity_description)
+
+    @property
+    def options(self):
+        """Return the list of possible options."""
+        return self.config.options
+
+    @property
+    def current_option(self):
+        """Return the currently selected option."""
+        return self.config.get_value(self.device)
+
+    def select_option(self, option):
+        """Set the option."""
+        self.config.set_value(self.device, option)

custom_components/smarter/translations/en.json

@@ -58,7 +58,24 @@
     }
   },
   "entity": {
+    "select": {
+      "coffee_strength": {
+        "name": "Coffee Strength"
+      }
+    },
     "sensor": {
+      "keep_warm_finished": {
+        "name": "Keep Warm Finished"
+      },
+      "cooled_keeping_warm": {
+        "name": "Cooled Keeping Warm"
+      },
+      "boiled_keeping_warm": {
+        "name": "Boiled Keeping Warm"
+      },
+      "boiling_started": {
+        "name": "Boiling started"
+      },
       "water_temperature": {
         "name": "Water temperature"
       },

pyproject.toml

@@ -4,7 +4,7 @@ requires-python = "~=3.12.4"
 readme = "README.md"
 license = { text = "MIT" }
 name = "homeassistant-smarter"
-version = "0.4.0-dev.10"
+version = "0.4.0-dev.11"
 description = "Default template for PDM package"
 authors = [{ name = "Kirill Birger", email = "[email protected]" }]