diff --git a/Conf/Local-Devices/aeotec-button.json b/Conf/Local-Devices/aeotec-button.json index 300c28b02..14bf06194 100644 --- a/Conf/Local-Devices/aeotec-button.json +++ b/Conf/Local-Devices/aeotec-button.json @@ -9,11 +9,7 @@ "Ep":{ "01": { "0000": "", - "0001": { "Attributes": { - "0041": { - "Name": "Power 0041", - "DataType": "20", - "ActionList": [ "check_store_value" ] }}}, + "0001": { "Attributes": { "0041": { "Name": "Power 0041", "DataType": "20", "ActionList": [ "check_store_value" ] }}}, "0003": "", "0020": "", "0402": "", diff --git a/Modules/input.py b/Modules/input.py index d026011d8..130563082 100644 --- a/Modules/input.py +++ b/Modules/input.py @@ -3490,8 +3490,12 @@ def Decode8401(self, Devices, MsgData, MsgLQI): # Reception Zone status change self.log.logging( "Input", "Debug", "MotionViaIASAlarm1 = %s" % (motion_via_IAS_alarm)) ias_alarm1_2_merged = get_device_config_param( self, MsgSrcAddr, "IASAlarmMerge") + 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 = ( alarm1 << 1 ) | alarm2 + 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: