FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 01:09:47 +00:00
Code Issues Releases Wiki Activity

error correction: hysteresis, init_desired_value

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2919 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
damian-s 2013-03-15 16:57:53 +00:00
parent b97b8d5e9b
commit 36cede4cf5
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fhem/FHEM/98_THRESHOLD.pm
View File

@ -48,8 +48,7 @@ THRESHOLD_Define($$$)
my $cmd2;
my $cmd_default;
my $actor;
my $init_desired_value;
if (@b > 4 || @a < 3 || @a > 5) {
my $msg = "wrong syntax: define <name> THRESHOLD " .
"<sensor>[:<reading>[:<hysteresis>][:<init_desired_value>] [AND|OR <sensor2>[:<reading2>][:<state>]] [<actor>][|<cmd1>][|<cmd2>][|<cmd_default_index>]";
@ -69,23 +68,26 @@ THRESHOLD_Define($$$)
$hash->{sensor} = $sensor;
$reading = "temperature" if (!$reading);
if (!$hysteresis) {
if ($reading eq "temperature") {
if ($hysteresis eq "") {
if ($reading eq "temperature" or $reading eq "temp") {
$hysteresis=1;
} else {
$hysteresis=20;
}
} elsif ($reading eq "humidity") {
$hysteresis=10;
} else {
$hysteresis=0;
}
} elsif ($hysteresis !~ m/^[\d\.]*$/ ) {
my $msg = "$pn: THRESHOLD: hysteresis needs a numeric parameter";
Log 2, $msg;
return $msg;
} elsif ($init_desired_value) {
if ($init_desired_value !~ m/^[-\d\.]*$/) {
my $msg = "$pn: THRESHOLD: init_desired_value needs a numeric parameter";
Log 2, $msg;
return $msg;
}
}
if ($init_desired_value ne "") {
if ($init_desired_value !~ m/^[-\d\.]*$/) {
my $msg = "$pn: THRESHOLD: init_desired_value needs a numeric parameter";
Log 2, $msg;
return $msg;
}
}
$hash->{sensor_reading} = $reading;
$hash->{hysteresis} = $hysteresis;
@ -144,7 +146,7 @@ THRESHOLD_Define($$$)
$hash->{helper}{actor_cmd_default} = $cmd_default;
$hash->{STATE} = 'initialized' if (!ReadingsVal($pn,"desired_value",""));
if ($init_desired_value)
if ($init_desired_value ne "")
{
readingsBeginUpdate ($hash);
readingsBulkUpdate ($hash, "state", "active $init_desired_value");