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

structure: relativeKnown fix

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@4051 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2013-10-16 06:23:38 +00:00
parent d9951533e2
commit 3cc0a70f2b
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/98_structure.pm
View File

@@ -208,7 +208,10 @@ sub structure_Notify($$)
}
}
if(defined($devstate)) {
return "" if(!$priority{$devstate} && $behavior eq "relativeKnown");
if(!$priority{$devstate} && $behavior eq "relativeKnown") {
delete($hash->{INNTFY});
return "";
}
$minprio = $priority{$devstate}
if($priority{$devstate} && $priority{$devstate} < $minprio);
$clientstate{$devstate} = 1;
@@ -218,7 +221,10 @@ sub structure_Notify($$)
} else {
$devstate = ReadingsVal($d, "state", undef);
if(defined($devstate)) {
return "" if(!$priority{$devstate} && $behavior eq "relativeKnown");
if(!$priority{$devstate} && $behavior eq "relativeKnown") {
delete($hash->{INNTFY});
return "";
}
$minprio = $priority{$devstate}
if($priority{$devstate} && $priority{$devstate} < $minprio);
$clientstate{$devstate} = 1;
@@ -232,7 +238,7 @@ sub structure_Notify($$)
my @cKeys = keys %clientstate;
$newState = (@cKeys == 1 ? $cKeys[0] : "undefined");
} elsif($behavior eq "relative" && $minprio < 99999) {
} elsif($behavior =~ "^relative" && $minprio < 99999) {
$newState = $priority[$minprio];
} elsif($behavior eq "last"){
@@ -244,7 +250,8 @@ sub structure_Notify($$)
" because device $dev->{NAME} has changed";
readingsBeginUpdate($hash);
readingsBulkUpdate($hash, "LastDevice", $dev->{NAME});
readingsBulkUpdate($hash, "LastDevice_Abs", structure_getChangedDevice($dev->{NAME}));
readingsBulkUpdate($hash, "LastDevice_Abs",
structure_getChangedDevice($dev->{NAME}));
readingsBulkUpdate($hash, "state", $newState);
readingsEndUpdate($hash, 1);