FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

73_AutoShuttersControl: fix SleepPos conditions in residents and roommates Fn

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21423 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2020-03-14 15:58:32 +00:00
parent 5710e18fa0
commit 2eed8b1bec
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# 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 SleepPos conditions in residents
and roommates Fn
- feature: 73_DoorBird: Manual Video_Request - feature: 73_DoorBird: Manual Video_Request
- change: 59_WUup: use UConv to calculate solarradiation from lux to W/m² - change: 59_WUup: use UConv to calculate solarradiation from lux to W/m²
- change: 74_AMADDevice: add logreport is attribut fhemServerIP not set - change: 74_AMADDevice: add logreport is attribut fhemServerIP not set

18
fhem/FHEM/73_AutoShuttersControl.pm
View File

@ -1274,13 +1274,14 @@ sub EventProcessingRoommate($@) {
or $shutters->getShadingMode eq 'absent' or $shutters->getShadingMode eq 'absent'
) )
and ( $shutters->getStatus == $shutters->getClosedPos and ( $shutters->getStatus == $shutters->getClosedPos
or $shutters->getStatus == or $shutters->getStatus == $shutters->getSleepPos
$shutters->getShadingPos ) or $shutters->getStatus == $shutters->getShadingPos )
) )
{ {
$shutters->setLastDrive( $shutters->setLastDrive(
( (
$shutters->getStatus == $shutters->getClosedPos ( $shutters->getStatus == $shutters->getClosedPos
or $shutters->getStatus == $shutters->getSleepPos)
? 'roommate come home' ? 'roommate come home'
: 'shading out' : 'shading out'
) )
@ -1439,7 +1440,8 @@ sub EventProcessingResidents($@) {
my $getModeDown = $shutters->getModeDown; my $getModeDown = $shutters->getModeDown;
if ( if (
$shutters->getStatus != $shutters->getClosedPos ( $shutters->getStatus != $shutters->getClosedPos
or $shutters->getStatus != $shutters->getSleepPos )
and not $shutters->getIsDay and not $shutters->getIsDay
and $shutters->getRoommatesStatus eq 'none' and $shutters->getRoommatesStatus eq 'none'
and ( $getModeDown eq 'home' and ( $getModeDown eq 'home'
@ -1502,7 +1504,8 @@ sub EventProcessingResidents($@) {
and not $shutters->getSelfDefenseAbsent and not $shutters->getSelfDefenseAbsent
and $shutters->getSelfDefenseAbsentTimerrun ); and $shutters->getSelfDefenseAbsentTimerrun );
if ( $shutters->getStatus == $shutters->getClosedPos if ( ( $shutters->getStatus == $shutters->getClosedPos
or $shutters->getStatus == $shutters->getSleepPos )
and $shutters->getIsDay ) and $shutters->getIsDay )
{ {
$shutters->setHardLockOut('on') $shutters->setHardLockOut('on')
@ -1525,7 +1528,8 @@ sub EventProcessingResidents($@) {
} }
} }
elsif ( elsif (
$shutters->getStatus == $shutters->getClosedPos ( $shutters->getStatus == $shutters->getClosedPos
or $shutters->getStatus == $shutters->getSleepPos )
and $shutters->getIsDay and $shutters->getIsDay
and $shutters->getRoommatesStatus eq 'none' and $shutters->getRoommatesStatus eq 'none'
and ( $getModeUp eq 'home' and ( $getModeUp eq 'home'
@ -7905,7 +7909,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "testing", "release_status": "testing",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.8.17", "version": "v0.8.18",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],