From 109a67e38810fd9e0fe9c346f66da7ccac9047d3 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Mon, 29 Jun 2020 09:02:12 +0200 Subject: [PATCH] change ExternalTriggerState to ExternalTriggerStatus remove getExternalTriggerState from lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm and add in lib/FHEM/Automation/ShuttersControl/Shutters.pm as getExternalTriggerStatus --- FHEM/73_AutoShuttersControl.pm | 2 +- controls_AutoShuttersControl.txt | 8 +++--- lib/FHEM/Automation/ShuttersControl.pm | 6 ++--- .../Automation/ShuttersControl/Shutters.pm | 26 ++++++++++++++----- .../ShuttersControl/Shutters/Attr.pm | 14 ---------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/FHEM/73_AutoShuttersControl.pm b/FHEM/73_AutoShuttersControl.pm index 637ea2a..b925843 100644 --- a/FHEM/73_AutoShuttersControl.pm +++ b/FHEM/73_AutoShuttersControl.pm @@ -1030,7 +1030,7 @@ sub Initialize { ExternalTriggerPosActiveRolloposition welche angefahren werden soll wenn der erste externe Trigger aktiv wird. ExternalTriggerPosActive2Rolloposition welche angefahren werden soll wenn der zweite externe Trigger aktiv wird. ExternalTriggerPosInactiveRolloposition welche angefahren werden soll wenn der externe Trigger inaktiv wird. - ExternalTriggerStateaktueller Status des externen Triggers, 0 oder 1 + ExternalTriggerStatusaktueller Status des externen Triggers, 0 oder 1 Delaykonfigurierte Verzögerungswert welcher für die Zufallsberechnung werwendet werden soll DelayStartkonfigurierter fester Verzögerungswert BlockingTimeAfterManualkonfigurierte Blockzeit nach einer manuellen Fahrt diff --git a/controls_AutoShuttersControl.txt b/controls_AutoShuttersControl.txt index 390ef41..2901463 100644 --- a/controls_AutoShuttersControl.txt +++ b/controls_AutoShuttersControl.txt @@ -1,12 +1,12 @@ -UPD 2020-06-24_08:13:07 97823 FHEM/73_AutoShuttersControl.pm -UPD 2020-06-24_13:25:11 187106 lib/FHEM/Automation/ShuttersControl.pm +UPD 2020-06-29_08:37:58 97824 FHEM/73_AutoShuttersControl.pm +UPD 2020-06-29_08:37:18 187109 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 2493 lib/FHEM/Automation/ShuttersControl/Roommate.pm -UPD 2020-06-22_09:41:40 29833 lib/FHEM/Automation/ShuttersControl/Shutters.pm +UPD 2020-06-29_08:36:08 30157 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2020-06-22_09:41:40 11454 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2020-06-22_09:41:40 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm -UPD 2020-06-22_09:41:40 52661 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm +UPD 2020-06-29_08:36:04 52344 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 3972 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm UPD 2020-06-22_09:41:40 2288 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm diff --git a/lib/FHEM/Automation/ShuttersControl.pm b/lib/FHEM/Automation/ShuttersControl.pm index 476a25b..23484f6 100644 --- a/lib/FHEM/Automation/ShuttersControl.pm +++ b/lib/FHEM/Automation/ShuttersControl.pm @@ -2909,13 +2909,13 @@ sub EventProcessingExternalTriggerDevice { if ( $1 eq $triggerValActive2 ) { $shutters->setLastDrive('external trigger2 device active'); $shutters->setNoDelay(1); - $shutters->setExternalTriggerState(1); + $shutters->setExternalTriggerStatus(1); ShuttersCommandSet( $hash, $shuttersDev, $triggerPosActive2 ); } else { $shutters->setLastDrive('external trigger device active'); $shutters->setNoDelay(1); - $shutters->setExternalTriggerState(1); + $shutters->setExternalTriggerStatus(1); ShuttersCommandSet( $hash, $shuttersDev, $triggerPosActive ); } } @@ -2933,7 +2933,7 @@ sub EventProcessingExternalTriggerDevice { $shutters->setLastDrive('external trigger device inactive'); $shutters->setNoDelay(1); - $shutters->setExternalTriggerState(1); + $shutters->setExternalTriggerStatus(1); ShuttersCommandSet( $hash, $shuttersDev, diff --git a/lib/FHEM/Automation/ShuttersControl/Shutters.pm b/lib/FHEM/Automation/ShuttersControl/Shutters.pm index 8a82c9f..3721b5b 100644 --- a/lib/FHEM/Automation/ShuttersControl/Shutters.pm +++ b/lib/FHEM/Automation/ShuttersControl/Shutters.pm @@ -168,7 +168,7 @@ sub setDriveCmd { $posValue) && !$FHEM::Automation::ShuttersControl::shutters->getAdvDelay && !$FHEM::Automation::ShuttersControl::shutters - ->getExternalTriggerState + ->getExternalTriggerStatus && !$FHEM::Automation::ShuttersControl::shutters ->getSelfDefenseState ) @@ -177,9 +177,9 @@ sub setDriveCmd { $FHEM::Automation::ShuttersControl::shutters->setDelayCmd($posValue); $FHEM::Automation::ShuttersControl::ascDev->setDelayCmdReading; $FHEM::Automation::ShuttersControl::shutters->setNoDelay(0); - $FHEM::Automation::ShuttersControl::shutters->setExternalTriggerState(0) + $FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus(0) if ( $FHEM::Automation::ShuttersControl::shutters - ->getExternalTriggerState ); + ->getExternalTriggerStatus ); FHEM::Automation::ShuttersControl::ASC_Debug( 'setDriveCmd: ' . $FHEM::Automation::ShuttersControl::shutters->getShuttersDev @@ -193,9 +193,9 @@ sub setDriveCmd { if ( $FHEM::Automation::ShuttersControl::shutters->getDelayCmd ne 'none' ) ; # setzt den Wert auf none da der Rolladen nun gesteuert werden kann. - $FHEM::Automation::ShuttersControl::shutters->setExternalTriggerState(0) + $FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus(0) if ( $FHEM::Automation::ShuttersControl::shutters - ->getExternalTriggerState ); + ->getExternalTriggerStatus ); ### antifreeze Routine if ( $FHEM::Automation::ShuttersControl::shutters->getAntiFreezeStatus > @@ -453,6 +453,20 @@ sub setAdvDelay { return; } +sub getExternalTriggerStatus { + my $self = shift; + + return ( + ( + defined( + $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{event} + ) + and + $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{event} + ) ? 1 : 0 + ); +} + sub getHomemode { my $self = shift; @@ -872,7 +886,7 @@ sub setRainProtectionStatus { # Werte protected, unprotected return; } -sub setExternalTriggerState { +sub setExternalTriggerStatus { my $self = shift; my $value = shift; diff --git a/lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm b/lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm index 6126ab8..a58eeb0 100644 --- a/lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm +++ b/lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm @@ -1198,20 +1198,6 @@ sub getExternalTriggerPosInactive { ->{posinactive}; } -sub getExternalTriggerState { - my $self = shift; - - return ( - ( - defined( - $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{event} - ) - and - $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{event} - ) ? 1 : 0 - ); -} - sub setDelay { my $self = shift; my $attrVal = shift;