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

73_AutoShuttersControl: fix roommate and Window comfort

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19368 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2019-05-11 11:58:48 +00:00
parent dcd0a8bcb3
commit 0c0d374170
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # Do not insert empty lines here, update check depends on it.
- bugfix: 73_AutoShuttersControl: fix bug roommate and windwo comfort
- bugfix: 73_DoorBird: Error 404 handling for history images corrected - bugfix: 73_DoorBird: Error 404 handling for history images corrected
- bugfix: 73_AutoShuttersControl: fix sunset sunrise object values - bugfix: 73_AutoShuttersControl: fix sunset sunrise object values
- feature: 74_AMADtaskerset_4.4.0.prj: add nfc tag support in taskerset - feature: 74_AMADtaskerset_4.4.0.prj: add nfc tag support in taskerset

20
fhem/FHEM/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'