FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 13:26:02 +00:00
Code Issues Releases Wiki Activity

RESIDENTS: change global events to TYPE:.* format; changed order: first trigger devices, then trigger module initialization event

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14074 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-04-22 14:07:03 +00:00
parent 7cbf926282
commit 7bf01d185a
1 changed files with 114 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
fhem/FHEM/RESIDENTStk.pm
View File

@ -56,6 +56,7 @@ sub RESIDENTStk_Define($$) {
$modules{$TYPE}{defptr}{$name} = \$hash; $modules{$TYPE}{defptr}{$name} = \$hash;
$hash->{'.READY'} = 0; $hash->{'.READY'} = 0;
$hash->{NOTIFYDEV} = "global"; $hash->{NOTIFYDEV} = "global";
delete $hash->{RESIDENTGROUPS} if ( $hash->{RESIDENTGROUPS} );
$hash->{RESIDENTGROUPS} = $a[2] if ( defined( $a[2] ) ); $hash->{RESIDENTGROUPS} = $a[2] if ( defined( $a[2] ) );
# set default settings on first define # set default settings on first define
@ -117,19 +118,6 @@ sub RESIDENTStk_Undefine($$) {
RESIDENTStk_StopInternalTimers($hash); RESIDENTStk_StopInternalTimers($hash);
return undef unless ($init_done); return undef unless ($init_done);
# update parent residents
if ( defined( $hash->{RESIDENTGROUPS} ) ) {
my $old = $hash->{RESIDENTGROUPS};
delete $hash->{RESIDENTGROUPS};
foreach ( split( /,/, $old ) ) {
RESIDENTStk_findResidentSlaves( $defs{$_} )
if ( IsDevice( $_, "RESIDENTS" ) );
}
}
else {
RESIDENTStk_findResidentSlaves($hash);
# delete child roommates # delete child roommates
if ( defined( $hash->{ROOMMATES} ) if ( defined( $hash->{ROOMMATES} )
&& $hash->{ROOMMATES} ne "" ) && $hash->{ROOMMATES} ne "" )
@ -155,7 +143,6 @@ sub RESIDENTStk_Undefine($$) {
Log3 $name, 3, "RESIDENTS $name: deleted device $child"; Log3 $name, 3, "RESIDENTS $name: deleted device $child";
} }
} }
}
# release reverse pointer # release reverse pointer
delete $modules{ $hash->{TYPE} }{defptr}{$name}; delete $modules{ $hash->{TYPE} }{defptr}{$name};
@ -1078,41 +1065,40 @@ sub RESIDENTStk_Notify($$) {
my $devName = $dev->{NAME}; my $devName = $dev->{NAME};
my $devType = GetType($devName); my $devType = GetType($devName);
# do not process notfies during module initialization
return "" if ( $modules{$TYPE}{INIT} || $modules{$TYPE}{REREADCFG} );
if ( $devName eq "global" ) { if ( $devName eq "global" ) {
delete $dev->{CHANGEDWITHSTATE};
my $events = deviceEvents( $dev, 0 ); my $events = deviceEvents( $dev, 0 );
return "" unless ($events); return "" unless ($events);
foreach ( @{$events} ) { foreach ( @{$events} ) {
# module internal notifications
if ( $_ =~ m/^$TYPE(?:\s+(.*))?$/ ) {
# internal init completed by all defined devices
if ( $1 && $1 eq "INITIALIZED" && !$hash->{'.READY'} ) {
$hash->{'.READY'} = 1;
DoTrigger( "global", "INITIALIZED $name", 1 );
}
}
# init RESIDENTS, ROOMMATE or GUEST devices after boot # init RESIDENTS, ROOMMATE or GUEST devices after boot
elsif ( $_ =~ if ( $_ =~
m/^(INITIALIZED|REREADCFG|DEFINED|MODIFIED|RENAMED|DELETED)(?:\s+(.*))?$/ m/^INITIALIZED|REREADCFG|DEFINED.+|MODIFIED.+|RENAMED.+|DELETED.+$/
) )
{ {
# ignore module internal init events # only let first device of the module do initialization
next if ( $1 eq "INITIALIZED" && $2 ); next if ( $_ eq "INITIALIZED" && $modules{$TYPE}{READY} );
if ( $1 eq "REREADCFG" ) { my $REREADCFG;
next unless ( $modules{$TYPE}{READY} ); if ( $_ eq "REREADCFG" ) {
next if ( $modules{$TYPE}{REREADCFG} );
$modules{$TYPE}{READY} = 0; $modules{$TYPE}{READY} = 0;
$modules{$TYPE}{REREADCFG} = 1;
$REREADCFG = 1;
} }
if ( $TYPE eq "RESIDENTS" ) { if ( $TYPE eq "RESIDENTS" ) {
RESIDENTStk_findResidentSlaves($hash); RESIDENTStk_findResidentSlaves($hash);
} }
else { else {
RESIDENTStk_findDummySlaves($name); RESIDENTStk_findDummySlaves($hash);
} }
delete $modules{$TYPE}{REREADCFG} if ($REREADCFG);
} }
# only process attribute events # only process attribute events
@ -1137,7 +1123,7 @@ m/^((?:DELETE)?ATTR)\s+([A-Za-z\d._]+)\s+([A-Za-z\d_\.\-\/]+)(?:\s+(.*)\s*)?$/
if ( $d eq $name ) { if ( $d eq $name ) {
RESIDENTStk_findResidentSlaves($hash) RESIDENTStk_findResidentSlaves($hash)
if ( $TYPE eq "RESIDENTS" ); if ( $TYPE eq "RESIDENTS" );
RESIDENTStk_findDummySlaves($name) RESIDENTStk_findDummySlaves($hash)
if ( $TYPE ne "RESIDENTS" && $TYPE ne "dummy" ); if ( $TYPE ne "RESIDENTS" && $TYPE ne "dummy" );
return ""; return "";
} }
@ -1185,7 +1171,7 @@ m/^((?:DELETE)?ATTR)\s+([A-Za-z\d._]+)\s+([A-Za-z\d_\.\-\/]+)(?:\s+(.*)\s*)?$/
RESIDENTStk_findResidentSlaves($hash) RESIDENTStk_findResidentSlaves($hash)
if ( $TYPE eq "RESIDENTS" ); if ( $TYPE eq "RESIDENTS" );
RESIDENTStk_findDummySlaves($name) RESIDENTStk_findDummySlaves($hash)
if ( $TYPE eq "ROOMMATE" || $TYPE eq "GUEST" ); if ( $TYPE eq "ROOMMATE" || $TYPE eq "GUEST" );
} }
@ -3479,11 +3465,11 @@ sub RESIDENTStk_StopInternalTimers($) {
sub RESIDENTStk_findResidentSlaves($) { sub RESIDENTStk_findResidentSlaves($) {
my ($hash) = @_; my ($hash) = @_;
return return
unless ( ref($hash) eq "HASH" && defined( $hash->{NAME} ) ); unless ( ref($hash) eq "HASH"
&& defined( $hash->{TYPE} )
&& defined( $hash->{NAME} ) );
my $n = "global"; my $ROOMMATES;
delete $hash->{ROOMMATES};
foreach ( devspec2array("TYPE=ROOMMATE") ) { foreach ( devspec2array("TYPE=ROOMMATE") ) {
next next
unless ( unless (
@ -3491,11 +3477,11 @@ sub RESIDENTStk_findResidentSlaves($) {
&& grep { $hash->{NAME} eq $_ } && grep { $hash->{NAME} eq $_ }
split( /,/, $defs{$_}{RESIDENTGROUPS} ) split( /,/, $defs{$_}{RESIDENTGROUPS} )
); );
$hash->{ROOMMATES} .= "," if ( $hash->{ROOMMATES} ); $ROOMMATES .= "," if ($ROOMMATES);
$hash->{ROOMMATES} .= $_; $ROOMMATES .= $_;
} }
delete $hash->{GUESTS}; my $GUESTS;
foreach ( devspec2array("TYPE=GUEST") ) { foreach ( devspec2array("TYPE=GUEST") ) {
next next
unless ( unless (
@ -3503,74 +3489,104 @@ sub RESIDENTStk_findResidentSlaves($) {
&& grep { $hash->{NAME} eq $_ } && grep { $hash->{NAME} eq $_ }
split( /,/, $defs{$_}{RESIDENTGROUPS} ) split( /,/, $defs{$_}{RESIDENTGROUPS} )
); );
$hash->{GUESTS} .= "," if ( $hash->{GUESTS} ); $GUESTS .= "," if ($GUESTS);
$hash->{GUESTS} .= $_; $GUESTS .= $_;
} }
$n .= "," . $hash->{ROOMMATES} if ( $hash->{ROOMMATES} ); if ( !$ROOMMATES && $hash->{ROOMMATES} ) {
$n .= "," . $hash->{GUESTS} if ( $hash->{GUESTS} ); delete $hash->{ROOMMATES};
}
elsif ( $ROOMMATES
&& ( !$hash->{ROOMMATES} || $hash->{ROOMMATES} ne $ROOMMATES ) )
{
$hash->{ROOMMATES} = $ROOMMATES;
}
if ( $hash->{NOTIFYDEV} ne $n ) { if ( !$GUESTS && $hash->{GUESTS} ) {
$hash->{NOTIFYDEV} = $n; delete $hash->{GUESTS};
RESIDENTStk_findDummySlaves( $hash->{NAME}, 1 );
} }
else { elsif ( $GUESTS && ( !$hash->{GUESTS} || $hash->{GUESTS} ne $GUESTS ) ) {
RESIDENTStk_findDummySlaves( $hash->{NAME} ); $hash->{GUESTS} = $GUESTS;
} }
$hash->{NOTIFYDEV} = "global";
$hash->{NOTIFYDEV} .= "," . $hash->{ROOMMATES} if ( $hash->{ROOMMATES} );
$hash->{NOTIFYDEV} .= "," . $hash->{GUESTS} if ( $hash->{GUESTS} );
RESIDENTStk_findDummySlaves($hash);
} }
sub RESIDENTStk_findDummySlaves($) { sub RESIDENTStk_findDummySlaves($) {
my ( $name, $trigger ) = @_; my ($hash) = @_;
my $hash = $defs{$name}; return
my $TYPE = GetType($name); unless ( ref($hash) eq "HASH"
my $prefix = RESIDENTStk_GetPrefixFromType($name); && defined( $hash->{TYPE} )
&& defined( $hash->{NAME} ) );
my $name = $hash->{NAME};
my $TYPE = $hash->{TYPE};
my $prefix = RESIDENTStk_GetPrefixFromType($name);
my $wakeupDevice = AttrVal( $name, $prefix . "wakeupDevice", undef ); my $wakeupDevice = AttrVal( $name, $prefix . "wakeupDevice", undef );
my $presenceDevices = AttrVal( $name, $prefix . "presenceDevices", undef ); my $presenceDevices = AttrVal( $name, $prefix . "presenceDevices", undef );
my $NOTIFYDEV = $hash->{NOTIFYDEV};
$NOTIFYDEV = "global" if ( $TYPE ne "RESIDENTS" );
my $n = $hash->{NOTIFYDEV}; # add r_*wakeupDevice
$n = "global" if ( $TYPE ne "RESIDENTS" );
if ($wakeupDevice) { if ($wakeupDevice) {
$n .= "," if ( $n ne "" ); $NOTIFYDEV .= "," if ( $NOTIFYDEV ne "" );
$n .= $wakeupDevice; $NOTIFYDEV .= $wakeupDevice;
# wakeupResetSwitcher
foreach ( split( ',', $wakeupDevice ) ) { foreach ( split( ',', $wakeupDevice ) ) {
my $rsw; my $rsw = AttrVal( $_, "wakeupResetSwitcher", "" );
next unless ( IsDevice($_) );
$rsw = AttrVal( $_, "wakeupResetSwitcher", "" );
if ( $rsw =~ /^[a-zA-Z\d._]+$/ ) { if ( $rsw =~ /^[a-zA-Z\d._]+$/ ) {
$n .= "," if ( $n ne "" ); $NOTIFYDEV .= "," if ( $NOTIFYDEV ne "" );
$n .= $rsw; $NOTIFYDEV .= $rsw;
} }
} }
} }
# add r_*presenceDevices
if ($presenceDevices) { if ($presenceDevices) {
foreach ($presenceDevices) { foreach ($presenceDevices) {
my $d = $_; my $d = $_;
$d =~ s/:.*$//g; $d =~ s/:.*$//g;
$n .= "," if ( $n ne "" ); $NOTIFYDEV .= "," if ( $NOTIFYDEV ne "" );
$n .= $d; $NOTIFYDEV .= $d;
} }
} }
if ( $hash->{NOTIFYDEV} ne $n ) {
$hash->{NOTIFYDEV} = $n;
$trigger = 1;
}
# finish module initialization # finish module initialization
if ( !$modules{$TYPE}{READY} ) { if ( !$modules{$TYPE}{READY} && !$modules{$TYPE}{INIT} ) {
$modules{$TYPE}{READY} = 1; $modules{$TYPE}{INIT} = 1;
DoTrigger( "global", "$TYPE INITIALIZED", 1 );
foreach ( devspec2array("TYPE=$TYPE") ) {
$defs{$_}{'.READY'} = 0;
RESIDENTStk_findResidentSlaves( $defs{$_} )
if ( $TYPE eq "RESIDENTS" );
RESIDENTStk_findDummySlaves( $defs{$_} )
if ( $TYPE ne "RESIDENTS" );
} }
# internal modification Log 5, "$TYPE: module initialization completed";
elsif ( $trigger && $hash->{'.READY'} ) { delete $modules{$TYPE}{INIT};
DoTrigger( "global", "CONFIG_CHANGED $name", 1 ); $modules{$TYPE}{READY} = 1;
DoTrigger( "global", "$TYPE:INITIALIZED", 1 );
}
# finish device initialization
elsif ( !$hash->{'.READY'} ) {
Log3 $name, 5, "$TYPE $name: device initialization completed";
$hash->{NOTIFYDEV} = $NOTIFYDEV;
$hash->{'.READY'} = 1;
DoTrigger( "global", "$TYPE:INITIALIZED $name", 1 );
}
# device setup changed during runtime
elsif ( $hash->{NOTIFYDEV} ne $NOTIFYDEV ) {
$hash->{NOTIFYDEV} = $NOTIFYDEV;
Log3 $name, 5, "$TYPE $name: device re-configuration completed";
DoTrigger( "global", "$TYPE:MODIFIED $name", 1 );
} }
return ""; return "";