FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 07:56:03 +00:00
Code Issues Releases Wiki Activity

10_EnOcean: windSpeed.00 and smokeDetector.02 changed

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13812 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klaus.schauer 2017-03-27 04:39:32 +00:00
parent d4bfcb6119
commit b75f627a54
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/10_EnOcean.pm
View File

@ -1,6 +1,5 @@
############################################## ##############################################
# $Id$ # $Id$
package main; package main;
use strict; use strict;
@ -3069,8 +3068,8 @@ sub EnOcean_Set($@)
return "Usage: $cmd [learn]" if ($a[1] ne "learn"); return "Usage: $cmd [learn]" if ($a[1] ne "learn");
if ($a[1] eq "learn") { if ($a[1] eq "learn") {
$cmd = 'off'; $cmd = 'off';
$setCmd = $setCmd | 0x24; $setCmd = $setCmd | 0x28;
readingsSingleUpdate($hash, "block", "lock", 1); readingsSingleUpdate($hash, "block", "unlock", 1);
} }
shift(@a); shift(@a);
} }
@ -7032,11 +7031,11 @@ sub EnOcean_Parse($$)
if ($st eq "FRW" || $st eq "smokeDetector.02") { if ($st eq "FRW" || $st eq "smokeDetector.02") {
# smoke detector # smoke detector
if (!exists($hash->{helper}{lastEvent}) || $hash->{helper}{lastEvent} != $db[0] || AttrVal($name, 'alarm', '') eq 'dead_sensor') { if (!exists($hash->{helper}{lastEvent}) || $hash->{helper}{lastEvent} != $db[0] || ReadingsVal($name, 'alarm', '') eq 'dead_sensor') {
if ($db[0] == 0x30) { if ($db[0] == 0x30) {
push @event, "3:alarm:off"; push @event, "3:alarm:off";
push @event, "3:battery:low"; push @event, "3:battery:low";
$msg = AttrVal($name, 'state', 'off'); $msg = ReadingsVal($name, 'state', 'off');
} elsif ($db[0] == 0x10) { } elsif ($db[0] == 0x10) {
push @event, "3:battery:ok"; push @event, "3:battery:ok";
push @event, "3:alarm:smoke-alarm"; push @event, "3:alarm:smoke-alarm";
@ -7055,11 +7054,11 @@ sub EnOcean_Parse($$)
} elsif ($st eq "windSpeed.00") { } elsif ($st eq "windSpeed.00") {
# wind speed threshold detector # wind speed threshold detector
if (!exists($hash->{helper}{lastEvent}) || $hash->{helper}{lastEvent} != $db[0] || AttrVal($name, 'alarm', '') eq 'dead_sensor') { if (!exists($hash->{helper}{lastEvent}) || $hash->{helper}{lastEvent} != $db[0] || ReadingsVal($name, 'alarm', '') eq 'dead_sensor') {
push @event, "3:alarm:off"; push @event, "3:alarm:off";
if ($db[0] == 0x30) { if ($db[0] == 0x30) {
push @event, "3:battery:low"; push @event, "3:battery:low";
$msg = AttrVal($name, 'state', 'off'); $msg = ReadingsVal($name, 'state', 'off');
} elsif ($db[0] == 0x10) { } elsif ($db[0] == 0x10) {
push @event, "3:windSpeed:on"; push @event, "3:windSpeed:on";
push @event, "3:battery:ok"; push @event, "3:battery:ok";