73_AutoShuttersControl: fix bug in Sunrise Drive if SelfDefense set

git-svn-id: https://svn.fhem.de/fhem/trunk@22728 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2020-09-04 06:43:56 +00:00
parent d959086f61
commit bf08f943a7
3 changed files with 3 additions and 4 deletions

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 in Sunrise Drive if SelfDefense set
- change: 50_TelegramBot: channels, versionid, keyboard / favorite fixes - change: 50_TelegramBot: channels, versionid, keyboard / favorite fixes
- change: 93_DbRep: commandRef revised - change: 93_DbRep: commandRef revised
- change: 76_SMAPortal: avoid deletion of readings if provider is selected - change: 76_SMAPortal: avoid deletion of readings if provider is selected

View File

@ -1258,7 +1258,7 @@ sub Initialize {
], ],
"release_status": "testing", "release_status": "testing",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.10.7", "version": "v0.10.8",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],

View File

@ -1435,10 +1435,8 @@ sub SunRiseShuttersAfterTimerFn {
&& ( $shutters->getSelfDefenseMode eq 'gone' && ( $shutters->getSelfDefenseMode eq 'gone'
|| $shutters->getSelfDefenseMode eq 'absent' ) || $shutters->getSelfDefenseMode eq 'absent' )
&& $ascDev->getResidentsStatus ne 'gone' && $ascDev->getResidentsStatus ne 'gone'
&& $ascDev->getResidentsStatus ne 'absent'
) )
|| ( $ascDev->getSelfDefense eq 'on'
&& $shutters->getSelfDefenseMode eq 'absent'
&& $ascDev->getResidentsStatus ne 'absent' )
) )
&& ( && (
$shutters->getUp ne 'brightness' $shutters->getUp ne 'brightness'