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 selfdefense bug

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20609 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2019-11-28 12:27:27 +00:00
parent 07b164a1c0
commit dc4e37b8d6
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,6 +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 selfdefense bug
- bugfix: 73_AutoShuttersControl: fix time format problem - bugfix: 73_AutoShuttersControl: fix time format problem
- feature: 73_DoorBird: Videos File Format as Attribute - feature: 73_DoorBird: Videos File Format as Attribute
- bugfix: 71_COE_Node: decimal for kWh fixed - bugfix: 71_COE_Node: decimal for kWh fixed

24
fhem/FHEM/73_AutoShuttersControl.pm
View File

@ -1809,6 +1809,12 @@ sub EventProcessingBrightness($@) {
and $shutters->getUp eq 'brightness' and $shutters->getUp eq 'brightness'
and not $shutters->getSunrise and not $shutters->getSunrise
and $ascDev->getAutoShuttersControlMorning eq 'on' and $ascDev->getAutoShuttersControlMorning eq 'on'
and (
$ascDev->getSelfDefense eq 'off'
or $shutters->getSelfDefenseMode eq 'off'
or ( $ascDev->getSelfDefense eq 'on'
and $ascDev->getResidentsStatus ne 'gone' )
)
) )
{ {
Log3( $name, 4, Log3( $name, 4,
@ -1989,10 +1995,18 @@ sub EventProcessingBrightness($@) {
} }
$shutters->setLastDrive($lastDrive); $shutters->setLastDrive($lastDrive);
$shutters->setSunrise(0);
$shutters->setSunset(1) if ( $shutters->getPrivacyDownStatus != 2
unless ( $shutters->getPrivacyDownStatus == 2 and $posValue != $shutters->getStatus )
or $posValue == $shutters->getStatus ); {
print( 'ASC_DEBUG!!! PrivacyStatus_2: '
. $shutters->getPrivacyDownStatus
. ' Innerhalb der unless Abfrage'
. "\n" );
$shutters->setSunrise(0);
$shutters->setSunset(1);
}
$shutters->setPrivacyDownStatus(0) $shutters->setPrivacyDownStatus(0)
if ( $shutters->getPrivacyDownStatus == 2 ); if ( $shutters->getPrivacyDownStatus == 2 );
ShuttersCommandSet( $hash, $shuttersDev, $posValue ); ShuttersCommandSet( $hash, $shuttersDev, $posValue );
@ -7776,7 +7790,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.8.4", "version": "v0.8.5",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],