Add a dynamic sensitivity slider for Matter sensors

homeassistant/components/matter/number.py

@@ -441,6 +441,31 @@ def _update_from_device(self) -> None:
         featuremap_contains=clusters.OccupancySensing.Bitmaps.Feature.kPassiveInfrared,
         allow_multi=True,
     ),
+    MatterDiscoverySchema(
+        platform=Platform.NUMBER,
+        entity_description=MatterRangeNumberEntityDescription(
+            key="BooleanStateConfigurationCurrentSensitivityLevel",
+            entity_category=EntityCategory.CONFIG,
+            translation_key="sensitivity_level",
+            native_min_value=1,
+            native_step=1,
+            device_to_ha=lambda x: x + 1,
+            ha_to_device=lambda x: int(x) - 1,
+            max_attribute=(
+                clusters.BooleanStateConfiguration.Attributes.SupportedSensitivityLevels
+            ),
+            mode=NumberMode.SLIDER,
+        ),
+        entity_class=MatterRangeNumber,
+        required_attributes=(
+            clusters.BooleanStateConfiguration.Attributes.CurrentSensitivityLevel,
+            clusters.BooleanStateConfiguration.Attributes.SupportedSensitivityLevels,
+        ),
+        featuremap_contains=(
+            clusters.BooleanStateConfiguration.Bitmaps.Feature.kSensitivityLevel
+        ),
+        allow_multi=True,
+    ),
     MatterDiscoverySchema(
         platform=Platform.NUMBER,
         entity_description=MatterNumberEntityDescription(

homeassistant/components/matter/select.py

@@ -560,11 +560,15 @@ def _update_from_device(self) -> None:
             clusters.PumpConfigurationAndControl.Attributes.OperationMode,
         ),
     ),
+    # Keep the legacy vendor-specific select entities around for one release
+    # so existing users can migrate before we remove them in favor of the
+    # generic number slider.
     MatterDiscoverySchema(
         platform=Platform.SELECT,
         entity_description=MatterSelectEntityDescription(
             key="AqaraBooleanStateConfigurationCurrentSensitivityLevel",
             entity_category=EntityCategory.CONFIG,
+            entity_registry_enabled_default=False,
             translation_key="sensitivity_level",
             options=["10 mm", "20 mm", "30 mm"],
             device_to_ha={
@@ -584,12 +588,14 @@ def _update_from_device(self) -> None:
         ),
         vendor_id=(4447,),
         product_id=(8194,),
+        allow_multi=True,
     ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,
         entity_description=MatterSelectEntityDescription(
             key="AqaraOccupancySensorBooleanStateConfigurationCurrentSensitivityLevel",
             entity_category=EntityCategory.CONFIG,
+            entity_registry_enabled_default=False,
             translation_key="sensitivity_level",
             options=["low", "standard", "high"],
             device_to_ha={
@@ -612,12 +618,14 @@ def _update_from_device(self) -> None:
             8197,
             8195,
         ),
+        allow_multi=True,
     ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,
         entity_description=MatterSelectEntityDescription(
             key="HeimanOccupancySensorBooleanStateConfigurationCurrentSensitivityLevel",
             entity_category=EntityCategory.CONFIG,
+            entity_registry_enabled_default=False,
             translation_key="sensitivity_level",
             options=["low", "standard", "high"],
             device_to_ha={
@@ -637,6 +645,7 @@ def _update_from_device(self) -> None:
         ),
         vendor_id=(4619,),
         product_id=(4097,),
+        allow_multi=True,
     ),
     MatterDiscoverySchema(
         platform=Platform.SELECT,

homeassistant/components/matter/strings.json

@@ -259,6 +259,9 @@
       "pump_setpoint": {
         "name": "Setpoint"
       },
+      "sensitivity_level": {
+        "name": "Sensitivity"
+      },
       "speaker_setpoint": {
         "name": "Volume"
       },

tests/components/matter/common.py

@@ -22,6 +22,7 @@
     "air_quality_sensor",
     "aqara_door_window_p2",
     "aqara_motion_p2",
+    "aqara_multi_state_p100",
     "aqara_presence_fp300",
     "aqara_sensor_w100",
     "aqara_thermostat_w500",