Merge branch 'master' into devel

This commit is contained in:
Marko Oldenburg 2020-07-07 14:51:06 +02:00
commit a37b6eddb9
2 changed files with 6 additions and 5 deletions

View File

@ -1,9 +1,9 @@
UPD 2020-07-07_11:03:53 97041 FHEM/73_AutoShuttersControl.pm UPD 2020-07-07_14:49:19 97041 FHEM/73_AutoShuttersControl.pm
UPD 2020-07-07_14:41:28 178050 lib/FHEM/Automation/ShuttersControl.pm UPD 2020-07-07_14:50:20 178051 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-07_11:02:09 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2020-07-07_14:49:19 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2020-07-07_11:02:09 30710 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2020-07-07_14:49:19 30710 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-07-07_11:02:09 17908 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2020-07-07_14:49:19 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

View File

@ -549,6 +549,7 @@ sub EventProcessingGeneral {
EventProcessingWind( $hash, $device, $events ) EventProcessingWind( $hash, $device, $events )
if ( $deviceAttr eq 'ASC_windSensor' if ( $deviceAttr eq 'ASC_windSensor'
and $events =~ m{$windReading}xms ); and $events =~ m{$windReading}xms );
EventProcessingTwilightDevice( $hash, $device, $events ) EventProcessingTwilightDevice( $hash, $device, $events )
if ( $deviceAttr eq 'ASC_twilightDevice' ); if ( $deviceAttr eq 'ASC_twilightDevice' );
} }