From 5df984048dc1ccde9e09ba9f58c47627eb708eba Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Mon, 6 Jul 2020 09:32:22 +0200 Subject: [PATCH] add condition in Fn EventProcessingGeneral to differentiate ASC device and other sensor device in NOTIFYDEV --- controls_AutoShuttersControl.txt | 8 ++++---- lib/FHEM/Automation/ShuttersControl.pm | 20 ++++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/controls_AutoShuttersControl.txt b/controls_AutoShuttersControl.txt index 7421f37..3671beb 100644 --- a/controls_AutoShuttersControl.txt +++ b/controls_AutoShuttersControl.txt @@ -1,8 +1,8 @@ -UPD 2020-07-04_11:01:19 96885 FHEM/73_AutoShuttersControl.pm -UPD 2020-07-04_11:13:41 188533 lib/FHEM/Automation/ShuttersControl.pm +UPD 2020-07-04_11:24:56 96885 FHEM/73_AutoShuttersControl.pm +UPD 2020-07-06_09:31:49 188612 lib/FHEM/Automation/ShuttersControl.pm UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm -UPD 2020-07-04_11:01:19 2493 lib/FHEM/Automation/ShuttersControl/Roommate.pm -UPD 2020-07-04_11:01:19 30157 lib/FHEM/Automation/ShuttersControl/Shutters.pm +UPD 2020-07-04_11:24:56 2493 lib/FHEM/Automation/ShuttersControl/Roommate.pm +UPD 2020-07-04_11:24:56 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-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm diff --git a/lib/FHEM/Automation/ShuttersControl.pm b/lib/FHEM/Automation/ShuttersControl.pm index 5dbad8b..ff35d9e 100644 --- a/lib/FHEM/Automation/ShuttersControl.pm +++ b/lib/FHEM/Automation/ShuttersControl.pm @@ -519,20 +519,24 @@ sub EventProcessingGeneral { while ( my ( $device, $deviceAttr ) = each %{ $hash->{monitoredDevs}{$devname} } ) { + if ( $devname eq $name ) { + EventProcessingResidents( $hash, $device, $events ) + if ( $deviceAttr eq 'ASC_residentsDev' ); + EventProcessingRain( $hash, $device, $events ) + if ( $deviceAttr eq 'ASC_rainSensor' ); + EventProcessingWind( $hash, $device, $events ) + if ( $deviceAttr eq 'ASC_windSensor' ); + EventProcessingTwilightDevice( $hash, $device, $events ) + if ( $deviceAttr eq 'ASC_twilightDevice' ); + } + EventProcessingWindowRec( $hash, $device, $events ) if ( $deviceAttr eq 'ASC_WindowRec' ) ; # ist es ein Fensterdevice wird die Funktion gestartet EventProcessingRoommate( $hash, $device, $events ) if ( $deviceAttr eq 'ASC_Roommate_Device' ) ; # ist es ein Bewohner Device wird diese Funktion gestartet - EventProcessingResidents( $hash, $device, $events ) - if ( $deviceAttr eq 'ASC_residentsDev' ); - EventProcessingRain( $hash, $device, $events ) - if ( $deviceAttr eq 'ASC_rainSensor' ); - EventProcessingWind( $hash, $device, $events ) - if ( $deviceAttr eq 'ASC_windSensor' ); - EventProcessingTwilightDevice( $hash, $device, $events ) - if ( $deviceAttr eq 'ASC_twilightDevice' ); + EventProcessingExternalTriggerDevice( $hash, $device, $events ) if ( $deviceAttr eq 'ASC_ExternalTrigger' );