From d9385fdb67c39a3d8e264186bb52f5f28409c106 Mon Sep 17 00:00:00 2001
From: Patrick Pichon <patrick@pichon.me>
Date: Thu, 19 Oct 2023 19:50:16 +0200
Subject: [PATCH] handle correctly Alarm1 and Alarm2 on IAS Cluster 0500

---
 Modules/readClusters.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/Modules/readClusters.py b/Modules/readClusters.py
index 94f9f8837..af512a893 100644
--- a/Modules/readClusters.py
+++ b/Modules/readClusters.py
@@ -1614,22 +1614,24 @@ def Cluster0500(self, Devices, MsgSQN, MsgSrcAddr, MsgSrcEp, MsgClusterId, MsgAt
                 self.ListOfDevices[MsgSrcAddr]["IAS"][MsgSrcEp]["ZoneStatus"]["doorbell"] = doorbell
 
             self.ListOfDevices[MsgSrcAddr]["IAS"][MsgSrcEp]["ZoneStatus"]["GlobalInfos"] = "%s;%s;%s;%s;%s;%s;%s;%s;%s;%s;%s" % (
-                alarm1,
-                alarm2,
-                tamper,
-                batter,
-                srepor,
-                rrepor,
-                troubl,
-                acmain,
-                test,
-                batdef,
-                doorbell
-            )
+                alarm1, alarm2, tamper, batter, srepor, rrepor, troubl, acmain, test, batdef, doorbell )
+            
             self.ListOfDevices[MsgSrcAddr]["IAS"][MsgSrcEp]["ZoneStatus"]["TimeStamp"] = int(time())
-            if "Model" in self.ListOfDevices[MsgSrcAddr] and self.ListOfDevices[MsgSrcAddr]["Model"] in ("RC-EF-3.0", "RC-EM"):   # alarm1 or alarm2 not used on thoses devices
+            model = self.ListOfDevices[MsgSrcAddr].get("Model", "")
+            if model in ("RC-EF-3.0", "RC-EM"):   # alarm1 or alarm2 not used on thoses devices
                 return
-            MajDomoDevice(self, Devices, MsgSrcAddr, MsgSrcEp, MsgClusterId, "%02d" % (alarm1 or alarm2 or doorbell))
+            
+            ias_alarm1_2_merged = get_deviceconf_parameter_value( self, model, "IASAlarmMerge", return_default=None )
+            self.log.logging( "Input", "Debug", "IASAlarmMerge = %s" % (ias_alarm1_2_merged))
+
+            if ias_alarm1_2_merged:
+                self.log.logging( "Input", "Debug", "IASAlarmMerge alarm1 %s alarm2 %s" % (alarm1, alarm2))
+                combined_alarm = ( alarm2 << 1 ) | alarm1
+                self.log.logging( "Input", "Debug", "IASAlarmMerge combined value = %02d" % (combined_alarm))
+            else:
+                combined_alarm = alarm1 or alarm2 or doorbell
+
+            MajDomoDevice(self, Devices, MsgSrcAddr, MsgSrcEp, MsgClusterId, "%02d" % (combined_alarm))
 
             if batter:
                 # Battery Warning