FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

73_AutoShuttersControl: fix shading in drive then shutter is closed

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22547 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2020-08-06 12:40:12 +00:00
parent fb6ad6da9d
commit 704c44b231
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
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 shading in drive then shutter is closed
- change: 32_withings: added sleep apnea index reading - change: 32_withings: added sleep apnea index reading
- bugfix: 48_BlinkCamera: Active/Enabled handling to new format - bugfix: 48_BlinkCamera: Active/Enabled handling to new format
- bugfix: 52_I2C_HDC1008: "temperature" reading now works correctly with - bugfix: 52_I2C_HDC1008: "temperature" reading now works correctly with

2
fhem/FHEM/73_AutoShuttersControl.pm
View File

@ -1258,7 +1258,7 @@ sub Initialize {
], ],
"release_status": "testing", "release_status": "testing",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.10.5", "version": "v0.10.6",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],

7
fhem/lib/FHEM/Automation/ShuttersControl/Shading.pm
View File

@ -513,6 +513,7 @@ sub ShadingProcessing {
sub ShadingProcessingDriveCommand { sub ShadingProcessingDriveCommand {
my $hash = shift; my $hash = shift;
my $shuttersDev = shift; my $shuttersDev = shift;
my $marker = shift // 0;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$FHEM::Automation::ShuttersControl::shutters->setShuttersDev($shuttersDev); $FHEM::Automation::ShuttersControl::shutters->setShuttersDev($shuttersDev);
@ -527,7 +528,11 @@ sub ShadingProcessingDriveCommand {
if ( IsInTime($FHEM::Automation::ShuttersControl::shutters->getShadingBetweenTheTime) if ( IsInTime($FHEM::Automation::ShuttersControl::shutters->getShadingBetweenTheTime)
&& $FHEM::Automation::ShuttersControl::shutters->getShadingStatus eq 'in' && $FHEM::Automation::ShuttersControl::shutters->getShadingStatus eq 'in'
&& $getShadingPos != $getStatus && $getShadingPos != $getStatus
&& $getStatus != $FHEM::Automation::ShuttersControl::shutters->getClosedPos && ( $getStatus != $FHEM::Automation::ShuttersControl::shutters->getClosedPos
|| ( $getStatus == $FHEM::Automation::ShuttersControl::shutters->getClosedPos
&& $marker
)
)
&& ( && (
FHEM::Automation::ShuttersControl::CheckIfShuttersWindowRecOpen( FHEM::Automation::ShuttersControl::CheckIfShuttersWindowRecOpen(
$shuttersDev) != 2 $shuttersDev) != 2