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

fix wrong fn call

Browse Source
This commit is contained in:
Marko Oldenburg
2020-07-09 09:23:44 +02:00
parent 684f91b697
commit 84da158b64
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controls_AutoShuttersControl.txt
View File

@ -1,10 +1,10 @@
UPD 2020-07-08_22:02:31 97041 FHEM/73_AutoShuttersControl.pm UPD 2020-07-08_22:02:31 97041 FHEM/73_AutoShuttersControl.pm
UPD 2020-07-09_08:56:22 74011 lib/FHEM/Automation/ShuttersControl.pm UPD 2020-07-09_09:13:47 74011 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-08_22:06:53 30760 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2020-07-08_22:06:53 30760 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-07-09_08:19:25 23216 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2020-07-09_08:19:25 23216 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2020-07-09_09:02:08 107835 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2020-07-09_09:23:31 108076 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2020-07-09_08:18:54 44235 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2020-07-09_08:18:54 44235 lib/FHEM/Automation/ShuttersControl/Helper.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_22:06:53 11569 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2020-07-08_22:06:53 11569 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm

25
lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
View File

@ -45,6 +45,8 @@ use warnings;
use POSIX qw(strftime); use POSIX qw(strftime);
use utf8; use utf8;
use Data::Dumper; #only for Debugging
use FHEM::Automation::ShuttersControl::Helper qw (:ALL); use FHEM::Automation::ShuttersControl::Helper qw (:ALL);
use FHEM::Automation::ShuttersControl::Shading qw (:ALL); use FHEM::Automation::ShuttersControl::Shading qw (:ALL);
@ -75,6 +77,9 @@ BEGIN {
Log3 Log3
gettimeofday gettimeofday
computeAlignTime computeAlignTime
CommandSet
ReadingsVal
RemoveInternalTimer
) )
); );
} }
@ -141,7 +146,7 @@ sub EventProcessingGeneral {
\s(.*)$}xms \s(.*)$}xms
) )
{ # wurde den Attributen unserer Rolläden ein Wert zugewiesen ? { # wurde den Attributen unserer Rolläden ein Wert zugewiesen ?
AddNotifyDev( $hash, $3, $1, $2 ) if ( $3 ne 'none' ); FHEM::Automation::ShuttersControl::AddNotifyDev( $hash, $3, $1, $2 ) if ( $3 ne 'none' );
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($name) - EventProcessing: ATTR" ); "AutoShuttersControl ($name) - EventProcessing: ATTR" );
} }
@ -156,7 +161,7 @@ sub EventProcessingGeneral {
{ # wurde das Attribut unserer Rolläden gelöscht ? { # wurde das Attribut unserer Rolläden gelöscht ?
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($name) - EventProcessing: DELETEATTR" ); "AutoShuttersControl ($name) - EventProcessing: DELETEATTR" );
DeleteNotifyDev( $hash, $1, $2 ); FHEM::Automation::ShuttersControl::DeleteNotifyDev( $hash, $1, $2 );
} }
elsif ( elsif (
$events =~ m{^(DELETEATTR|ATTR) $events =~ m{^(DELETEATTR|ATTR)
@ -183,7 +188,7 @@ sub EventProcessingGeneral {
(.*)?}xms (.*)?}xms
) )
{ {
RenewSunRiseSetShuttersTimer($hash); FHEM::Automation::ShuttersControl::RenewSunRiseSetShuttersTimer($hash);
} }
if ( if (
@ -2130,17 +2135,17 @@ sub EventProcessingTwilightDevice {
. $FHEM::Automation::ShuttersControl::shutters->getShuttersDev . $FHEM::Automation::ShuttersControl::shutters->getShuttersDev
. ' RainProtection: ' . ' RainProtection: '
. $FHEM::Automation::ShuttersControl::shutters . $FHEM::Automation::ShuttersControl::shutters
->getRainProtectionStatus ->getRainProtectionStatus
. ' WindProtection: ' . ' WindProtection: '
. $FHEM::Automation::ShuttersControl::shutters . $FHEM::Automation::ShuttersControl::shutters
->getWindProtectionStatus ); ->getWindProtectionStatus );
if ( $FHEM::Automation::ShuttersControl::ascDev if ( $FHEM::Automation::ShuttersControl::ascDev
->getAutoShuttersControlShading eq 'on' ->getAutoShuttersControlShading eq 'on'
&& $FHEM::Automation::ShuttersControl::shutters && $FHEM::Automation::ShuttersControl::shutters
->getRainProtectionStatus eq 'unprotected' ->getRainProtectionStatus eq 'unprotected'
&& $FHEM::Automation::ShuttersControl::shutters && $FHEM::Automation::ShuttersControl::shutters
->getWindProtectionStatus eq 'unprotected' ) ->getWindProtectionStatus eq 'unprotected' )
{ {
ShadingProcessing( ShadingProcessing(
$hash, $hash,
@ -2218,7 +2223,7 @@ sub EventProcessingPartyMode {
} }
} }
elsif ( elsif (
$FHEM::Automation::ShuttersControl::shutters->getDelayCmd ne 'none' $FHEM::Automation::ShuttersControl::shutters->getDelayCmd ne 'none'
&& $FHEM::Automation::ShuttersControl::shutters->getIsDay && $FHEM::Automation::ShuttersControl::shutters->getIsDay
&& IsAfterShuttersManualBlocking($shuttersDev) ) && IsAfterShuttersManualBlocking($shuttersDev) )
{ {