From 17f8fef44971a16f671c462a9f89d283c4cc215e Mon Sep 17 00:00:00 2001 From: LeonGaultier Date: Thu, 27 Feb 2020 07:40:01 +0000 Subject: [PATCH] 73_AutoShuttersControl.pm: fix SleepPosition in Fn Residents git-svn-id: https://svn.fhem.de/fhem/trunk@21284 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/73_AutoShuttersControl.pm | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index fd1e0f02a..6aa7d6fd6 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - bugfix: 73_AutoShuttersControl.pm: fix SleepPosition in Fn Residents - bugfix: 88_HMCCU: Fixed set datapoint command - feature: 32_withings: initial support for ecg and heart sounds data - change: 49_SSCam: set compatibility to SVS version 8.2.7 diff --git a/fhem/FHEM/73_AutoShuttersControl.pm b/fhem/FHEM/73_AutoShuttersControl.pm index 92dd774cd..236499914 100644 --- a/fhem/FHEM/73_AutoShuttersControl.pm +++ b/fhem/FHEM/73_AutoShuttersControl.pm @@ -1233,7 +1233,11 @@ sub EventProcessingRoommate($@) { $posValue = ( $shutters->getSleepPos > 0 ? $shutters->getSleepPos - : $shutters->getClosedPos + : ( + $shutters->getSleepPos > 0 + ? $shutters->getSleepPos + : $shutters->getClosedPos + ) ); } else { @@ -1447,7 +1451,7 @@ sub EventProcessingResidents($@) { ) { $shutters->setLastDrive('residents come home'); - $shutters->setDriveCmd( $shutters->getClosedPos ); + $shutters->setDriveCmd( ($shutters->getSleepPos > 0 ? $shutters->getSleepPos : $shutters->getClosedPos) ); } elsif ( ( @@ -1651,7 +1655,11 @@ sub EventProcessingWind($@) { : ( $shutters->getPrivacyDownStatus == 2 ? $shutters->getPrivacyDownPos - : $shutters->getClosedPos + : ( + $shutters->getSleepPos > 0 + ? $shutters->getSleepPos + : $shutters->getClosedPos + ) ) ) ); @@ -7897,7 +7905,7 @@ sub getblockAscDrivesAfterManual { ], "release_status": "testing", "license": "GPL_2", - "version": "v0.8.16", + "version": "v0.8.17", "author": [ "Marko Oldenburg " ],