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

add new object function to condition between the time

Browse Source 
then shading in
This commit is contained in:
Marko Oldenburg
2020-07-09 12:26:52 +02:00
parent 4792dcea10
commit ed1325e735
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/FHEM/Automation/ShuttersControl/Shading.pm
View File

@ -195,6 +195,12 @@ sub ShadingProcessing {
$FHEM::Automation::ShuttersControl::shutters->setShuttersDev($shuttersDev);
my $brightness =
$FHEM::Automation::ShuttersControl::shutters->getBrightnessAverage;
$FHEM::Automation::ShuttersControl::shutters->setShadingBetweenTheTimeSuspend(
( IsInTime($FHEM::Automation::ShuttersControl::shutters->getShadingBetweenTheTime)
? 0
: 1 )
);
FHEM::Automation::ShuttersControl::ASC_Debug(
'ShadingProcessing: '
@ -465,8 +471,12 @@ sub ShadingProcessing {
)
&& $FHEM::Automation::ShuttersControl::shutters->getIfInShading
)
|| ( !$FHEM::Automation::ShuttersControl::shutters->getIfInShading
|| ( !$FHEM::Automation::ShuttersControl::shutters->getIfInShading
&& $FHEM::Automation::ShuttersControl::shutters->getStatus ==
$FHEM::Automation::ShuttersControl::shutters->getShadingPos
)
|| ( $FHEM::Automation::ShuttersControl::shutters->getShadingBetweenTheTimeSuspend
&& $FHEM::Automation::ShuttersControl::shutters->getStatus !=
$FHEM::Automation::ShuttersControl::shutters->getShadingPos )
)
);

21
lib/FHEM/Automation/ShuttersControl/Shutters.pm
View File

@ -936,6 +936,16 @@ sub setShadingLastPos {
return;
}
sub setShadingBetweenTheTimeSuspend { # Werte für value = 0, 1
my $self = shift;
my $value = shift;
$self->{ $self->{shuttersDev} }{ShadingBetweenTheTimeSuspend}{VAL} = $value
if ( defined($value) );
return;
}
sub setPushBrightnessInArray {
my $self = shift;
my $value = shift;
@ -988,6 +998,17 @@ sub getShadingStatus { # Werte für value = in, out, in reserved, out reserved
);
}
sub getShadingBetweenTheTimeSuspend { # Werte für value = 0, 1
my $self = shift;
return (
defined( $self->{ $self->{shuttersDev} }{ShadingBetweenTheTimeSuspend} )
&& defined( $self->{ $self->{shuttersDev} }{ShadingBetweenTheTimeSuspend}{VAL} )
? $self->{ $self->{shuttersDev} }{ShadingBetweenTheTimeSuspend}{VAL}
: 0
);
}
sub getShadingLastStatus { # Werte für value = in, out
my $self = shift;