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

PRESENCE: fixing present-check-interval to be equal like regular check-interval if it's not set

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4824 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2014-02-06 19:33:24 +00:00
parent 98720cb6a1
commit aada9bb24f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,6 +1,8 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- SVN - SVN
- bugfix: PRESENCE: fix present-check-interval to be equal with normal
check-interval if not set in define statement and not 30 sec.
- feature: DASHBOARD: Tabs can show an icon. - feature: DASHBOARD: Tabs can show an icon.
- bugfix: DASHBOARD: dashboard_showfullsize only in DashboardRoom. - bugfix: DASHBOARD: dashboard_showfullsize only in DashboardRoom.
Fix showhelper Bug on lock/unlock. The error that after a trigger Fix showhelper Bug on lock/unlock. The error that after a trigger

10
fhem/FHEM/73_PRESENCE.pm
View File

@ -78,7 +78,7 @@ PRESENCE_Define($$)
$hash->{MODE} = "local-bluetooth"; $hash->{MODE} = "local-bluetooth";
$hash->{ADDRESS} = $a[3]; $hash->{ADDRESS} = $a[3];
$hash->{TIMEOUT_NORMAL} = (defined($a[4]) ? $a[4] : 30); $hash->{TIMEOUT_NORMAL} = (defined($a[4]) ? $a[4] : 30);
$hash->{TIMEOUT_PRESENT} = (defined($a[5]) ? $a[5] : 30); $hash->{TIMEOUT_PRESENT} = (defined($a[5]) ? $a[5] : $hash->{TIMEOUT_NORMAL});
} }
elsif($a[2] eq "fritzbox") elsif($a[2] eq "fritzbox")
@ -101,7 +101,7 @@ PRESENCE_Define($$)
$hash->{MODE} = "fritzbox"; $hash->{MODE} = "fritzbox";
$hash->{ADDRESS} = $a[3]; $hash->{ADDRESS} = $a[3];
$hash->{TIMEOUT_NORMAL} = (defined($a[4]) ? $a[4] : 30); $hash->{TIMEOUT_NORMAL} = (defined($a[4]) ? $a[4] : 30);
$hash->{TIMEOUT_PRESENT} = (defined($a[5]) ? $a[5] : 30); $hash->{TIMEOUT_PRESENT} = (defined($a[5]) ? $a[5] : $hash->{TIMEOUT_NORMAL});
} }
elsif($a[2] eq "lan-ping") elsif($a[2] eq "lan-ping")
@ -116,7 +116,7 @@ PRESENCE_Define($$)
$hash->{MODE} = "lan-ping"; $hash->{MODE} = "lan-ping";
$hash->{ADDRESS} = $a[3]; $hash->{ADDRESS} = $a[3];
$hash->{TIMEOUT_NORMAL} = (defined($a[4]) ? $a[4] : 30); $hash->{TIMEOUT_NORMAL} = (defined($a[4]) ? $a[4] : 30);
$hash->{TIMEOUT_PRESENT} = (defined($a[5]) ? $a[5] : 30); $hash->{TIMEOUT_PRESENT} = (defined($a[5]) ? $a[5] : $hash->{TIMEOUT_NORMAL});
} }
elsif($a[2] =~ /(shellscript|function)/) elsif($a[2] =~ /(shellscript|function)/)
@ -127,7 +127,7 @@ PRESENCE_Define($$)
$hash->{MODE} = $2; $hash->{MODE} = $2;
$hash->{helper}{call} = $3; $hash->{helper}{call} = $3;
$hash->{TIMEOUT_NORMAL} = ($4 ne "" ? $4 : 30); $hash->{TIMEOUT_NORMAL} = ($4 ne "" ? $4 : 30);
$hash->{TIMEOUT_PRESENT} = ($5 ne "" ? $5 : 30); $hash->{TIMEOUT_PRESENT} = ($5 ne "" ? $5 : $hash->{TIMEOUT_NORMAL});
if($hash->{helper}{call} =~ /\|/) if($hash->{helper}{call} =~ /\|/)
{ {
@ -160,7 +160,7 @@ PRESENCE_Define($$)
$hash->{MODE} = "lan-bluetooth"; $hash->{MODE} = "lan-bluetooth";
$hash->{ADDRESS} = $a[3]; $hash->{ADDRESS} = $a[3];
$hash->{TIMEOUT_NORMAL} = (defined($a[5]) ? $a[5] : 30); $hash->{TIMEOUT_NORMAL} = (defined($a[5]) ? $a[5] : 30);
$hash->{TIMEOUT_PRESENT} = (defined($a[6]) ? $a[6] : 30); $hash->{TIMEOUT_PRESENT} = (defined($a[6]) ? $a[6] : $hash->{TIMEOUT_NORMAL});
$dev = $a[4]; $dev = $a[4];
$dev .= ":5222" if($dev !~ m/:/ && $dev ne "none" && $dev !~ m/\@/); $dev .= ":5222" if($dev !~ m/:/ && $dev ne "none" && $dev !~ m/\@/);