FHEM/mod-AutoShuttersControl
1
0
Fork 0
Code Issues 12 Pull Requests Releases 9 Wiki Activity

fix change code in NotifyFn

Browse Source
This commit is contained in:
Marko Oldenburg 2020-03-26 23:20:21 +01:00
parent 878bf99a16
commit 9d050b7b28
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
73_AutoShuttersControl.pm
View File

@ -391,11 +391,11 @@ sub Undef {
sub Notify { sub Notify {
my $hash = shift; my $hash = shift;
my $dev = shift; my $dev = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $devname = $dev->{NAME}; my $devname = $dev->{NAME};
my $devtype = $dev->{TYPE}; my $devtype = $dev->{TYPE};
my $events = deviceEvents( shift, 1 ); my $events = deviceEvents( $dev, 1 );
return if ( !$events ); return if ( !$events );
Log3( $name, 4, Log3( $name, 4,
@ -802,6 +802,7 @@ sub ShuttersDeviceScan {
} }
$hash->{NOTIFYDEV} = $notifyDevString; $hash->{NOTIFYDEV} = $notifyDevString;
} }
readingsSingleUpdate( $hash, 'userAttrList', 'rolled out', 1 ); readingsSingleUpdate( $hash, 'userAttrList', 'rolled out', 1 );
} }
@ -2780,7 +2781,7 @@ sub ShuttersCommandSet {
sub CreateSunRiseSetShuttersTimer { sub CreateSunRiseSetShuttersTimer {
my $hash = shift; my $hash = shift;
my $shuttersDev = shift; my $shuttersDev = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $shuttersDevHash = $defs{$shuttersDev}; my $shuttersDevHash = $defs{$shuttersDev};
my %funcHash; my %funcHash;
@ -3264,13 +3265,18 @@ sub CreateNewNotifyDev {
} }
sub ShuttersInformation { sub ShuttersInformation {
return
if ( !defined($shutters->getSunriseUnixTime)
or !defined($shutters->getSunsetUnixTime) );
my ( $FW_wname, $d, $room, $pageHash ) = @_; my ( $FW_wname, $d, $room, $pageHash ) = @_;
my $hash = $defs{$d}; my $hash = $defs{$d};
return
if ( !exists($hash->{helper})
or !defined($hash->{helper}->{shuttersList})
or ref($hash->{helper}->{shuttersList}) ne 'ARRAY'
or scalar( @{$hash->{helper}->{shuttersList}} ) == 0
or !defined($shutters->getSunriseUnixTime)
or !defined($shutters->getSunsetUnixTime) );
my $ret = my $ret =
'<html><table><tr><h3>ASC Configuration and Information Summary</h3><td>'; '<html><table><tr><h3>ASC Configuration and Information Summary</h3><td>';
$ret .= '<table class="block wide">'; $ret .= '<table class="block wide">';
@ -5057,37 +5063,33 @@ sub getInTimerFuncHash {
sub getSunsetUnixTime { sub getSunsetUnixTime {
my $self = shift; my $self = shift;
return ( exists( $self->{ $self } ) return $self->{ $self->{shuttersDev} }{sunsettime};
&& exists( $self->{ $self->{shuttersDev} }{sunsettime} )
? $self->{ $self->{shuttersDev} }{sunrisetime}
: 0 );
} }
sub getSunset { sub getSunset {
my $self = shift; my $self = shift;
return ( exists( $self->{ $self } ) return (
&& exists( $self->{ $self->{shuttersDev} }{sunset} ) defined( $self->{ $self->{shuttersDev} }{sunset} )
? $self->{ $self->{shuttersDev} }{sunset} ? $self->{ $self->{shuttersDev} }{sunset}
: 0 ); : 0
);
} }
sub getSunriseUnixTime { sub getSunriseUnixTime {
my $self = shift; my $self = shift;
return ( exists( $self->{ $self } ) return $self->{ $self->{shuttersDev} }{sunrisetime};
&& exists( $self->{ $self->{shuttersDev} }{sunrisetime} )
? $self->{ $self->{shuttersDev} }{sunrisetime}
: 0 );
} }
sub getSunrise { sub getSunrise {
my $self = shift; my $self = shift;
return ( exists( $self->{ $self } ) return (
&& exists( $self->{ $self->{shuttersDev} }{sunrise} ) defined( $self->{ $self->{shuttersDev} }{sunrise} )
? $self->{ $self->{shuttersDev} }{sunrise} ? $self->{ $self->{shuttersDev} }{sunrise}
: 0 ); : 0
);
} }
sub getRoommatesStatus { sub getRoommatesStatus {