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

fix RegEx Bug

Browse Source
This commit is contained in:
Marko Oldenburg 2020-07-08 10:27:59 +02:00
parent b8488ebdc2
commit 468d5713b2
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controls_AutoShuttersControl.txt
View File

@ -5,7 +5,7 @@ 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 30710 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-07-07_14:49:19 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-07-08_10:16:12 11539 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2020-07-08_10:27:47 11567 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
UPD 2020-07-03_11:29:10 52390 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.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 UPD 2020-06-22_09:41:40 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm

14
lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
View File

@ -265,16 +265,18 @@ sub _getRainSensor {
$self->{ASC_rainSensor}->{device} = $device; $self->{ASC_rainSensor}->{device} = $device;
$self->{ASC_rainSensor}->{reading} = $self->{ASC_rainSensor}->{reading} =
( $reading ne 'none' ? $reading : 'state' ); ( $reading ne 'none' ? $reading : 'state' );
$self->{ASC_rainSensor}->{triggermax} = ( $max ne 'none' ? $max : 1000 ); $self->{ASC_rainSensor}->{triggermax} = (
( $max ne 'none'
&& $max =~ m{\A(-?\d+(\.\d+)?)\z}xms )
? $max
: 1000 );
$self->{ASC_rainSensor}->{triggerhyst} = ( $self->{ASC_rainSensor}->{triggerhyst} = (
$max =~ m{\A[A-Za-z]+\z}xms
? 1000
: (
$hyst ne 'none' $hyst ne 'none'
? $max - $hyst ? $self->{ASC_rainSensor}->{triggermax} - $hyst
: ( $self->{ASC_rainSensor}->{triggermax} * 0 ) : ( $self->{ASC_rainSensor}->{triggermax} * 0 )
)
); );
$self->{ASC_rainSensor}->{shuttersClosedPos} = $self->{ASC_rainSensor}->{shuttersClosedPos} =
( $pos ne 'none' ( $pos ne 'none'
? $pos ? $pos