Merge branch 'patch_master-multisensor' into devel

This commit is contained in:
Marko Oldenburg 2020-07-06 09:35:52 +02:00
commit b928c021c2
2 changed files with 17 additions and 13 deletions

View File

@ -1,9 +1,9 @@
UPD 2020-07-04_11:19:49 97041 FHEM/73_AutoShuttersControl.pm
UPD 2020-07-04_11:21:49 177739 lib/FHEM/Automation/ShuttersControl.pm
UPD 2020-07-06_09:34:25 97041 FHEM/73_AutoShuttersControl.pm
UPD 2020-07-06_09:34:32 177818 lib/FHEM/Automation/ShuttersControl.pm
UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2020-07-04_11:19:49 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2020-07-04_11:19:49 30710 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-07-04_11:19:49 17908 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2020-07-06_09:34:25 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2020-07-06_09:34:25 30710 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-07-06_09:34:25 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 11454 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2020-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm

View File

@ -537,20 +537,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' );