mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-04 22:19:38 +00:00
10_RESIDENTS: fix notify handling
git-svn-id: https://svn.fhem.de/fhem/trunk@13873 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
6041d83a81
commit
22d7cd5249
@ -212,7 +212,7 @@ sub RESIDENTS_Notify($$) {
|
|||||||
return unless ( $devName ne $hashName ); # only foreign events
|
return unless ( $devName ne $hashName ); # only foreign events
|
||||||
return if ( IsDisabled($hashName) or IsDisabled($devName) );
|
return if ( IsDisabled($hashName) or IsDisabled($devName) );
|
||||||
return
|
return
|
||||||
unless ( RESIDENTStk_GetType( $devName, "ROOMMATE|GUEST|dummy" ) );
|
unless ( RESIDENTStk_IsDevice( $devName, "ROOMMATE|GUEST|dummy" ) );
|
||||||
|
|
||||||
my @registeredRoommates =
|
my @registeredRoommates =
|
||||||
split( /,/, $hash->{ROOMMATES} )
|
split( /,/, $hash->{ROOMMATES} )
|
||||||
@ -1414,7 +1414,7 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
for my $wakeupDevice ( split /,/, $wakeupDeviceList ) {
|
for my $wakeupDevice ( split /,/, $wakeupDeviceList ) {
|
||||||
next if !$wakeupDevice;
|
next if !$wakeupDevice;
|
||||||
|
|
||||||
if ( RESIDENTStk_GetType($wakeupDevice) eq "dummy" ) {
|
if ( RESIDENTStk_IsDevice( $wakeupDevice, "dummy" ) ) {
|
||||||
|
|
||||||
# forced-stop only if resident is not present anymore
|
# forced-stop only if resident is not present anymore
|
||||||
if ( $newpresence eq "present" ) {
|
if ( $newpresence eq "present" ) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user