From b171675f11c48dfb494df3a458964bb9129e57bd Mon Sep 17 00:00:00 2001 From: "klaus.schauer" <> Date: Thu, 27 Dec 2018 17:16:15 +0000 Subject: [PATCH] 10_EnOcean: actuator.01: pilot wire mode response changed, smokeDetector.02: attributes signOfLife and signOfLifeInterval git-svn-id: https://svn.fhem.de/fhem/trunk@18069 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_EnOcean.pm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/10_EnOcean.pm b/fhem/FHEM/10_EnOcean.pm index a60e44310..62581c2e9 100755 --- a/fhem/FHEM/10_EnOcean.pm +++ b/fhem/FHEM/10_EnOcean.pm @@ -7116,9 +7116,11 @@ sub EnOcean_Parse($$) push @event, "3:$event:$msg"; $hash->{helper}{lastEvent} = $db[0]; } - RemoveInternalTimer($hash->{helper}{timer}{alarm}) if(exists $hash->{helper}{timer}{alarm}); - @{$hash->{helper}{timer}{alarm}} = ($hash, 'alarm', 'dead_sensor', 1, 5); - InternalTimer(gettimeofday() + 1440, 'EnOcean_readingsSingleUpdate', $hash->{helper}{timer}{alarm}, 0); + if (AttrVal($name, "signOfLife", 'on') eq 'on') { + RemoveInternalTimer($hash->{helper}{timer}{alarm}) if(exists $hash->{helper}{timer}{alarm}); + @{$hash->{helper}{timer}{alarm}} = ($hash, 'alarm', 'dead_sensor', 1, 5); + InternalTimer(gettimeofday() + AttrVal($name, "signOfLifeInterval", 1440), 'EnOcean_readingsSingleUpdate', $hash->{helper}{timer}{alarm}, 0); + } } elsif ($st eq "windSpeed.00") { # wind speed threshold detector @@ -10385,7 +10387,7 @@ sub EnOcean_Parse($$) } elsif ($cmd == 10) { # pilot wire mode response - my $roomCtrlMode = $db[0] & 3; + my $roomCtrlMode = $db[0] & 7; my %roomCtrlMode = ( 0 => "off", 1 => "comfort", @@ -19177,6 +19179,10 @@ EnOcean_Delete($$)