From 2bafc3d4330d60dcd9ecc4eb4e8251cd11ed8405 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Wed, 8 Jul 2020 10:02:29 +0200 Subject: [PATCH] =?UTF-8?q?fix=20PERL=20WARNING:=20Argument=20"rain"=20isn?= =?UTF-8?q?'t=20numeric=20in=20multiplication=20=09ge=C3=A4ndert:=20=20=20?= =?UTF-8?q?=20=20=20=20lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controls_AutoShuttersControl.txt | 4 ++-- lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/controls_AutoShuttersControl.txt b/controls_AutoShuttersControl.txt index 9c1e762..e02305f 100644 --- a/controls_AutoShuttersControl.txt +++ b/controls_AutoShuttersControl.txt @@ -1,11 +1,11 @@ UPD 2020-07-07_14:49:19 97041 FHEM/73_AutoShuttersControl.pm -UPD 2020-07-07_14:50:20 178051 lib/FHEM/Automation/ShuttersControl.pm +UPD 2020-07-07_14:53:42 178051 lib/FHEM/Automation/ShuttersControl.pm UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2020-07-07_14:49:19 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2020-07-07_14:49:19 30710 lib/FHEM/Automation/ShuttersControl/Shutters.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 11454 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm +UPD 2020-07-08_10:02:07 11573 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 52390 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm UPD 2020-06-22_09:41:40 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm diff --git a/lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm b/lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm index 3fa278b..48c2111 100644 --- a/lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm +++ b/lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm @@ -267,9 +267,13 @@ sub _getRainSensor { ( $reading ne 'none' ? $reading : 'state' ); $self->{ASC_rainSensor}->{triggermax} = ( $max ne 'none' ? $max : 1000 ); $self->{ASC_rainSensor}->{triggerhyst} = ( - $hyst ne 'none' - ? $max - $hyst - : ( $self->{ASC_rainSensor}->{triggermax} * 0 ) + $max ~= m{\A\[A-Za-z]+\z}xms + ? $self->{ASC_rainSensor}->{triggermax} + : ( + $hyst ne 'none' + ? $max - $hyst + : ( $self->{ASC_rainSensor}->{triggermax} * 0 ) + ) ); $self->{ASC_rainSensor}->{shuttersClosedPos} = ( $pos ne 'none'