From cb709dfad8f72ecba6550a9baf83e03cf34e3671 Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Fri, 8 Jan 2016 13:37:17 +0000 Subject: [PATCH] 10_RESIDENTS: fix wayhome counter git-svn-id: https://svn.fhem.de/fhem/trunk@10408 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_RESIDENTS.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/10_RESIDENTS.pm b/fhem/FHEM/10_RESIDENTS.pm index bc0cb2e24..d98bd7dee 100644 --- a/fhem/FHEM/10_RESIDENTS.pm +++ b/fhem/FHEM/10_RESIDENTS.pm @@ -909,7 +909,7 @@ sub RESIDENTS_UpdateReadings (@) { } if ( ReadingsVal( $roommate, "wakeup", "0" ) > 0 ) { - $wakeup += ReadingsVal( $name, "wakeup", "0" ); + $wakeup += ReadingsVal( $roommate, "wakeup", "0" ); $residentsDevs_wakeup .= "," . $roommate if ( $residentsDevs_wakeup ne "-" ); $residentsDevs_wakeup = $roommate @@ -921,10 +921,11 @@ sub RESIDENTS_UpdateReadings (@) { } if ( ReadingsVal( $roommate, "wayhome", "0" ) > 0 ) { - $wayhome += ReadingsVal( $name, "wayhome", "0" ); - $residents_wayhome .= "," . $roommate - if ( $residents_wayhome ne "-" ); - $residents_wayhome = $roommate if ( $residents_wayhome eq "-" ); + $wayhome += ReadingsVal( $roommate, "wayhome", "0" ); + $residentsDevs_wayhome .= "," . $roommate + if ( $residentsDevs_wayhome ne "-" ); + $residentsDevs_wayhome = $roommate + if ( $residentsDevs_wayhome eq "-" ); $residents_wayhome .= ", " . $roommateName if ( $roommateName ne "" && $residents_wayhome ne "-" ); $residents_wayhome = $roommateName