From 6c955f9a88f35a1ae0572ee2d55666c87430c806 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Mon, 4 Mar 2019 10:10:53 +0100 Subject: [PATCH] code clean to make faster --- 73_AutoShuttersControl.pm | 90 ++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/73_AutoShuttersControl.pm b/73_AutoShuttersControl.pm index 85b9d0e..86bcac3 100644 --- a/73_AutoShuttersControl.pm +++ b/73_AutoShuttersControl.pm @@ -880,16 +880,20 @@ sub EventProcessingRoommate($@) { Log3( $name, 4, "AutoShuttersControl ($name) - EventProcessingRoommate: $shuttersDev und Events $events" ); + + my $getModeUp = $shutters->getModeUp; + my $getModeDown = $shutters->getModeDown; + my $getRoommatesLastStatus = $shutters->getRoommatesLastStatus if ( ( $1 eq 'home' or $1 eq 'awoken' ) and ( $shutters->getRoommatesStatus eq 'home' or $shutters->getRoommatesStatus eq 'awoken' ) and $ascDev->getAutoShuttersControlMorning eq 'on' - and ( $shutters->getModeUp eq 'home' - or $shutters->getModeUp eq 'always' - or $shutters->getModeDown eq 'home' - or $shutters->getModeDown eq 'always' ) + and ( $getModeUp eq 'home' + or $getModeUp eq 'always' + or $getModeDown eq 'home' + or $getModeDown eq 'always' ) ) { Log3( $name, 4, @@ -897,13 +901,13 @@ sub EventProcessingRoommate($@) { ); if ( ( - $shutters->getRoommatesLastStatus eq 'asleep' - or $shutters->getRoommatesLastStatus eq 'awoken' + $getRoommatesLastStatus eq 'asleep' + or $getRoommatesLastStatus eq 'awoken' ) and IsDay( $hash, $shuttersDev ) and IsAfterShuttersTimeBlocking( $hash, $shuttersDev ) - and ( $shutters->getModeUp eq 'home' - or $shutters->getModeUp eq 'always' ) + and ( $getModeUp eq 'home' + or $getModeUp eq 'always' ) ) { Log3( $name, 4, @@ -916,17 +920,17 @@ sub EventProcessingRoommate($@) { if ( ( - $shutters->getRoommatesLastStatus eq 'absent' - or $shutters->getRoommatesLastStatus eq 'gone' - or $shutters->getRoommatesLastStatus eq 'home' + $getRoommatesLastStatus eq 'absent' + or $getRoommatesLastStatus eq 'gone' + or $getRoommatesLastStatus eq 'home' ) and $shutters->getRoommatesStatus eq 'home' ) { if ( not IsDay( $hash, $shuttersDev ) and IsAfterShuttersTimeBlocking( $hash, $shuttersDev ) - and ( $shutters->getModeDown eq 'home' - or $shutters->getModeDown eq 'always' ) + and ( $getModeDown eq 'home' + or $getModeDown eq 'always' ) ) { my $position; @@ -948,8 +952,8 @@ sub EventProcessingRoommate($@) { elsif ( IsDay( $hash, $shuttersDev ) and $shutters->getStatus == $shutters->getClosedPos and IsAfterShuttersTimeBlocking( $hash, $shuttersDev ) - and ( $shutters->getModeUp eq 'home' - or $shutters->getModeUp eq 'always') ) + and ( $getModeUp eq 'home' + or $getModeUp eq 'always') ) { $shutters->setLastDrive('roommate home'); ShuttersCommandSet( $hash, $shuttersDev, @@ -959,8 +963,8 @@ sub EventProcessingRoommate($@) { } elsif ( ( - $shutters->getModeDown eq 'always' - or $shutters->getModeDown eq 'home' + $getModeDown eq 'always' + or $getModeDown eq 'home' ) and ( $1 eq 'gotosleep' or $1 eq 'asleep' ) and $ascDev->getAutoShuttersControlEvening eq 'on' @@ -982,7 +986,7 @@ sub EventProcessingRoommate($@) { ShuttersCommandSet( $hash, $shuttersDev, $position ); } - elsif ( $shutters->getModeDown eq 'absent' + elsif ( $getModeDown eq 'absent' and $1 eq 'absent' and not IsDay( $hash, $shuttersDev ) ) { @@ -997,6 +1001,10 @@ sub EventProcessingResidents($@) { my $name = $device; my $reading = $ascDev->getResidentsReading; + + my $getModeUp = $shutters->getModeUp; + my $getModeDow = $getModeDown; + my $getResidentsLastStatus = $ascDev->getResidentsLastStatus; if ( $events =~ m#$reading:\s(absent)# ) { foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) { @@ -1008,8 +1016,8 @@ sub EventProcessingResidents($@) { and $shutters->getSelfDefenseExclude eq 'off' or ( ( - $shutters->getModeDown eq 'absent' - or $shutters->getModeDown eq 'always' + $getModeDown eq 'absent' + or $getModeDown eq 'always' ) and not IsDay( $hash, $shuttersDev ) and IsAfterShuttersTimeBlocking( $hash, $shuttersDev ) @@ -1042,10 +1050,10 @@ sub EventProcessingResidents($@) { } elsif ( $events =~ m#$reading:\s(home)# - and ( $ascDev->getResidentsLastStatus eq 'absent' - or $ascDev->getResidentsLastStatus eq 'gone' - or $ascDev->getResidentsLastStatus eq 'asleep' - or $ascDev->getResidentsLastStatus eq 'awoken' ) + and ( $getResidentsLastStatus eq 'absent' + or $getResidentsLastStatus eq 'gone' + or $getResidentsLastStatus eq 'asleep' + or $getResidentsLastStatus eq 'awoken' ) ) { foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) { @@ -1055,10 +1063,10 @@ sub EventProcessingResidents($@) { $shutters->getStatus != $shutters->getClosedPos and not IsDay( $hash, $shuttersDev ) and $shutters->getRoommatesStatus eq 'none' - and ( $shutters->getModeDown eq 'home' - or $shutters->getModeDown eq 'always' ) - and ( $ascDev->getResidentsLastStatus ne 'asleep' - or $ascDev->getResidentsLastStatus ne 'awoken' ) + and ( $getModeDown eq 'home' + or $getModeDown eq 'always' ) + and ( $getResidentsLastStatus ne 'asleep' + or $getResidentsLastStatus ne 'awoken' ) and IsAfterShuttersTimeBlocking( $hash, $shuttersDev ) ) { @@ -1069,10 +1077,10 @@ sub EventProcessingResidents($@) { $ascDev->getSelfDefense eq 'on' and CheckIfShuttersWindowRecOpen($shuttersDev) != 0 and $shutters->getSelfDefenseExclude eq 'off' - or ( $ascDev->getResidentsLastStatus eq 'gone' + or ( $getResidentsLastStatus eq 'gone' and $shutters->getShuttersPlace eq 'terrace' ) - and ( $shutters->getModeUp eq 'absent' - or $shutters->getModeUp eq 'off' ) + and ( $getModeUp eq 'absent' + or $getModeUp eq 'off' ) ) { $shutters->setLastDrive('selfeDefense inactive'); @@ -1085,13 +1093,13 @@ sub EventProcessingResidents($@) { $shutters->getStatus == $shutters->getClosedPos and IsDay( $hash, $shuttersDev ) and $shutters->getRoommatesStatus eq 'none' - and ( $shutters->getModeUp eq 'home' - or $shutters->getModeUp eq 'always' ) + and ( $getModeUp eq 'home' + or $getModeUp eq 'always' ) and IsAfterShuttersTimeBlocking( $hash, $shuttersDev ) ) { - if ( $ascDev->getResidentsLastStatus eq 'asleep' - or $ascDev->getResidentsLastStatus eq 'awoken' ) + if ( $getResidentsLastStatus eq 'asleep' + or $getResidentsLastStatus eq 'awoken' ) { $shutters->setLastDrive('residents awoken'); } @@ -1439,25 +1447,27 @@ sub ShadingProcessing($@) { } if ( $shutters->getShading eq 'out' or $shutters->getShading eq 'in' ) { + my $getShadingPos = $shutters->getShadingPos; + $shutters->setShading( $shutters->getShading ) if ( ( int( gettimeofday() ) - $shutters->getShadingTimestamp ) >= ( $shutters->getShadingWaitingPeriod / 2 ) ); if ( $shutters->getShading eq 'in' - and $shutters->getShadingPos != $shutters->getStatus ) + and $getShadingPos != $shutters->getStatus ) { my $queryShuttersShadingPos = ( $shutters->getShuttersPosCmdValueNegate - ? $shutters->getStatus > $shutters->getShadingPos - : $shutters->getStatus < $shutters->getShadingPos + ? $shutters->getStatus > $getShadingPos + : $shutters->getStatus < $getShadingPos ); $shutters->setLastDrive('shading in'); - ShuttersCommandSet( $hash, $shuttersDev, $shutters->getShadingPos ) + ShuttersCommandSet( $hash, $shuttersDev, $getShadingPos ) if ( not $queryShuttersShadingPos ); } elsif ( $shutters->getShading eq 'out' - and $shutters->getShadingPos == $shutters->getStatus ) + and $getShadingPos == $shutters->getStatus ) { $shutters->setLastDrive('shading out'); ShuttersCommandSet( $hash, $shuttersDev, $shutters->getLastPos );