homeassistant 2025.8.2__py3-none-any.whl → 2025.9.0__py3-none-any.whl

homeassistant/components/zimi/translations/ga.json

@@ -1,10 +1,21 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "T\u00e1 an gl\u00e9as cumraithe cheana f\u00e9in"
+        },
         "error": {
-            "connection_refused": "Di\u00falta\u00edodh an nasc"
+            "cannot_connect": "Theip ar an nascadh",
+            "connection_refused": "Di\u00falta\u00edodh an nasc",
+            "invalid_host": "Ainm \u00f3stach n\u00f3 seoladh IP neamhbhail\u00ed",
+            "timeout": "Am cr\u00edochnaithe ag bun\u00fa nasc",
+            "unknown": "Earr\u00e1id gan choinne"
         },
         "step": {
             "manual": {
+                "data": {
+                    "host": "\u00d3stach",
+                    "port": "Port"
+                },
                 "data_description": {
                     "host": "\u00c9igeantach - seoladh IP ZCC.",
                     "port": "\u00c9igeantach - uimhir phoirt ZCC (r\u00e9amhshocraithe=5003)."
@@ -14,6 +25,8 @@
             },
             "selection": {
                 "data": {
+                    "host": "\u00d3stach",
+                    "port": "Port",
                     "selected_host_and_port": "ZCC Roghnaithe"
                 },
                 "data_description": {

homeassistant/components/zone/condition.py

@@ -100,13 +100,13 @@ class ZoneCondition(Condition):
         self._config = config
 
     @classmethod
-    async def async_validate_condition_config(
+    async def async_validate_config(
         cls, hass: HomeAssistant, config: ConfigType
     ) -> ConfigType:
         """Validate config."""
         return _CONDITION_SCHEMA(config)  # type: ignore[no-any-return]
 
-    async def async_condition_from_config(self) -> ConditionCheckerType:
+    async def async_get_checker(self) -> ConditionCheckerType:
         """Wrap action method with zone based condition."""
         entity_ids = self._config.get(CONF_ENTITY_ID, [])
         zone_entity_ids = self._config.get(CONF_ZONE, [])
@@ -147,7 +147,7 @@ class ZoneCondition(Condition):
 
 
 CONDITIONS: dict[str, type[Condition]] = {
-    "zone": ZoneCondition,
+    "_": ZoneCondition,
 }
 
 

homeassistant/components/zwave_js/__init__.py

@@ -115,11 +115,7 @@ from .const import (
     ZWAVE_JS_VALUE_NOTIFICATION_EVENT,
     ZWAVE_JS_VALUE_UPDATED_EVENT,
 )
-from .discovery import (
-    ZwaveDiscoveryInfo,
-    async_discover_node_values,
-    async_discover_single_value,
-)
+from .discovery import async_discover_node_values, async_discover_single_value
 from .helpers import (
     async_disable_server_logging_if_needed,
     async_enable_server_logging_if_needed,
@@ -131,7 +127,7 @@ from .helpers import (
     get_valueless_base_unique_id,
 )
 from .migrate import async_migrate_discovered_value
-from .models import ZwaveJSConfigEntry, ZwaveJSData
+from .models import PlatformZwaveDiscoveryInfo, ZwaveJSConfigEntry, ZwaveJSData
 from .services import async_setup_services
 
 CONNECT_TIMEOUT = 10
@@ -776,7 +772,7 @@ class NodeEvents:
         # Remove any old value ids if this is a reinterview.
         self.controller_events.discovered_value_ids.pop(device.id, None)
 
-        value_updates_disc_info: dict[str, ZwaveDiscoveryInfo] = {}
+        value_updates_disc_info: dict[str, PlatformZwaveDiscoveryInfo] = {}
 
         # run discovery on all node values and create/update entities
         await asyncio.gather(
@@ -858,8 +854,8 @@ class NodeEvents:
     async def async_handle_discovery_info(
         self,
         device: dr.DeviceEntry,
-        disc_info: ZwaveDiscoveryInfo,
-        value_updates_disc_info: dict[str, ZwaveDiscoveryInfo],
+        disc_info: PlatformZwaveDiscoveryInfo,
+        value_updates_disc_info: dict[str, PlatformZwaveDiscoveryInfo],
     ) -> None:
         """Handle discovery info and all dependent tasks."""
         platform = disc_info.platform
@@ -901,7 +897,9 @@ class NodeEvents:
         )
 
     async def async_on_value_added(
-        self, value_updates_disc_info: dict[str, ZwaveDiscoveryInfo], value: Value
+        self,
+        value_updates_disc_info: dict[str, PlatformZwaveDiscoveryInfo],
+        value: Value,
     ) -> None:
         """Fire value updated event."""
         # If node isn't ready or a device for this node doesn't already exist, we can
@@ -1036,7 +1034,9 @@ class NodeEvents:
 
     @callback
     def async_on_value_updated_fire_event(
-        self, value_updates_disc_info: dict[str, ZwaveDiscoveryInfo], value: Value
+        self,
+        value_updates_disc_info: dict[str, PlatformZwaveDiscoveryInfo],
+        value: Value,
     ) -> None:
         """Fire value updated event."""
         # Get the discovery info for the value that was updated. If there is

homeassistant/components/zwave_js/binary_sensor.py

@@ -2,12 +2,16 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
+from typing import TYPE_CHECKING, cast
 
 from zwave_js_server.const import CommandClass
 from zwave_js_server.const.command_class.lock import DOOR_STATUS_PROPERTY
 from zwave_js_server.const.command_class.notification import (
     CC_SPECIFIC_NOTIFICATION_TYPE,
+    NotificationEvent,
+    NotificationType,
+    SmokeAlarmNotificationEvent,
 )
 from zwave_js_server.model.driver import Driver
 
@@ -17,15 +21,21 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.const import EntityCategory
+from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import DOMAIN
-from .discovery import ZwaveDiscoveryInfo
-from .entity import ZWaveBaseEntity
-from .models import ZwaveJSConfigEntry
+from .entity import NewZwaveDiscoveryInfo, ZWaveBaseEntity
+from .models import (
+    NewZWaveDiscoverySchema,
+    ValueType,
+    ZwaveDiscoveryInfo,
+    ZwaveJSConfigEntry,
+    ZWaveValueDiscoverySchema,
+)
 
 PARALLEL_UPDATES = 0
 
@@ -50,12 +60,12 @@ NOTIFICATION_IRRIGATION = "17"
 NOTIFICATION_GAS = "18"
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class NotificationZWaveJSEntityDescription(BinarySensorEntityDescription):
     """Represent a Z-Wave JS binary sensor entity description."""
 
-    off_state: str = "0"
-    states: tuple[str, ...] | None = None
+    not_states: set[NotificationEvent | int] = field(default_factory=lambda: {0})
+    states: set[NotificationEvent | int] | None = None
 
 
 @dataclass(frozen=True, kw_only=True)
@@ -65,6 +75,13 @@ class PropertyZWaveJSEntityDescription(BinarySensorEntityDescription):
     on_states: tuple[str, ...]
 
 
+@dataclass(frozen=True, kw_only=True)
+class NewNotificationZWaveJSEntityDescription(BinarySensorEntityDescription):
+    """Represent a Z-Wave JS binary sensor entity description."""
+
+    state_key: str
+
+
 # Mappings for Notification sensors
 # https://github.com/zwave-js/specs/blob/master/Registries/Notification%20Command%20Class%2C%20list%20of%20assigned%20Notifications.xlsx
 #
@@ -105,35 +122,24 @@ class PropertyZWaveJSEntityDescription(BinarySensorEntityDescription):
 # - Replace water filter
 # - Sump pump failure
 
+
+# This set can be removed once all notification sensors have been migrated
+# to use the new discovery schema and we've removed the old discovery code.
+MIGRATED_NOTIFICATION_TYPES = {
+    NotificationType.SMOKE_ALARM,
+}
+
 NOTIFICATION_SENSOR_MAPPINGS: tuple[NotificationZWaveJSEntityDescription, ...] = (
-    NotificationZWaveJSEntityDescription(
-        # NotificationType 1: Smoke Alarm - State Id's 1 and 2 - Smoke detected
-        key=NOTIFICATION_SMOKE_ALARM,
-        states=("1", "2"),
-        device_class=BinarySensorDeviceClass.SMOKE,
-    ),
-    NotificationZWaveJSEntityDescription(
-        # NotificationType 1: Smoke Alarm - State Id's 4, 5, 7, 8
-        key=NOTIFICATION_SMOKE_ALARM,
-        states=("4", "5", "7", "8"),
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    NotificationZWaveJSEntityDescription(
-        # NotificationType 1: Smoke Alarm - All other State Id's
-        key=NOTIFICATION_SMOKE_ALARM,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 2: Carbon Monoxide - State Id's 1 and 2
         key=NOTIFICATION_CARBON_MONOOXIDE,
-        states=("1", "2"),
+        states={1, 2},
         device_class=BinarySensorDeviceClass.CO,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 2: Carbon Monoxide - State Id 4, 5, 7
         key=NOTIFICATION_CARBON_MONOOXIDE,
-        states=("4", "5", "7"),
+        states={4, 5, 7},
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -145,13 +151,13 @@ NOTIFICATION_SENSOR_MAPPINGS: tuple[NotificationZWaveJSEntityDescription, ...] =
     NotificationZWaveJSEntityDescription(
         # NotificationType 3: Carbon Dioxide - State Id's 1 and 2
         key=NOTIFICATION_CARBON_DIOXIDE,
-        states=("1", "2"),
+        states={1, 2},
         device_class=BinarySensorDeviceClass.GAS,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 3: Carbon Dioxide - State Id's 4, 5, 7
         key=NOTIFICATION_CARBON_DIOXIDE,
-        states=("4", "5", "7"),
+        states={4, 5, 7},
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -163,13 +169,13 @@ NOTIFICATION_SENSOR_MAPPINGS: tuple[NotificationZWaveJSEntityDescription, ...] =
     NotificationZWaveJSEntityDescription(
         # NotificationType 4: Heat - State Id's 1, 2, 5, 6 (heat/underheat)
         key=NOTIFICATION_HEAT,
-        states=("1", "2", "5", "6"),
+        states={1, 2, 5, 6},
         device_class=BinarySensorDeviceClass.HEAT,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 4: Heat - State ID's 8, A, B
         key=NOTIFICATION_HEAT,
-        states=("8", "10", "11"),
+        states={8, 10, 11},
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -181,13 +187,13 @@ NOTIFICATION_SENSOR_MAPPINGS: tuple[NotificationZWaveJSEntityDescription, ...] =
     NotificationZWaveJSEntityDescription(
         # NotificationType 5: Water - State Id's 1, 2, 3, 4, 6, 7, 8, 9, 0A
         key=NOTIFICATION_WATER,
-        states=("1", "2", "3", "4", "6", "7", "8", "9", "10"),
+        states={1, 2, 3, 4, 6, 7, 8, 9, 10},
         device_class=BinarySensorDeviceClass.MOISTURE,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 5: Water - State Id's B
         key=NOTIFICATION_WATER,
-        states=("11",),
+        states={11},
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -199,54 +205,54 @@ NOTIFICATION_SENSOR_MAPPINGS: tuple[NotificationZWaveJSEntityDescription, ...] =
     NotificationZWaveJSEntityDescription(
         # NotificationType 6: Access Control - State Id's 1, 2, 3, 4 (Lock)
         key=NOTIFICATION_ACCESS_CONTROL,
-        states=("1", "2", "3", "4"),
+        states={1, 2, 3, 4},
         device_class=BinarySensorDeviceClass.LOCK,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 6: Access Control - State Id's 11 (Lock jammed)
         key=NOTIFICATION_ACCESS_CONTROL,
-        states=("11",),
+        states={11},
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 6: Access Control - State Id 22 (door/window open)
         key=NOTIFICATION_ACCESS_CONTROL,
-        off_state="23",
-        states=("22", "23"),
+        not_states={23},
+        states={22},
         device_class=BinarySensorDeviceClass.DOOR,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 7: Home Security - State Id's 1, 2 (intrusion)
         key=NOTIFICATION_HOME_SECURITY,
-        states=("1", "2"),
+        states={1, 2},
         device_class=BinarySensorDeviceClass.SAFETY,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 7: Home Security - State Id's 3, 4, 9 (tampering)
         key=NOTIFICATION_HOME_SECURITY,
-        states=("3", "4", "9"),
+        states={3, 4, 9},
         device_class=BinarySensorDeviceClass.TAMPER,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 7: Home Security - State Id's 5, 6 (glass breakage)
         key=NOTIFICATION_HOME_SECURITY,
-        states=("5", "6"),
+        states={5, 6},
         device_class=BinarySensorDeviceClass.SAFETY,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 7: Home Security - State Id's 7, 8 (motion)
         key=NOTIFICATION_HOME_SECURITY,
-        states=("7", "8"),
+        states={7, 8},
         device_class=BinarySensorDeviceClass.MOTION,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 8: Power Management -
         # State Id's 2, 3 (Mains status)
         key=NOTIFICATION_POWER_MANAGEMENT,
-        off_state="2",
-        states=("2", "3"),
+        not_states={2},
+        states={3},
         device_class=BinarySensorDeviceClass.PLUG,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -254,7 +260,7 @@ NOTIFICATION_SENSOR_MAPPINGS: tuple[NotificationZWaveJSEntityDescription, ...] =
         # NotificationType 8: Power Management -
         # State Id's 6, 7, 8, 9 (power status)
         key=NOTIFICATION_POWER_MANAGEMENT,
-        states=("6", "7", "8", "9"),
+        states={6, 7, 8, 9},
         device_class=BinarySensorDeviceClass.SAFETY,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -262,39 +268,39 @@ NOTIFICATION_SENSOR_MAPPINGS: tuple[NotificationZWaveJSEntityDescription, ...] =
         # NotificationType 8: Power Management -
         # State Id's 10, 11, 17 (Battery maintenance status)
         key=NOTIFICATION_POWER_MANAGEMENT,
-        states=("10", "11", "17"),
+        states={10, 11, 17},
         device_class=BinarySensorDeviceClass.BATTERY,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 9: System - State Id's 1, 2, 3, 4, 6, 7
         key=NOTIFICATION_SYSTEM,
-        states=("1", "2", "3", "4", "6", "7"),
+        states={1, 2, 3, 4, 6, 7},
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 10: Emergency - State Id's 1, 2, 3
         key=NOTIFICATION_EMERGENCY,
-        states=("1", "2", "3"),
+        states={1, 2, 3},
         device_class=BinarySensorDeviceClass.PROBLEM,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 14: Siren
         key=NOTIFICATION_SIREN,
-        states=("1",),
+        states={1},
         device_class=BinarySensorDeviceClass.SOUND,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 18: Gas - State Id's 1, 2, 3, 4
         key=NOTIFICATION_GAS,
-        states=("1", "2", "3", "4"),
+        states={1, 2, 3, 4},
         device_class=BinarySensorDeviceClass.GAS,
     ),
     NotificationZWaveJSEntityDescription(
         # NotificationType 18: Gas - State Id 6
         key=NOTIFICATION_GAS,
-        states=("6",),
+        states={6},
         device_class=BinarySensorDeviceClass.PROBLEM,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
@@ -353,7 +359,7 @@ BOOLEAN_SENSOR_MAPPINGS: dict[tuple[int, int | str], BinarySensorEntityDescripti
 
 @callback
 def is_valid_notification_binary_sensor(
-    info: ZwaveDiscoveryInfo,
+    info: ZwaveDiscoveryInfo | NewZwaveDiscoveryInfo,
 ) -> bool | NotificationZWaveJSEntityDescription:
     """Return if the notification CC Value is valid as binary sensor."""
     if not info.primary_value.metadata.states:
@@ -370,18 +376,49 @@ async def async_setup_entry(
     client = config_entry.runtime_data.client
 
     @callback
-    def async_add_binary_sensor(info: ZwaveDiscoveryInfo) -> None:
+    def async_add_binary_sensor(
+        info: ZwaveDiscoveryInfo | NewZwaveDiscoveryInfo,
+    ) -> None:
         """Add Z-Wave Binary Sensor."""
         driver = client.driver
         assert driver is not None  # Driver is ready before platforms are loaded.
-        entities: list[BinarySensorEntity] = []
+        entities: list[Entity] = []
 
-        if info.platform_hint == "notification":
+        if (
+            isinstance(info, NewZwaveDiscoveryInfo)
+            and info.entity_class is ZWaveNotificationBinarySensor
+            and isinstance(
+                info.entity_description, NotificationZWaveJSEntityDescription
+            )
+            and is_valid_notification_binary_sensor(info)
+        ):
+            entities.extend(
+                ZWaveNotificationBinarySensor(
+                    config_entry, driver, info, state_key, info.entity_description
+                )
+                for state_key in info.primary_value.metadata.states
+                if int(state_key) not in info.entity_description.not_states
+                and (
+                    not info.entity_description.states
+                    or int(state_key) in info.entity_description.states
+                )
+            )
+        elif isinstance(info, NewZwaveDiscoveryInfo):
+            pass  # other entity classes are not migrated yet
+        elif info.platform_hint == "notification":
             # ensure the notification CC Value is valid as binary sensor
             if not is_valid_notification_binary_sensor(info):
                 return
+            if (
+                notification_type := info.primary_value.metadata.cc_specific[
+                    CC_SPECIFIC_NOTIFICATION_TYPE
+                ]
+            ) in MIGRATED_NOTIFICATION_TYPES:
+                return
             # Get all sensors from Notification CC states
             for state_key in info.primary_value.metadata.states:
+                if TYPE_CHECKING:
+                    state_key = cast(str, state_key)
                 # ignore idle key (0)
                 if state_key == "0":
                     continue
@@ -390,18 +427,15 @@ async def async_setup_entry(
                     NotificationZWaveJSEntityDescription | None
                 ) = None
                 for description in NOTIFICATION_SENSOR_MAPPINGS:
-                    if (
-                        int(description.key)
-                        == info.primary_value.metadata.cc_specific[
-                            CC_SPECIFIC_NOTIFICATION_TYPE
-                        ]
-                    ) and (not description.states or state_key in description.states):
+                    if (int(description.key) == notification_type) and (
+                        not description.states or int(state_key) in description.states
+                    ):
                         notification_description = description
                         break
 
                 if (
                     notification_description
-                    and notification_description.off_state == state_key
+                    and int(state_key) in notification_description.not_states
                 ):
                     continue
                 entities.append(
@@ -477,7 +511,7 @@ class ZWaveNotificationBinarySensor(ZWaveBaseEntity, BinarySensorEntity):
         self,
         config_entry: ZwaveJSConfigEntry,
         driver: Driver,
-        info: ZwaveDiscoveryInfo,
+        info: ZwaveDiscoveryInfo | NewZwaveDiscoveryInfo,
         state_key: str,
         description: NotificationZWaveJSEntityDescription | None = None,
     ) -> None:
@@ -543,3 +577,93 @@ class ZWaveConfigParameterBinarySensor(ZWaveBooleanBinarySensor):
             alternate_value_name=self.info.primary_value.property_name,
             additional_info=[property_key_name] if property_key_name else None,
         )
+
+
+DISCOVERY_SCHEMAS: list[NewZWaveDiscoverySchema] = [
+    NewZWaveDiscoverySchema(
+        platform=Platform.BINARY_SENSOR,
+        primary_value=ZWaveValueDiscoverySchema(
+            command_class={
+                CommandClass.NOTIFICATION,
+            },
+            type={ValueType.NUMBER},
+            any_available_states_keys={
+                SmokeAlarmNotificationEvent.SENSOR_STATUS_SMOKE_DETECTED_LOCATION_PROVIDED,
+                SmokeAlarmNotificationEvent.SENSOR_STATUS_SMOKE_DETECTED,
+            },
+            any_available_cc_specific={
+                (CC_SPECIFIC_NOTIFICATION_TYPE, NotificationType.SMOKE_ALARM)
+            },
+        ),
+        allow_multi=True,
+        entity_description=NotificationZWaveJSEntityDescription(
+            # NotificationType 1: Smoke Alarm - State Id's 1 and 2 - Smoke detected
+            key=NOTIFICATION_SMOKE_ALARM,
+            states={
+                SmokeAlarmNotificationEvent.SENSOR_STATUS_SMOKE_DETECTED_LOCATION_PROVIDED,
+                SmokeAlarmNotificationEvent.SENSOR_STATUS_SMOKE_DETECTED,
+            },
+            device_class=BinarySensorDeviceClass.SMOKE,
+        ),
+        entity_class=ZWaveNotificationBinarySensor,
+    ),
+    NewZWaveDiscoverySchema(
+        platform=Platform.BINARY_SENSOR,
+        primary_value=ZWaveValueDiscoverySchema(
+            command_class={
+                CommandClass.NOTIFICATION,
+            },
+            type={ValueType.NUMBER},
+            any_available_states_keys={
+                SmokeAlarmNotificationEvent.MAINTENANCE_STATUS_REPLACEMENT_REQUIRED,
+                SmokeAlarmNotificationEvent.MAINTENANCE_STATUS_REPLACEMENT_REQUIRED_END_OF_LIFE,
+                SmokeAlarmNotificationEvent.PERIODIC_INSPECTION_STATUS_MAINTENANCE_REQUIRED_PLANNED_PERIODIC_INSPECTION,
+                SmokeAlarmNotificationEvent.DUST_IN_DEVICE_STATUS_MAINTENANCE_REQUIRED_DUST_IN_DEVICE,
+            },
+            any_available_cc_specific={
+                (CC_SPECIFIC_NOTIFICATION_TYPE, NotificationType.SMOKE_ALARM)
+            },
+        ),
+        allow_multi=True,
+        entity_description=NotificationZWaveJSEntityDescription(
+            # NotificationType 1: Smoke Alarm - State Id's 4, 5, 7, 8
+            key=NOTIFICATION_SMOKE_ALARM,
+            states={
+                SmokeAlarmNotificationEvent.MAINTENANCE_STATUS_REPLACEMENT_REQUIRED,
+                SmokeAlarmNotificationEvent.MAINTENANCE_STATUS_REPLACEMENT_REQUIRED_END_OF_LIFE,
+                SmokeAlarmNotificationEvent.PERIODIC_INSPECTION_STATUS_MAINTENANCE_REQUIRED_PLANNED_PERIODIC_INSPECTION,
+                SmokeAlarmNotificationEvent.DUST_IN_DEVICE_STATUS_MAINTENANCE_REQUIRED_DUST_IN_DEVICE,
+            },
+            device_class=BinarySensorDeviceClass.PROBLEM,
+            entity_category=EntityCategory.DIAGNOSTIC,
+        ),
+        entity_class=ZWaveNotificationBinarySensor,
+    ),
+    NewZWaveDiscoverySchema(
+        platform=Platform.BINARY_SENSOR,
+        primary_value=ZWaveValueDiscoverySchema(
+            command_class={
+                CommandClass.NOTIFICATION,
+            },
+            type={ValueType.NUMBER},
+            any_available_cc_specific={
+                (CC_SPECIFIC_NOTIFICATION_TYPE, NotificationType.SMOKE_ALARM)
+            },
+        ),
+        allow_multi=True,
+        entity_description=NotificationZWaveJSEntityDescription(
+            # NotificationType 1: Smoke Alarm - All other State Id's
+            key=NOTIFICATION_SMOKE_ALARM,
+            entity_category=EntityCategory.DIAGNOSTIC,
+            not_states={
+                SmokeAlarmNotificationEvent.SENSOR_STATUS_SMOKE_DETECTED_LOCATION_PROVIDED,
+                SmokeAlarmNotificationEvent.SENSOR_STATUS_SMOKE_DETECTED,
+                SmokeAlarmNotificationEvent.MAINTENANCE_STATUS_REPLACEMENT_REQUIRED,
+                SmokeAlarmNotificationEvent.MAINTENANCE_STATUS_REPLACEMENT_REQUIRED_END_OF_LIFE,
+                SmokeAlarmNotificationEvent.PERIODIC_INSPECTION_STATUS_MAINTENANCE_REQUIRED_PLANNED_PERIODIC_INSPECTION,
+                SmokeAlarmNotificationEvent.DUST_IN_DEVICE_STATUS_MAINTENANCE_REQUIRED_DUST_IN_DEVICE,
+            },
+        ),
+        entity_class=ZWaveNotificationBinarySensor,
+    ),
+]