Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

73_AutoShuttersControl: fix bug after privacyDown and open window

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21956 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2020-05-16 18:17:02 +00:00
parent fb4bc323d3
commit 969c740285
2 changed files with 18 additions and 8 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 after privacyDown and open window
- feature: 48_BlinkCamera: first step to support BlinkMini (no change possible) - feature: 48_BlinkCamera: first step to support BlinkMini (no change possible)
- feature: 82_LGTV_WebOS: add Spotify app support - feature: 82_LGTV_WebOS: add Spotify app support
- change: 93_Log2Syslog: permit content of 'exclErrCond' to fhemLog strings - change: 93_Log2Syslog: permit content of 'exclErrCond' to fhemLog strings

25
fhem/FHEM/73_AutoShuttersControl.pm
View File

@ -1044,9 +1044,14 @@ sub EventProcessingWindowRec {
if ( if (
$match =~ m{[Cc]lose|true}xms $match =~ m{[Cc]lose|true}xms
&& IsAfterShuttersTimeBlocking($shuttersDev) && IsAfterShuttersTimeBlocking($shuttersDev)
&& ( $shutters->getStatus == $shutters->getVentilatePos && (
$shutters->getStatus == $shutters->getVentilatePos
|| $shutters->getStatus == $shutters->getComfortOpenPos || $shutters->getStatus == $shutters->getComfortOpenPos
|| $shutters->getStatus == $shutters->getOpenPos ) || $shutters->getStatus == $shutters->getOpenPos
|| ( $shutters->getStatus == $shutters->getPrivacyDownPos
&& $shutters->getPrivacyDownStatus == 1
&& !$shutters->getIsDay )
)
&& ( $shutters->getVentilateOpen eq 'on' && ( $shutters->getVentilateOpen eq 'on'
|| $ascDev->getAutoShuttersControlComfort eq 'on' ) || $ascDev->getAutoShuttersControlComfort eq 'on' )
) )
@ -3679,7 +3684,7 @@ sub _IsDay {
) ? 1 : 0 ) ? 1 : 0
) if ( $shutters->getDown eq 'brightness' ); ) if ( $shutters->getDown eq 'brightness' );
ASC_Debug( 'FnIsDay: ' ASC_Debug( 'FnIsDay nach Sonnenuntergang / Abends: '
. $shuttersDev . $shuttersDev
. ' getDownBrightness: ' . ' getDownBrightness: '
. $respIsDay . $respIsDay
@ -3688,7 +3693,9 @@ sub _IsDay {
. ' BrightnessMin: ' . ' BrightnessMin: '
. $brightnessMinVal . $brightnessMinVal
. ' Sunset: ' . ' Sunset: '
. $shutters->getSunset ); . $shutters->getSunset
. ' isday: '
. $isday );
##### Nach Sonnenauf / Morgens ##### Nach Sonnenauf / Morgens
$respIsDay = ( $respIsDay = (
@ -3696,14 +3703,14 @@ sub _IsDay {
( (
$shutters->getBrightness > $brightnessMaxVal $shutters->getBrightness > $brightnessMaxVal
&& !$isday && !$isday
&& !$shutters->getSunrise && $shutters->getSunrise
) )
|| $respIsDay || $respIsDay
|| $shutters->getSunrise || $shutters->getSunrise
) ? 1 : 0 ) ? 1 : 0
) if ( $shutters->getUp eq 'brightness' ); ) if ( $shutters->getUp eq 'brightness' );
ASC_Debug( 'FnIsDay: ' ASC_Debug( 'FnIsDay nach Sonnenaufgang / Morgens: '
. $shuttersDev . $shuttersDev
. ' getUpBrightness: ' . ' getUpBrightness: '
. $respIsDay . $respIsDay
@ -3712,7 +3719,9 @@ sub _IsDay {
. ' BrightnessMax: ' . ' BrightnessMax: '
. $brightnessMaxVal . $brightnessMaxVal
. ' Sunrise: ' . ' Sunrise: '
. $shutters->getSunrise ); . $shutters->getSunrise
. ' isday: '
. $isday );
} }
return $respIsDay; return $respIsDay;
@ -8410,7 +8419,7 @@ sub getBlockAscDrivesAfterManual {
], ],
"release_status": "testing", "release_status": "testing",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.8.27", "version": "v0.8.29",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],