diff --git a/fhem/CHANGED b/fhem/CHANGED index 8cea95a43..dc799b7f8 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,6 +1,7 @@ # 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. - - bugfix: 73_DoorBird: Error 404 handling for history images corrected + - bugfix: 73_AutoShuttersControl: fix bug roommate and windwo comfort + - bugfix: 73_DoorBird: Error 404 handling for history images corrected - bugfix: 73_AutoShuttersControl: fix sunset sunrise object values - feature: 74_AMADtaskerset_4.4.0.prj: add nfc tag support in taskerset 74_AMADautomagicflowset: fix bug then use VLC player diff --git a/fhem/FHEM/73_AutoShuttersControl.pm b/fhem/FHEM/73_AutoShuttersControl.pm index f32399a3d..cafd01538 100644 --- a/fhem/FHEM/73_AutoShuttersControl.pm +++ b/fhem/FHEM/73_AutoShuttersControl.pm @@ -44,7 +44,7 @@ use strict; use warnings; use FHEM::Meta; -my $version = '0.6.8'; +my $version = '0.6.9'; sub AutoShuttersControl_Initialize($) { my ($hash) = @_; @@ -1356,8 +1356,10 @@ sub EventProcessingBrightness($@) { computeAlignTime( '24:00', $shutters->getTimeUpEarly ) / 86400 ) - and not IsWe() - ) + and ( not IsWe() + or (IsWe() + and $ascDev->getSunriseTimeWeHoliday eq 'off') + ) ) or ( int( gettimeofday() / 86400 ) != int( computeAlignTime( '24:00', @@ -1433,8 +1435,10 @@ sub EventProcessingBrightness($@) { computeAlignTime( '24:00', $shutters->getTimeUpEarly ) / 86400 ) - and not IsWe() - ) + and ( not IsWe() + or (IsWe() + and $ascDev->getSunriseTimeWeHoliday eq 'off') + ) ) or ( int( gettimeofday() / 86400 ) != int( computeAlignTime( '24:00', @@ -2092,6 +2096,12 @@ sub ShuttersCommandSet($$$) { or $shutters->getComfortOpenPos != $posValue ) 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 ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 and ( $shutters->getLockOut eq 'soft'