mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reducing of generated events

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2025 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
dennis1980
2012-10-27 10:51:02 +00:00
parent 3744c5d405
commit 696df905cd
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
contrib/DeviceMonitor/98_DeviceMonitor.pm
View File

@@ -40,7 +40,7 @@ sub DeviceMonitor_Notify($$)
# Purpose: Checks for timeout - Notify reacts on triggers fired from the Device # Purpose: Checks for timeout - Notify reacts on triggers fired from the Device
# Author : Dennis Gnoyke # Author : Dennis Gnoyke
# Date : 21.10.2012 # Date : 21.10.2012
# Changes: 27.10.2012 GN Code optimized # Changes: 27.10.2012 GN Code optimized, Events reduced
# Remarks: EXPERIMENTAL VERSION !!!!!!! # Remarks: EXPERIMENTAL VERSION !!!!!!!
# #
#**************************** Begin of Code ************************************* #**************************** Begin of Code *************************************
@@ -49,7 +49,8 @@ sub DeviceMonitor_Notify($$)
my $ownName = $ownhash->{NAME} ; #Name of DeviceMonitor my $ownName = $ownhash->{NAME} ; #Name of DeviceMonitor
my $enabled = $ownhash->{ENABLED}; #DeviceMonitor enabled ? my $enabled = $ownhash->{ENABLED}; #DeviceMonitor enabled ?
my $timeoutinterval = 0; my $timeoutinterval = 0;
my $devState = "unknown";
$timeoutinterval = AttrVal($devName, "device_timeout", "undef"); #Timeout configured ? $timeoutinterval = AttrVal($devName, "device_timeout", "undef"); #Timeout configured ?
return "" if ($timeoutinterval eq "undef"); return "" if ($timeoutinterval eq "undef");
@@ -66,9 +67,19 @@ sub DeviceMonitor_Notify($$)
$ownhash->{STATE} = "ENABLED"; $ownhash->{STATE} = "ENABLED";
} }
# Get current HealthState
if (!defined($devhash->{HEALTH_STATE}))
{
$devState = "unknown";
}
else
{
$devState = $devhash->{HEALTH_STATE};
}
if ($timeoutinterval < 1) #device_timeout set to 0 if ($timeoutinterval < 1) #device_timeout set to 0
{ {
if (ReadingsVal($devName,"health_state","unknown") ne "unknown"){DoTrigger($devName,"health_state: unknown")}; if ($devState ne "unknown"){DoTrigger($devName,"health_state: unknown")};
$devhash->{HEALTH_STATE} = "unknown"; $devhash->{HEALTH_STATE} = "unknown";
$devhash->{HEALTH_TIME} = TimeNow(); $devhash->{HEALTH_TIME} = TimeNow();
$ownhash->{READINGS}{$devName}{VAL} = "unknown"; $ownhash->{READINGS}{$devName}{VAL} = "unknown";
@@ -76,7 +87,7 @@ sub DeviceMonitor_Notify($$)
} }
else else
{ {
if (ReadingsVal($devName,"health_state","unknown") ne "alive"){DoTrigger($devName,"health_state: alive")}; if ($devState ne "alive"){DoTrigger($devName,"health_state: alive")};
RemoveInternalTimer($devhash); RemoveInternalTimer($devhash);
$devhash->{HEALTH_STATE} = "alive"; $devhash->{HEALTH_STATE} = "alive";
$devhash->{HEALTH_TIME} = TimeNow(); $devhash->{HEALTH_TIME} = TimeNow();