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

22_HOMEMODE: v1.4.6 - fix zero devider in HOMEMODE_ContactOpenCheck, fix trigger alarm only if alarm triggers have changed

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18413 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe 2019-01-25 17:59:24 +00:00
parent 85f4aa91b8
commit 4871ffb5c2
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/22_HOMEMODE.pm
View File

@ -16,7 +16,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use vars qw{%attr %defs %modules $FW_CSRF}; use vars qw{%attr %defs %modules $FW_CSRF};
my $HOMEMODE_version = "1.4.5"; my $HOMEMODE_version = "1.4.6";
my $HOMEMODE_Daytimes = "05:00|morning 10:00|day 14:00|afternoon 18:00|evening 23:00|night"; my $HOMEMODE_Daytimes = "05:00|morning 10:00|day 14:00|afternoon 18:00|evening 23:00|night";
my $HOMEMODE_Seasons = "03.01|spring 06.01|summer 09.01|autumn 12.01|winter"; my $HOMEMODE_Seasons = "03.01|spring 06.01|summer 09.01|autumn 12.01|winter";
my $HOMEMODE_UserModes = "gotosleep,awoken,asleep"; my $HOMEMODE_UserModes = "gotosleep,awoken,asleep";
@ -2677,6 +2677,7 @@ sub HOMEMODE_TriggerState($;$$$)
my $contacts = $hash->{SENSORSCONTACT}; my $contacts = $hash->{SENSORSCONTACT};
my $motions = $hash->{SENSORSMOTION}; my $motions = $hash->{SENSORSMOTION};
my $tampered = ReadingsVal($name,"sensorsTampered",""); my $tampered = ReadingsVal($name,"sensorsTampered","");
my $alarm = ReadingsVal($name,"alarmTriggered","");
my @contactsOpen; my @contactsOpen;
my @sensorsTampered; my @sensorsTampered;
my @doorsOOpen; my @doorsOOpen;
@ -2790,7 +2791,7 @@ sub HOMEMODE_TriggerState($;$$$)
} }
} }
} }
HOMEMODE_alarmTriggered($hash,@alarmSensors); HOMEMODE_alarmTriggered($hash,@alarmSensors) if (join(",",@alarmSensors) ne $alarm);
my $open = @contactsOpen ? join(",",@contactsOpen) : ""; my $open = @contactsOpen ? join(",",@contactsOpen) : "";
my $opendo = @doorsOOpen ? join(",",@doorsOOpen) : ""; my $opendo = @doorsOOpen ? join(",",@doorsOOpen) : "";
my $opendm = @doorsMOpen ? join(",",@doorsMOpen) : ""; my $opendm = @doorsMOpen ? join(",",@doorsMOpen) : "";
@ -2919,11 +2920,9 @@ sub HOMEMODE_ContactOpenCheck($$;$$)
$divider = $divs[$count] if ($season eq $text); $divider = $divs[$count] if ($season eq $text);
$count++; $count++;
} }
if ($divider) return if ($divider == 0);
{ $waittime = $waittime / $divider;
$waittime = $waittime / $divider; $waittime = sprintf("%.2f",$waittime) * 1;
$waittime = sprintf("%.2f",$waittime) * 1;
}
} }
$waittime = $mintime if ($mintime && $waittime < $mintime); $waittime = $mintime if ($mintime && $waittime < $mintime);
$retrigger++; $retrigger++;