mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-04 22:19:38 +00:00
10_RESIDENTS.pm: rename readings residentsTotalOwners* to residentsTotalRoommates*
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@10170 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski
parent
43ddda6cd6
commit
4d9cf9c746
2
CHANGED
2
CHANGED
@ -1,5 +1,7 @@
|
|||||||
# 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.
|
||||||
|
- change: 10_RESIDENTS.pm: Readings residentsTotalOwners* were renamed to
|
||||||
|
residentsTotalRoommates*
|
||||||
- feature: CUL_MAX: allow multiple instances
|
- feature: CUL_MAX: allow multiple instances
|
||||||
Make sure that you set attr IODev on each MAX device
|
Make sure that you set attr IODev on each MAX device
|
||||||
(pointing to its CUL_MAX) and set attr IODev on each CUL_MAX
|
(pointing to its CUL_MAX) and set attr IODev on each CUL_MAX
|
||||||
|
|||||||
@ -22,20 +22,6 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with fhem. If not, see <http://www.gnu.org/licenses/>.
|
# along with fhem. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
#
|
|
||||||
# Version: 1.2.3
|
|
||||||
#
|
|
||||||
# Major Version History:
|
|
||||||
# - 1.2.0 - 2015-03-11
|
|
||||||
# -- add RESIDENTStoolkit support
|
|
||||||
#
|
|
||||||
# - 1.1.0 - 2014-04-07
|
|
||||||
# -- new readings in computer readable format (*_cr)
|
|
||||||
# -- format of readings durTimer readings changed from minutes to HH:MM:ss
|
|
||||||
#
|
|
||||||
# - 1.0.0 - 2014-02-08
|
|
||||||
# -- First release
|
|
||||||
#
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
package main;
|
package main;
|
||||||
@ -677,9 +663,9 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
my $state_totalGuests = 0;
|
my $state_totalGuests = 0;
|
||||||
my $state_totalGuestsPresent = 0;
|
my $state_totalGuestsPresent = 0;
|
||||||
my $state_totalGuestsAbsent = 0;
|
my $state_totalGuestsAbsent = 0;
|
||||||
my $state_totalOwners = 0;
|
my $state_totalRoommates = 0;
|
||||||
my $state_totalOwnersPresent = 0;
|
my $state_totalRoommatesPresent = 0;
|
||||||
my $state_totalOwnersAbsent = 0;
|
my $state_totalRoommatesAbsent = 0;
|
||||||
my $state_guestDev = 0;
|
my $state_guestDev = 0;
|
||||||
my $residentsDevs_home = "-";
|
my $residentsDevs_home = "-";
|
||||||
my $residentsDevs_absent = "-";
|
my $residentsDevs_absent = "-";
|
||||||
@ -693,8 +679,8 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
my $residentsDevs_totalPresent = "-";
|
my $residentsDevs_totalPresent = "-";
|
||||||
my $residentsDevs_totalAbsentGuest = "-";
|
my $residentsDevs_totalAbsentGuest = "-";
|
||||||
my $residentsDevs_totalPresentGuest = "-";
|
my $residentsDevs_totalPresentGuest = "-";
|
||||||
my $residentsDevs_totalAbsentOwner = "-";
|
my $residentsDevs_totalAbsentRoommates = "-";
|
||||||
my $residentsDevs_totalPresentOwner = "-";
|
my $residentsDevs_totalPresentRoommates = "-";
|
||||||
my $residents_home = "-";
|
my $residents_home = "-";
|
||||||
my $residents_absent = "-";
|
my $residents_absent = "-";
|
||||||
my $residents_asleep = "-";
|
my $residents_asleep = "-";
|
||||||
@ -707,8 +693,8 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
my $residents_totalPresent = "-";
|
my $residents_totalPresent = "-";
|
||||||
my $residents_totalAbsentGuest = "-";
|
my $residents_totalAbsentGuest = "-";
|
||||||
my $residents_totalPresentGuest = "-";
|
my $residents_totalPresentGuest = "-";
|
||||||
my $residents_totalAbsentOwner = "-";
|
my $residents_totalAbsentRoommates = "-";
|
||||||
my $residents_totalPresentOwner = "-";
|
my $residents_totalPresentRoommates = "-";
|
||||||
my $wayhome = 0;
|
my $wayhome = 0;
|
||||||
my $wakeup = 0;
|
my $wakeup = 0;
|
||||||
my $newstate;
|
my $newstate;
|
||||||
@ -726,7 +712,7 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
# count child states for ROOMMATE devices
|
# count child states for ROOMMATE devices
|
||||||
foreach my $roommate (@registeredRoommates) {
|
foreach my $roommate (@registeredRoommates) {
|
||||||
$state_total++;
|
$state_total++;
|
||||||
$state_totalOwners++;
|
$state_totalRoommates++;
|
||||||
|
|
||||||
my $roommateName =
|
my $roommateName =
|
||||||
AttrVal( $roommate,
|
AttrVal( $roommate,
|
||||||
@ -748,23 +734,23 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
if ( $roommateName ne "" && $residents_home eq "-" );
|
if ( $roommateName ne "" && $residents_home eq "-" );
|
||||||
|
|
||||||
$state_totalPresent++;
|
$state_totalPresent++;
|
||||||
$state_totalOwnersPresent++;
|
$state_totalRoommatesPresent++;
|
||||||
$residentsDevs_totalPresent .= "," . $roommate
|
$residentsDevs_totalPresent .= "," . $roommate
|
||||||
if ( $residentsDevs_totalPresent ne "-" );
|
if ( $residentsDevs_totalPresent ne "-" );
|
||||||
$residentsDevs_totalPresent = $roommate
|
$residentsDevs_totalPresent = $roommate
|
||||||
if ( $residentsDevs_totalPresent eq "-" );
|
if ( $residentsDevs_totalPresent eq "-" );
|
||||||
$residentsDevs_totalPresentOwner .= "," . $roommate
|
$residentsDevs_totalPresentRoommates .= "," . $roommate
|
||||||
if ( $residentsDevs_totalPresentOwner ne "-" );
|
if ( $residentsDevs_totalPresentRoommates ne "-" );
|
||||||
$residentsDevs_totalPresentOwner = $roommate
|
$residentsDevs_totalPresentRoommates = $roommate
|
||||||
if ( $residentsDevs_totalPresentOwner eq "-" );
|
if ( $residentsDevs_totalPresentRoommates eq "-" );
|
||||||
$residents_totalPresent .= ", " . $roommateName
|
$residents_totalPresent .= ", " . $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresent ne "-" );
|
if ( $roommateName ne "" && $residents_totalPresent ne "-" );
|
||||||
$residents_totalPresent = $roommateName
|
$residents_totalPresent = $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresent eq "-" );
|
if ( $roommateName ne "" && $residents_totalPresent eq "-" );
|
||||||
$residents_totalPresentOwner .= ", " . $roommateName
|
$residents_totalPresentRoommates .= ", " . $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresentOwner ne "-" );
|
if ( $roommateName ne "" && $residents_totalPresentRoommates ne "-" );
|
||||||
$residents_totalPresentOwner = $roommateName
|
$residents_totalPresentRoommates = $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresentOwner eq "-" );
|
if ( $roommateName ne "" && $residents_totalPresentRoommates eq "-" );
|
||||||
}
|
}
|
||||||
|
|
||||||
elsif ( $defs{$roommate}{READINGS}{state}{VAL} eq "gotosleep" ) {
|
elsif ( $defs{$roommate}{READINGS}{state}{VAL} eq "gotosleep" ) {
|
||||||
@ -779,23 +765,23 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
if ( $roommateName ne "" && $residents_gotosleep eq "-" );
|
if ( $roommateName ne "" && $residents_gotosleep eq "-" );
|
||||||
|
|
||||||
$state_totalPresent++;
|
$state_totalPresent++;
|
||||||
$state_totalOwnersPresent++;
|
$state_totalRoommatesPresent++;
|
||||||
$residentsDevs_totalPresent .= "," . $roommate
|
$residentsDevs_totalPresent .= "," . $roommate
|
||||||
if ( $residentsDevs_totalPresent ne "-" );
|
if ( $residentsDevs_totalPresent ne "-" );
|
||||||
$residentsDevs_totalPresent = $roommate
|
$residentsDevs_totalPresent = $roommate
|
||||||
if ( $residentsDevs_totalPresent eq "-" );
|
if ( $residentsDevs_totalPresent eq "-" );
|
||||||
$residentsDevs_totalPresentOwner .= "," . $roommate
|
$residentsDevs_totalPresentRoommates .= "," . $roommate
|
||||||
if ( $residentsDevs_totalPresentOwner ne "-" );
|
if ( $residentsDevs_totalPresentRoommates ne "-" );
|
||||||
$residentsDevs_totalPresentOwner = $roommate
|
$residentsDevs_totalPresentRoommates = $roommate
|
||||||
if ( $residentsDevs_totalPresentOwner eq "-" );
|
if ( $residentsDevs_totalPresentRoommates eq "-" );
|
||||||
$residents_totalPresent .= ", " . $roommateName
|
$residents_totalPresent .= ", " . $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresent ne "-" );
|
if ( $roommateName ne "" && $residents_totalPresent ne "-" );
|
||||||
$residents_totalPresent = $roommateName
|
$residents_totalPresent = $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresent eq "-" );
|
if ( $roommateName ne "" && $residents_totalPresent eq "-" );
|
||||||
$residents_totalPresentOwner .= ", " . $roommateName
|
$residents_totalPresentRoommates .= ", " . $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresentOwner ne "-" );
|
if ( $roommateName ne "" && $residents_totalPresentRoommates ne "-" );
|
||||||
$residents_totalPresentOwner = $roommateName
|
$residents_totalPresentRoommates = $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresentOwner eq "-" );
|
if ( $roommateName ne "" && $residents_totalPresentRoommates eq "-" );
|
||||||
}
|
}
|
||||||
|
|
||||||
elsif ( $defs{$roommate}{READINGS}{state}{VAL} eq "asleep" ) {
|
elsif ( $defs{$roommate}{READINGS}{state}{VAL} eq "asleep" ) {
|
||||||
@ -810,23 +796,23 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
if ( $roommateName ne "" && $residents_asleep eq "-" );
|
if ( $roommateName ne "" && $residents_asleep eq "-" );
|
||||||
|
|
||||||
$state_totalPresent++;
|
$state_totalPresent++;
|
||||||
$state_totalOwnersPresent++;
|
$state_totalRoommatesPresent++;
|
||||||
$residentsDevs_totalPresent .= "," . $roommate
|
$residentsDevs_totalPresent .= "," . $roommate
|
||||||
if ( $residentsDevs_totalPresent ne "-" );
|
if ( $residentsDevs_totalPresent ne "-" );
|
||||||
$residentsDevs_totalPresent = $roommate
|
$residentsDevs_totalPresent = $roommate
|
||||||
if ( $residentsDevs_totalPresent eq "-" );
|
if ( $residentsDevs_totalPresent eq "-" );
|
||||||
$residentsDevs_totalPresentOwner .= "," . $roommate
|
$residentsDevs_totalPresentRoommates .= "," . $roommate
|
||||||
if ( $residentsDevs_totalPresentOwner ne "-" );
|
if ( $residentsDevs_totalPresentRoommates ne "-" );
|
||||||
$residentsDevs_totalPresentOwner = $roommate
|
$residentsDevs_totalPresentRoommates = $roommate
|
||||||
if ( $residentsDevs_totalPresentOwner eq "-" );
|
if ( $residentsDevs_totalPresentRoommates eq "-" );
|
||||||
$residents_totalPresent .= ", " . $roommateName
|
$residents_totalPresent .= ", " . $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresent ne "-" );
|
if ( $roommateName ne "" && $residents_totalPresent ne "-" );
|
||||||
$residents_totalPresent = $roommateName
|
$residents_totalPresent = $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresent eq "-" );
|
if ( $roommateName ne "" && $residents_totalPresent eq "-" );
|
||||||
$residents_totalPresentOwner .= ", " . $roommateName
|
$residents_totalPresentRoommates .= ", " . $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresentOwner ne "-" );
|
if ( $roommateName ne "" && $residents_totalPresentRoommates ne "-" );
|
||||||
$residents_totalPresentOwner = $roommateName
|
$residents_totalPresentRoommates = $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresentOwner eq "-" );
|
if ( $roommateName ne "" && $residents_totalPresentRoommates eq "-" );
|
||||||
}
|
}
|
||||||
|
|
||||||
elsif ( $defs{$roommate}{READINGS}{state}{VAL} eq "awoken" ) {
|
elsif ( $defs{$roommate}{READINGS}{state}{VAL} eq "awoken" ) {
|
||||||
@ -841,23 +827,23 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
if ( $roommateName ne "" && $residents_awoken eq "-" );
|
if ( $roommateName ne "" && $residents_awoken eq "-" );
|
||||||
|
|
||||||
$state_totalPresent++;
|
$state_totalPresent++;
|
||||||
$state_totalOwnersPresent++;
|
$state_totalRoommatesPresent++;
|
||||||
$residentsDevs_totalPresent .= "," . $roommate
|
$residentsDevs_totalPresent .= "," . $roommate
|
||||||
if ( $residentsDevs_totalPresent ne "-" );
|
if ( $residentsDevs_totalPresent ne "-" );
|
||||||
$residentsDevs_totalPresent = $roommate
|
$residentsDevs_totalPresent = $roommate
|
||||||
if ( $residentsDevs_totalPresent eq "-" );
|
if ( $residentsDevs_totalPresent eq "-" );
|
||||||
$residentsDevs_totalPresentOwner .= "," . $roommate
|
$residentsDevs_totalPresentRoommates .= "," . $roommate
|
||||||
if ( $residentsDevs_totalPresentOwner ne "-" );
|
if ( $residentsDevs_totalPresentRoommates ne "-" );
|
||||||
$residentsDevs_totalPresentOwner = $roommate
|
$residentsDevs_totalPresentRoommates = $roommate
|
||||||
if ( $residentsDevs_totalPresentOwner eq "-" );
|
if ( $residentsDevs_totalPresentRoommates eq "-" );
|
||||||
$residents_totalPresent .= ", " . $roommateName
|
$residents_totalPresent .= ", " . $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresent ne "-" );
|
if ( $roommateName ne "" && $residents_totalPresent ne "-" );
|
||||||
$residents_totalPresent = $roommateName
|
$residents_totalPresent = $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresent eq "-" );
|
if ( $roommateName ne "" && $residents_totalPresent eq "-" );
|
||||||
$residents_totalPresentOwner .= ", " . $roommateName
|
$residents_totalPresentRoommates .= ", " . $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresentOwner ne "-" );
|
if ( $roommateName ne "" && $residents_totalPresentRoommates ne "-" );
|
||||||
$residents_totalPresentOwner = $roommateName
|
$residents_totalPresentRoommates = $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalPresentOwner eq "-" );
|
if ( $roommateName ne "" && $residents_totalPresentRoommates eq "-" );
|
||||||
}
|
}
|
||||||
|
|
||||||
elsif ( $defs{$roommate}{READINGS}{state}{VAL} eq "absent" ) {
|
elsif ( $defs{$roommate}{READINGS}{state}{VAL} eq "absent" ) {
|
||||||
@ -872,23 +858,23 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
if ( $roommateName ne "" && $residents_absent eq "-" );
|
if ( $roommateName ne "" && $residents_absent eq "-" );
|
||||||
|
|
||||||
$state_totalAbsent++;
|
$state_totalAbsent++;
|
||||||
$state_totalOwnersAbsent++;
|
$state_totalRoommatesAbsent++;
|
||||||
$residentsDevs_totalAbsent .= "," . $roommate
|
$residentsDevs_totalAbsent .= "," . $roommate
|
||||||
if ( $residentsDevs_totalAbsent ne "-" );
|
if ( $residentsDevs_totalAbsent ne "-" );
|
||||||
$residentsDevs_totalAbsent = $roommate
|
$residentsDevs_totalAbsent = $roommate
|
||||||
if ( $residentsDevs_totalAbsent eq "-" );
|
if ( $residentsDevs_totalAbsent eq "-" );
|
||||||
$residentsDevs_totalAbsentOwner .= "," . $roommate
|
$residentsDevs_totalAbsentRoommates .= "," . $roommate
|
||||||
if ( $residentsDevs_totalAbsentOwner ne "-" );
|
if ( $residentsDevs_totalAbsentRoommates ne "-" );
|
||||||
$residentsDevs_totalAbsentOwner = $roommate
|
$residentsDevs_totalAbsentRoommates = $roommate
|
||||||
if ( $residentsDevs_totalAbsentOwner eq "-" );
|
if ( $residentsDevs_totalAbsentRoommates eq "-" );
|
||||||
$residents_totalAbsent .= ", " . $roommateName
|
$residents_totalAbsent .= ", " . $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalAbsent ne "-" );
|
if ( $roommateName ne "" && $residents_totalAbsent ne "-" );
|
||||||
$residents_totalAbsent = $roommateName
|
$residents_totalAbsent = $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalAbsent eq "-" );
|
if ( $roommateName ne "" && $residents_totalAbsent eq "-" );
|
||||||
$residents_totalAbsentOwner .= ", " . $roommateName
|
$residents_totalAbsentRoommates .= ", " . $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalAbsentOwner ne "-" );
|
if ( $roommateName ne "" && $residents_totalAbsentRoommates ne "-" );
|
||||||
$residents_totalAbsentOwner = $roommateName
|
$residents_totalAbsentRoommates = $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalAbsentOwner eq "-" );
|
if ( $roommateName ne "" && $residents_totalAbsentRoommates eq "-" );
|
||||||
}
|
}
|
||||||
|
|
||||||
elsif ( $defs{$roommate}{READINGS}{state}{VAL} eq "gone" ) {
|
elsif ( $defs{$roommate}{READINGS}{state}{VAL} eq "gone" ) {
|
||||||
@ -903,23 +889,23 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
if ( $roommateName ne "" && $residents_gone eq "-" );
|
if ( $roommateName ne "" && $residents_gone eq "-" );
|
||||||
|
|
||||||
$state_totalAbsent++;
|
$state_totalAbsent++;
|
||||||
$state_totalOwnersAbsent++;
|
$state_totalRoommatesAbsent++;
|
||||||
$residentsDevs_totalAbsent .= "," . $roommate
|
$residentsDevs_totalAbsent .= "," . $roommate
|
||||||
if ( $residentsDevs_totalAbsent ne "-" );
|
if ( $residentsDevs_totalAbsent ne "-" );
|
||||||
$residentsDevs_totalAbsent = $roommate
|
$residentsDevs_totalAbsent = $roommate
|
||||||
if ( $residentsDevs_totalAbsent eq "-" );
|
if ( $residentsDevs_totalAbsent eq "-" );
|
||||||
$residentsDevs_totalAbsentOwner .= "," . $roommate
|
$residentsDevs_totalAbsentRoommates .= "," . $roommate
|
||||||
if ( $residentsDevs_totalAbsentOwner ne "-" );
|
if ( $residentsDevs_totalAbsentRoommates ne "-" );
|
||||||
$residentsDevs_totalAbsentOwner = $roommate
|
$residentsDevs_totalAbsentRoommates = $roommate
|
||||||
if ( $residentsDevs_totalAbsentOwner eq "-" );
|
if ( $residentsDevs_totalAbsentRoommates eq "-" );
|
||||||
$residents_totalAbsent .= ", " . $roommateName
|
$residents_totalAbsent .= ", " . $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalAbsent ne "-" );
|
if ( $roommateName ne "" && $residents_totalAbsent ne "-" );
|
||||||
$residents_totalAbsent = $roommateName
|
$residents_totalAbsent = $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalAbsent eq "-" );
|
if ( $roommateName ne "" && $residents_totalAbsent eq "-" );
|
||||||
$residents_totalAbsentOwner .= ", " . $roommateName
|
$residents_totalAbsentRoommates .= ", " . $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalAbsentOwner ne "-" );
|
if ( $roommateName ne "" && $residents_totalAbsentRoommates ne "-" );
|
||||||
$residents_totalAbsentOwner = $roommateName
|
$residents_totalAbsentRoommates = $roommateName
|
||||||
if ( $roommateName ne "" && $residents_totalAbsentOwner eq "-" );
|
if ( $roommateName ne "" && $residents_totalAbsentRoommates eq "-" );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1204,51 +1190,51 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
|| $hash->{READINGS}{residentsTotalGuestsAbsentNames}{VAL} ne
|
|| $hash->{READINGS}{residentsTotalGuestsAbsentNames}{VAL} ne
|
||||||
$residents_totalAbsentGuest );
|
$residents_totalAbsentGuest );
|
||||||
|
|
||||||
readingsBulkUpdate( $hash, "residentsTotalOwners", $state_totalOwners )
|
readingsBulkUpdate( $hash, "residentsTotalRoommates", $state_totalRoommates )
|
||||||
if ( !defined( $hash->{READINGS}{residentsTotalOwners}{VAL} )
|
if ( !defined( $hash->{READINGS}{residentsTotalRoommates}{VAL} )
|
||||||
|| $hash->{READINGS}{residentsTotalOwners}{VAL} ne $state_totalOwners );
|
|| $hash->{READINGS}{residentsTotalRoommates}{VAL} ne $state_totalRoommates );
|
||||||
|
|
||||||
readingsBulkUpdate( $hash, "residentsTotalOwnersPresent",
|
readingsBulkUpdate( $hash, "residentsTotalRoommatesPresent",
|
||||||
$state_totalOwnersPresent )
|
$state_totalRoommatesPresent )
|
||||||
if ( !defined( $hash->{READINGS}{residentsTotalOwnersPresent}{VAL} )
|
if ( !defined( $hash->{READINGS}{residentsTotalRoommatesPresent}{VAL} )
|
||||||
|| $hash->{READINGS}{residentsTotalOwnersPresent}{VAL} ne
|
|| $hash->{READINGS}{residentsTotalRoommatesPresent}{VAL} ne
|
||||||
$state_totalOwnersPresent );
|
$state_totalRoommatesPresent );
|
||||||
|
|
||||||
readingsBulkUpdate(
|
readingsBulkUpdate(
|
||||||
$hash,
|
$hash,
|
||||||
"residentsTotalOwnersPresentDevs",
|
"residentsTotalRoommatesPresentDevs",
|
||||||
$residentsDevs_totalPresentOwner
|
$residentsDevs_totalPresentRoommates
|
||||||
)
|
)
|
||||||
if ( !defined( $hash->{READINGS}{residentsTotalOwnersPresentDevs}{VAL} )
|
if ( !defined( $hash->{READINGS}{residentsTotalRoommatesPresentDevs}{VAL} )
|
||||||
|| $hash->{READINGS}{residentsTotalOwnersPresentDevs}{VAL} ne
|
|| $hash->{READINGS}{residentsTotalRoommatesPresentDevs}{VAL} ne
|
||||||
$residentsDevs_totalPresentOwner );
|
$residentsDevs_totalPresentRoommates );
|
||||||
|
|
||||||
readingsBulkUpdate( $hash, "residentsTotalOwnersPresentNames",
|
readingsBulkUpdate( $hash, "residentsTotalRoommatesPresentNames",
|
||||||
$residents_totalPresentOwner )
|
$residents_totalPresentRoommates )
|
||||||
if ( !defined( $hash->{READINGS}{residentsTotalOwnersPresentNames}{VAL} )
|
if ( !defined( $hash->{READINGS}{residentsTotalRoommatesPresentNames}{VAL} )
|
||||||
|| $hash->{READINGS}{residentsTotalOwnersPresentNames}{VAL} ne
|
|| $hash->{READINGS}{residentsTotalRoommatesPresentNames}{VAL} ne
|
||||||
$residents_totalPresentOwner );
|
$residents_totalPresentRoommates );
|
||||||
|
|
||||||
readingsBulkUpdate( $hash, "residentsTotalOwnersAbsent",
|
readingsBulkUpdate( $hash, "residentsTotalRoommatesAbsent",
|
||||||
$state_totalOwnersAbsent )
|
$state_totalRoommatesAbsent )
|
||||||
if ( !defined( $hash->{READINGS}{residentsTotalOwnersAbsent}{VAL} )
|
if ( !defined( $hash->{READINGS}{residentsTotalRoommatesAbsent}{VAL} )
|
||||||
|| $hash->{READINGS}{residentsTotalOwnersAbsent}{VAL} ne
|
|| $hash->{READINGS}{residentsTotalRoommatesAbsent}{VAL} ne
|
||||||
$state_totalOwnersAbsent );
|
$state_totalRoommatesAbsent );
|
||||||
|
|
||||||
readingsBulkUpdate(
|
readingsBulkUpdate(
|
||||||
$hash,
|
$hash,
|
||||||
"residentsTotalOwnersAbsentDevs",
|
"residentsTotalRoommatesAbsentDevs",
|
||||||
$residentsDevs_totalAbsentOwner
|
$residentsDevs_totalAbsentRoommates
|
||||||
)
|
)
|
||||||
if ( !defined( $hash->{READINGS}{residentsTotalOwnersAbsentDevs}{VAL} )
|
if ( !defined( $hash->{READINGS}{residentsTotalRoommatesAbsentDevs}{VAL} )
|
||||||
|| $hash->{READINGS}{residentsTotalOwnersAbsentDevs}{VAL} ne
|
|| $hash->{READINGS}{residentsTotalRoommatesAbsentDevs}{VAL} ne
|
||||||
$residentsDevs_totalAbsentOwner );
|
$residentsDevs_totalAbsentRoommates );
|
||||||
|
|
||||||
readingsBulkUpdate( $hash, "residentsTotalOwnersAbsentNames",
|
readingsBulkUpdate( $hash, "residentsTotalRoommatesAbsentNames",
|
||||||
$residents_totalAbsentOwner )
|
$residents_totalAbsentRoommates )
|
||||||
if ( !defined( $hash->{READINGS}{residentsTotalOwnersAbsentNames}{VAL} )
|
if ( !defined( $hash->{READINGS}{residentsTotalRoommatesAbsentNames}{VAL} )
|
||||||
|| $hash->{READINGS}{residentsTotalOwnersAbsentNames}{VAL} ne
|
|| $hash->{READINGS}{residentsTotalRoommatesAbsentNames}{VAL} ne
|
||||||
$residents_totalAbsentOwner );
|
$residents_totalAbsentRoommates );
|
||||||
|
|
||||||
readingsBulkUpdate( $hash, "residentsTotalPresent", $state_totalPresent )
|
readingsBulkUpdate( $hash, "residentsTotalPresent", $state_totalPresent )
|
||||||
if ( !defined( $hash->{READINGS}{residentsTotalPresent}{VAL} )
|
if ( !defined( $hash->{READINGS}{residentsTotalPresent}{VAL} )
|
||||||
@ -1455,7 +1441,7 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
|
|
||||||
# none
|
# none
|
||||||
elsif ($state_totalGuests == 0
|
elsif ($state_totalGuests == 0
|
||||||
&& $state_totalOwners == 0
|
&& $state_totalRoommates == 0
|
||||||
&& $state_gone == 0
|
&& $state_gone == 0
|
||||||
&& $state_absent == 0
|
&& $state_absent == 0
|
||||||
&& $state_home == 0
|
&& $state_home == 0
|
||||||
@ -1478,7 +1464,7 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
: "absent";
|
: "absent";
|
||||||
|
|
||||||
Log3 $name, 4,
|
Log3 $name, 4,
|
||||||
"RESIDENTS $name: calculation result - residentsTotal:$state_total residentsTotalOwners:$state_totalOwners residentsTotalOwnersPresent:$state_totalOwnersPresent residentsTotalOwnersAbsent:$state_totalOwnersAbsent residentsTotalGuests:$state_totalGuests residentsTotalGuestsPresent:$state_totalGuestsPresent residentsTotalGuestsAbsent:$state_totalGuestsAbsent residentsTotalPresent:$state_totalPresent residentsTotalAbsent:$state_totalAbsent residentsHome:$state_home residentsGotosleep:$state_gotosleep residentsAsleep:$state_asleep residentsAwoken:$state_awoken residentsAbsent:$state_absent residentsGone:$state_gone presence:$newpresence state:$newstate";
|
"RESIDENTS $name: calculation result - residentsTotal:$state_total residentsTotalRoommates:$state_totalRoommates residentsTotalRoommatesPresent:$state_totalRoommatesPresent residentsTotalRoommatesAbsent:$state_totalRoommatesAbsent residentsTotalGuests:$state_totalGuests residentsTotalGuestsPresent:$state_totalGuestsPresent residentsTotalGuestsAbsent:$state_totalGuestsAbsent residentsTotalPresent:$state_totalPresent residentsTotalAbsent:$state_totalAbsent residentsHome:$state_home residentsGotosleep:$state_gotosleep residentsAsleep:$state_asleep residentsAwoken:$state_awoken residentsAbsent:$state_absent residentsGone:$state_gone presence:$newpresence state:$newstate";
|
||||||
|
|
||||||
# safe current time
|
# safe current time
|
||||||
my $datetime = FmtDateTime(time);
|
my $datetime = FmtDateTime(time);
|
||||||
@ -1850,25 +1836,25 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
<b>residentsTotalGuestsPresentNames</b> - device alias of all active guests who are currently at home
|
<b>residentsTotalGuestsPresentNames</b> - device alias of all active guests who are currently at home
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwners</b> - number of residents treated as being a permanent resident
|
<b>residentsTotalRoommates</b> - number of residents treated as being a permanent resident
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwnersAbsent</b> - number of all owners who are currently underway
|
<b>residentsTotalRoommatesAbsent</b> - number of all roommates who are currently underway
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwnersAbsentDevs</b> - device name of all owners who are currently underway
|
<b>residentsTotalRoommatesAbsentDevs</b> - device name of all roommates who are currently underway
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwnersAbsentNames</b> - device alias of all owners who are currently underway
|
<b>residentsTotalRoommatesAbsentNames</b> - device alias of all roommates who are currently underway
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwnersPresent</b> - number of all owners who are currently at home
|
<b>residentsTotalRoommatesPresent</b> - number of all roommates who are currently at home
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwnersPresentDevs</b> - device name of all owners who are currently at home
|
<b>residentsTotalRoommatesPresentDevs</b> - device name of all roommates who are currently at home
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwnersPresentNames</b> - device alias of all owners who are currently at home
|
<b>residentsTotalRoommatesPresentNames</b> - device alias of all roommates who are currently at home
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalPresent</b> - number of all residents who are currently at home
|
<b>residentsTotalPresent</b> - number of all residents who are currently at home
|
||||||
@ -2209,25 +2195,25 @@ sub RESIDENTS_UpdateReadings (@) {
|
|||||||
<b>residentsTotalGuestsPresentNames</b> - Gerätealias der aktiven Gäste, die momentan zu Hause sind
|
<b>residentsTotalGuestsPresentNames</b> - Gerätealias der aktiven Gäste, die momentan zu Hause sind
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwners</b> - Anzahl der Bewohner, die als permanente Bewohner behandelt werden
|
<b>residentsTotalRoommates</b> - Anzahl der Bewohner, die als permanente Bewohner behandelt werden
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwnersAbsent</b> - Anzahl der Besitzer, die momentan unterwegs sind
|
<b>residentsTotalRoommatesAbsent</b> - Anzahl der Besitzer, die momentan unterwegs sind
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwnersAbsentDevs</b> - Gerätename der Besitzer, die momentan unterwegs sind
|
<b>residentsTotalRoommatesAbsentDevs</b> - Gerätename der Besitzer, die momentan unterwegs sind
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwnersAbsentNames</b> - Gerätealias der Besitzer, die momentan unterwegs sind
|
<b>residentsTotalRoommatesAbsentNames</b> - Gerätealias der Besitzer, die momentan unterwegs sind
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwnersPresent</b> - Anzahl der Besitzer, die momentan zu Hause sind
|
<b>residentsTotalRoommatesPresent</b> - Anzahl der Besitzer, die momentan zu Hause sind
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwnersPresentDevs</b> - Gerätename der Besitzer, die momentan zu Hause sind
|
<b>residentsTotalRoommatesPresentDevs</b> - Gerätename der Besitzer, die momentan zu Hause sind
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalOwnersPresentNames</b> - Gerätealias der Besitzer, die momentan zu Hause sind
|
<b>residentsTotalRoommatesPresentNames</b> - Gerätealias der Besitzer, die momentan zu Hause sind
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<b>residentsTotalPresent</b> - Summe aller aktiven Bewohner, die momentan zu Hause sind
|
<b>residentsTotalPresent</b> - Summe aller aktiven Bewohner, die momentan zu Hause sind
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user