From c6c622797d74b3e2a09f2c199e586272c75c8532 Mon Sep 17 00:00:00 2001
From: Matrix <justin@yosmart.com>
Date: Fri, 11 Jul 2025 13:55:13 +0800
Subject: [PATCH] Add YoLink YS7A12 support (#148588)

---
 homeassistant/components/yolink/binary_sensor.py | 8 ++++++--
 homeassistant/components/yolink/sensor.py        | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/yolink/binary_sensor.py b/homeassistant/components/yolink/binary_sensor.py
index 7f965650354..d57e942734e 100644
--- a/homeassistant/components/yolink/binary_sensor.py
+++ b/homeassistant/components/yolink/binary_sensor.py
@@ -12,6 +12,7 @@ from yolink.const import (
     ATTR_DEVICE_LEAK_SENSOR,
     ATTR_DEVICE_MOTION_SENSOR,
     ATTR_DEVICE_MULTI_WATER_METER_CONTROLLER,
+    ATTR_DEVICE_SMOKE_ALARM,
     ATTR_DEVICE_VIBRATION_SENSOR,
     ATTR_DEVICE_WATER_METER_CONTROLLER,
 )
@@ -53,6 +54,7 @@ SENSOR_DEVICE_TYPE = [
     ATTR_DEVICE_CO_SMOKE_SENSOR,
     ATTR_DEVICE_WATER_METER_CONTROLLER,
     ATTR_DEVICE_MULTI_WATER_METER_CONTROLLER,
+    ATTR_DEVICE_SMOKE_ALARM,
 ]
 
 
@@ -90,8 +92,10 @@ SENSOR_TYPES: tuple[YoLinkBinarySensorEntityDescription, ...] = (
     YoLinkBinarySensorEntityDescription(
         key="smoke_detected",
         device_class=BinarySensorDeviceClass.SMOKE,
-        value=lambda state: state.get("smokeAlarm"),
-        exists_fn=lambda device: device.device_type == ATTR_DEVICE_CO_SMOKE_SENSOR,
+        value=lambda state: state.get("smokeAlarm") is True
+        or state.get("denseSmokeAlarm") is True,
+        exists_fn=lambda device: device.device_type
+        in [ATTR_DEVICE_CO_SMOKE_SENSOR, ATTR_DEVICE_SMOKE_ALARM],
     ),
     YoLinkBinarySensorEntityDescription(
         key="pipe_leak_detected",
diff --git a/homeassistant/components/yolink/sensor.py b/homeassistant/components/yolink/sensor.py
index 2845f8ee533..37cd763194d 100644
--- a/homeassistant/components/yolink/sensor.py
+++ b/homeassistant/components/yolink/sensor.py
@@ -21,6 +21,7 @@ from yolink.const import (
     ATTR_DEVICE_POWER_FAILURE_ALARM,
     ATTR_DEVICE_SIREN,
     ATTR_DEVICE_SMART_REMOTER,
+    ATTR_DEVICE_SMOKE_ALARM,
     ATTR_DEVICE_SOIL_TH_SENSOR,
     ATTR_DEVICE_SWITCH,
     ATTR_DEVICE_TH_SENSOR,
@@ -106,6 +107,7 @@ SENSOR_DEVICE_TYPE = [
     ATTR_DEVICE_CO_SMOKE_SENSOR,
     ATTR_GARAGE_DOOR_CONTROLLER,
     ATTR_DEVICE_SOIL_TH_SENSOR,
+    ATTR_DEVICE_SMOKE_ALARM,
 ]
 
 BATTERY_POWER_SENSOR = [
@@ -126,12 +128,14 @@ BATTERY_POWER_SENSOR = [
     ATTR_DEVICE_WATER_METER_CONTROLLER,
     ATTR_DEVICE_MULTI_WATER_METER_CONTROLLER,
     ATTR_DEVICE_SOIL_TH_SENSOR,
+    ATTR_DEVICE_SMOKE_ALARM,
 ]
 
 MCU_DEV_TEMPERATURE_SENSOR = [
     ATTR_DEVICE_LEAK_SENSOR,
     ATTR_DEVICE_MOTION_SENSOR,
     ATTR_DEVICE_CO_SMOKE_SENSOR,
+    ATTR_DEVICE_SMOKE_ALARM,
 ]
 
 NONE_HUMIDITY_SENSOR_MODELS = [