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

10
controls_AutoShuttersControl.txt
View File

@@ -1,9 +1,9 @@
UPD 2020-07-06_09:36:11 97041 FHEM/73_AutoShuttersControl.pm UPD 2020-07-07_11:03:53 97041 FHEM/73_AutoShuttersControl.pm
UPD 2020-07-06_09:34:32 177818 lib/FHEM/Automation/ShuttersControl.pm UPD 2020-07-07_14:41:28 178050 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 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2020-07-06_09:34:25 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2020-07-07_11:02:09 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2020-07-06_09:34:25 30710 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2020-07-07_11:02:09 30710 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-07-06_09:34:25 17908 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2020-07-07_11:02:09 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 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 11454 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2020-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm UPD 2020-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm

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

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