Aotec zigbee button (#1658)

* do not overwrite the Attribute when calling is_cluster_specific_config
* conf file to Certified DB ( zigbeefordomoticz/z4d-certified-devices@604a910 )

Modules/input.py

@@ -3489,7 +3489,16 @@ def Decode8401(self, Devices, MsgData, MsgLQI):  # Reception Zone status change
     motion_via_IAS_alarm = get_device_config_param( self, MsgSrcAddr, "MotionViaIASAlarm1")
     self.log.logging( "Input", "Debug", "MotionViaIASAlarm1 = %s" % (motion_via_IAS_alarm))
 
-    if motion_via_IAS_alarm is not None and motion_via_IAS_alarm == 1:
+    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))
+        MajDomoDevice(self, Devices, MsgSrcAddr, MsgEp, "0006", "%02d" % combined_alarm)
+
+    elif motion_via_IAS_alarm is not None and motion_via_IAS_alarm == 1:
         self.log.logging( "Input", "Debug", "Motion detected sending to MajDomo %s/%s %s" % (
             MsgSrcAddr, MsgEp, (alarm1 or alarm2)))    
         MajDomoDevice(self, Devices, MsgSrcAddr, MsgEp, "0406", "%02d" % (alarm1 or alarm2))

Modules/readZclClusters.py

@@ -311,7 +311,7 @@ def is_cluster_zcl_config_available( self, nwkid, ep, cluster, attribute=None):
     if is_manufacturer_specific_cluster( self, cluster):
         return True
 
-    if is_cluster_specific_config(self, _get_model_name( self, nwkid), ep, cluster, attribute=None):
+    if is_cluster_specific_config(self, _get_model_name( self, nwkid), ep, cluster, attribute):
         return True
 
     return is_generic_zcl_cluster( self, cluster, attribute)