FHEM/mod-AutoShuttersControl
1
0
Fork 0
Code Issues 12 Pull Requests Releases 9 Wiki Activity

change condition in rain fn

Browse Source 
geändert:       lib/FHEM/Automation/ShuttersControl.pm
This commit is contained in:
Marko Oldenburg 2020-07-08 10:45:49 +02:00
parent 11870789e1
commit b6bb0af471
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controls_AutoShuttersControl.txt
View File

@ -1,11 +1,11 @@
UPD 2020-07-07_14:49:19 97041 FHEM/73_AutoShuttersControl.pm UPD 2020-07-07_14:49:19 97041 FHEM/73_AutoShuttersControl.pm
UPD 2020-07-08_10:33:04 178055 lib/FHEM/Automation/ShuttersControl.pm UPD 2020-07-08_10:44:54 178067 lib/FHEM/Automation/ShuttersControl.pm
UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2020-07-07_14:49:19 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2020-07-07_14:49:19 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2020-07-07_14:49:19 30710 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2020-07-07_14:49:19 30710 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-07-07_14:49:19 17908 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2020-07-07_14:49:19 17908 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2020-07-08_10:27:47 11567 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2020-07-08_10:45:35 11567 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2020-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm UPD 2020-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
UPD 2020-07-03_11:29:10 52390 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm UPD 2020-07-03_11:29:10 52390 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
UPD 2020-06-22_09:41:40 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm UPD 2020-06-22_09:41:40 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm

8
lib/FHEM/Automation/ShuttersControl.pm
View File

@ -1789,17 +1789,17 @@ sub EventProcessingRain {
my $closedPos = $ascDev->getRainSensorShuttersClosedPos; my $closedPos = $ascDev->getRainSensorShuttersClosedPos;
if ( $1 eq 'rain' ) { $val = $triggerMax + 1 } if ( $1 eq 'rain' ) { $val = $triggerMax + 1 }
elsif ( $1 eq 'dry' ) { $val = $triggerMin - 1 } elsif ( $1 eq 'dry' ) { $val = $triggerMin }
else { $val = $1 } else { $val = $1 }
RainProtection( $hash, $val, $triggerMax, $closedPos ); RainProtection( $hash, $val, $triggerMax, $triggerMin, $closedPos );
} }
return; return;
} }
sub RainProtection { sub RainProtection {
my ( $hash, $val, $triggerMax, $closedPos ) = @_; my ( $hash, $val, $triggerMax, $triggerMin, $closedPos ) = @_;
for my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) { for my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
@ -1816,7 +1816,7 @@ sub RainProtection {
$shutters->setDriveCmd($closedPos); $shutters->setDriveCmd($closedPos);
$shutters->setRainProtectionStatus('protected'); $shutters->setRainProtectionStatus('protected');
} }
elsif (( $val == 0 || $val < $shutters->getWindMin ) elsif (( $val == 0 || $val < $triggerMin )
&& $shutters->getStatus == $closedPos && $shutters->getStatus == $closedPos
&& IsAfterShuttersManualBlocking($shuttersDev) && IsAfterShuttersManualBlocking($shuttersDev)
&& $shutters->getRainProtectionStatus eq 'protected' ) && $shutters->getRainProtectionStatus eq 'protected' )