FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

10_EnOcean: profile smokeDetector.02 (EEP F6-05-02) changed, profile environmentApp (EEP A5-13-03) corrected, commandref: further explanations added

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17248 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
klaus.schauer 2018-09-01 16:22:51 +00:00
parent bfe09190b3
commit 07a09c2947
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/10_EnOcean.pm
View File

@ -7085,7 +7085,7 @@ sub EnOcean_Parse($$)
}
@{$hash->{helper}{alarmTimer}} = ($hash, 'alarm', 'dead_sensor', 1, 5);
RemoveInternalTimer($hash->{helper}{alarmTimer});
InternalTimer(gettimeofday() + 1320, 'EnOcean_readingsSingleUpdate', $hash->{helper}{alarmTimer}, 0);
InternalTimer(gettimeofday() + 1440, 'EnOcean_readingsSingleUpdate', $hash->{helper}{alarmTimer}, 0);
} elsif ($st eq "windSpeed.00") {
# wind speed threshold detector
@ -9493,13 +9493,13 @@ sub EnOcean_Parse($$)
} elsif ($identifier == 4) {
# Time und Day exchange (EEP A5-13-04)
my @day = ('', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday');
my $day = ($db[3] & 0xF0) >> 4;
my $day = $db[3] >> 5;
push @event, "3:weekday:" . $day[$day];
if ($db[0] & 4) {
# 12 h time format
push @event, "3:time:" . ($db[3] & 0x0F) . ':' . $db[2] . ':' . $db[1] . ' ' . ($db[1] & 2 ? 'PM' : 'AM');
push @event, "3:time:" . ($db[3] & 0x1F) . ':' . $db[2] . ':' . $db[1] . ' ' . ($db[1] & 2 ? 'PM' : 'AM');
} else {
push @event, "3:time:" . ($db[3] & 0x0F) . ':' . $db[2] . ':' . $db[1];
push @event, "3:time:" . ($db[3] & 0x1F) . ':' . $db[2] . ':' . $db[1];
}
push @event, "3:timeSource:" . ($db[0] & 1 ? 'GPS' : 'RTC');