73_AutoShuttersControl: fix SelfDefense then drive day open

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@20898 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2020-01-06 14:40:39 +00:00
parent 2c95df7b25
commit ecd0fbd777
2 changed files with 7 additions and 1 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 SelfDefense then drive day open
- bugfix: 73_AutoShuttersControl: fix adv icon for devStateIcon - bugfix: 73_AutoShuttersControl: fix adv icon for devStateIcon
- feature: 51_MOBILEALERTS.pm: Added batteryState - feature: 51_MOBILEALERTS.pm: Added batteryState
- bugfix: 93_DbLog: fix change off V4.9.4 in default splitting. Forum:#106992 - bugfix: 93_DbLog: fix change off V4.9.4 in default splitting. Forum:#106992

View File

@ -3092,7 +3092,12 @@ sub SunRiseShuttersAfterTimerFn($) {
$ascDev->getSelfDefense eq 'off' $ascDev->getSelfDefense eq 'off'
or $shutters->getSelfDefenseMode eq 'off' or $shutters->getSelfDefenseMode eq 'off'
or ( $ascDev->getSelfDefense eq 'on' or ( $ascDev->getSelfDefense eq 'on'
and ($shutters->getSelfDefenseMode eq 'gone'
or $shutters->getSelfDefenseMode eq 'absent')
and $ascDev->getResidentsStatus ne 'gone' ) and $ascDev->getResidentsStatus ne 'gone' )
or ( $ascDev->getSelfDefense eq 'on'
and $shutters->getSelfDefenseMode eq 'absent'
and $ascDev->getResidentsStatus ne 'absent' )
) )
and ( and (
$shutters->getUp ne 'brightness' $shutters->getUp ne 'brightness'
@ -7916,7 +7921,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.8.10", "version": "v0.8.11",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],