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 brightness morning drive in with roomate condition

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20531 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2019-11-18 06:21:35 +00:00
parent 153f357fcd
commit c46cc99b97
2 changed files with 18 additions and 19 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 brightness morning drive in with
roommate condition
- bugfix: 98_weekprofile: time calculation with float - bugfix: 98_weekprofile: time calculation with float
- bugfix: 98_weekprofile: HM-TC-IT-WM-W-EU with CCU - bugfix: 98_weekprofile: HM-TC-IT-WM-W-EU with CCU
- feature: 70_KODI: pad channel and channelgroup readings with zeros to - feature: 70_KODI: pad channel and channelgroup readings with zeros to

29
fhem/FHEM/73_AutoShuttersControl.pm
View File

@ -1831,27 +1831,24 @@ sub EventProcessingBrightness($@) {
or $shutters->getModeUp eq 'always' or $shutters->getModeUp eq 'always'
) )
{ {
## Setzt den PrivacyDown Modus für die Sichtschutzfahrt auf den Status 0 my $roommatestatus = $shutters->getRoommatesStatus;
## 1 bedeutet das PrivacyDown Timer aktiviert wurde, 2 beudet das er im privacyDown ist
## also das Rollo in privacyDown Position steht und VOR der endgültigen Nachfahrt
# $shutters->setPrivacyUpStatus(0)
# if ( not defined( $shutters->getPrivacyUpStatus ) );
if ( if (
( $roommatestatus eq 'home'
$shutters->getRoommatesStatus eq 'home' or $roommatestatus eq 'awoken'
or $shutters->getRoommatesStatus eq 'awoken' or $roommatestatus eq 'absent'
or $shutters->getRoommatesStatus eq 'absent' or $roommatestatus eq 'gone'
or $shutters->getRoommatesStatus eq 'gone' or $roommatestatus eq 'none'
or $shutters->getRoommatesStatus eq 'none' and (
) $ascDev->getSelfDefense eq 'off'
and $ascDev->getSelfDefense eq 'off'
or ( $ascDev->getSelfDefense eq 'on' or ( $ascDev->getSelfDefense eq 'on'
and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 ) and CheckIfShuttersWindowRecOpen($shuttersDev) ==
0 )
or ( $ascDev->getSelfDefense eq 'on' or ( $ascDev->getSelfDefense eq 'on'
and CheckIfShuttersWindowRecOpen($shuttersDev) != 0 and CheckIfShuttersWindowRecOpen($shuttersDev) != 0
and $ascDev->getResidentsStatus eq 'home' ) and $ascDev->getResidentsStatus eq 'home' )
) )
)
{ {
if ( $brightnessPrivacyUpVal > 0 if ( $brightnessPrivacyUpVal > 0
@ -1872,7 +1869,7 @@ sub EventProcessingBrightness($@) {
ASC_Debug( 'EventProcessingBrightness: ' ASC_Debug( 'EventProcessingBrightness: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
. ' - Verarbeitung für Sunset Privacy Down. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnShuttersCommandSet gesendet. Grund des fahrens: ' . ' - Verarbeitung für Sunrise Privacy Down. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnShuttersCommandSet gesendet. Grund des fahrens: '
. $shutters->getLastDrive ); . $shutters->getLastDrive );
CreateSunRiseSetShuttersTimer( $hash, $shuttersDev ); CreateSunRiseSetShuttersTimer( $hash, $shuttersDev );
@ -7779,7 +7776,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.8.1", "version": "v0.8.2",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],