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

fix bug then ventilate off and comfort on, fix brightness and weekend in EventBrightness Routine

Browse Source
This commit is contained in:
Marko Oldenburg 2019-05-11 09:50:02 +02:00
parent 8c7cf77b4c
commit e68b156d3d
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
73_AutoShuttersControl.pm
View File

@ -44,7 +44,7 @@ use strict;
use warnings; use warnings;
use FHEM::Meta; use FHEM::Meta;
my $version = '0.6.8'; my $version = '0.6.9';
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@ -1356,8 +1356,10 @@ sub EventProcessingBrightness($@) {
computeAlignTime( '24:00', computeAlignTime( '24:00',
$shutters->getTimeUpEarly ) / 86400 $shutters->getTimeUpEarly ) / 86400
) )
and not IsWe() and ( not IsWe()
) or (IsWe()
and $ascDev->getSunriseTimeWeHoliday eq 'off')
) )
or ( or (
int( gettimeofday() / 86400 ) != int( int( gettimeofday() / 86400 ) != int(
computeAlignTime( '24:00', computeAlignTime( '24:00',
@ -1433,8 +1435,10 @@ sub EventProcessingBrightness($@) {
computeAlignTime( '24:00', computeAlignTime( '24:00',
$shutters->getTimeUpEarly ) / 86400 $shutters->getTimeUpEarly ) / 86400
) )
and not IsWe() and ( not IsWe()
) or (IsWe()
and $ascDev->getSunriseTimeWeHoliday eq 'off')
) )
or ( or (
int( gettimeofday() / 86400 ) != int( int( gettimeofday() / 86400 ) != int(
computeAlignTime( '24:00', computeAlignTime( '24:00',
@ -2092,6 +2096,12 @@ sub ShuttersCommandSet($$$) {
or $shutters->getComfortOpenPos != $posValue ) or $shutters->getComfortOpenPos != $posValue )
and $shutters->getVentilateOpen eq 'on' and $shutters->getVentilateOpen eq 'on'
) )
or (
CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getSubTyp eq 'threestate'
and $ascDev->getAutoShuttersControlComfort eq 'on'
and $shutters->getVentilateOpen eq 'off'
)
or ( or (
CheckIfShuttersWindowRecOpen($shuttersDev) == 2 CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and ( $shutters->getLockOut eq 'soft' and ( $shutters->getLockOut eq 'soft'