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

Merge branch 'patch_master-multisensor' into devel

Browse Source
This commit is contained in:
Marko Oldenburg
2020-07-07 14:42:17 +02:00
parent 1efe3b576c daf94c9483
commit 4ffcc1a7ef
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/FHEM/Automation/ShuttersControl.pm
View File

@ -534,18 +534,23 @@ sub EventProcessingGeneral {
if ( defined($devname) && ($devname) )
{ # es wird lediglich der Devicename der Funktion mitgegeben wenn es sich nicht um global handelt daher hier die Unterscheidung
my $windReading = $ascDev->getWindSensorReading;
my $rainReading = $ascDev->getRainSensorReading;
while ( my ( $device, $deviceAttr ) =
each %{ $hash->{monitoredDevs}{$devname} } )
{
if ( $devname eq $name ) {
if ( $device eq $name ) {
EventProcessingResidents( $hash, $device, $events )
if ( $deviceAttr eq 'ASC_residentsDev' );
if ( $deviceAttr eq 'ASC_residentsDev' );
EventProcessingRain( $hash, $device, $events )
if ( $deviceAttr eq 'ASC_rainSensor' );
if ( $deviceAttr eq 'ASC_rainSensor'
and $events =~ m{$rainReading}xms );
EventProcessingWind( $hash, $device, $events )
if ( $deviceAttr eq 'ASC_windSensor' );
if ( $deviceAttr eq 'ASC_windSensor'
and $events =~ m{$windReading}xms );
EventProcessingTwilightDevice( $hash, $device, $events )
if ( $deviceAttr eq 'ASC_twilightDevice' );
if ( $deviceAttr eq 'ASC_twilightDevice' );
}
EventProcessingWindowRec( $hash, $device, $events )