FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 18:56:03 +00:00
Code Issues Releases Wiki Activity

new Attribute setOnDeactivated

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5932 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
damian-s 2014-05-22 16:31:01 +00:00
parent 503a906aaf
commit 23d8283594
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/98_THRESHOLD.pm
View File

@ -35,7 +35,7 @@ THRESHOLD_Initialize($)
$hash->{SetFn} = "THRESHOLD_Set";
$hash->{AttrFn} = "THRESHOLD_Attr";
$hash->{NotifyFn} = "THRESHOLD_Notify";
$hash->{AttrList} = "disable:0,1 loglevel:0,1,2,3,4,5,6 state_format state_cmd1_gt state_cmd2_lt target_func number_format";
$hash->{AttrList} = "disable:0,1 loglevel:0,1,2,3,4,5,6 state_format state_cmd1_gt state_cmd2_lt target_func number_format setOnDeactivated:cmd1_gt,cmd2_lt";
}
@ -269,6 +269,7 @@ THRESHOLD_Set($@)
my $offset = $hash->{offset};
my $mode;
my $state_format = AttrVal($pn, "state_format", "_m _dv");
my $cmd = AttrVal($pn, "setOnDeactivated", "");
if ($arg eq "desired" ) {
return "$pn: set desired value:$value, desired value needs a numeric parameter" if(@a != 3 || $value !~ m/^[-\d\.]*$/);
@ -293,19 +294,20 @@ THRESHOLD_Set($@)
readingsEndUpdate ($hash, 1);
return THRESHOLD_Check($hash);
} elsif ($arg eq "deactivated" ) {
if ($value ne "") {
if ($value eq "cmd1_gt" ) {
$cmd = $value if ($value ne "");
if ($cmd ne "") {
if ($cmd eq "cmd1_gt" ) {
readingsBeginUpdate ($hash);
THRESHOLD_setValue ($hash,1);
THRESHOLD_set_state ($hash);
readingsEndUpdate ($hash, 1);
} elsif ($value eq "cmd2_lt" ) {
} elsif ($cmd eq "cmd2_lt" ) {
readingsBeginUpdate ($hash);
THRESHOLD_setValue ($hash,2);
THRESHOLD_set_state ($hash);
readingsEndUpdate ($hash, 1);
} else {
return "$pn: set deactivated: $value, unknown command";
return "$pn: set deactivated: $cmd, unknown command, use: cmd1_gt or cmd2_lt";
}
}
$ret=CommandAttr(undef, "$pn disable 1");
@ -915,6 +917,8 @@ THRESHOLD_setValue($$)
The sensor value is given as "_tv" in the expression.<br>
Example:<br>
<code>attr TH_heating target_func -0.578*_tv+33.56</code><br>
<li>setOnDeactivated</li>
Command to be executed before deactivating. Possible values: cmd1_gt, cmd2_lt<br>
</ul>
<br>
@ -1288,6 +1292,8 @@ THRESHOLD_setValue($$)
<li>target_func</li>
Hier kann ein Perlausdruck angegeben werden, um aus dem Vorgabewert eines externen Sensors (target_value) einen Sollwert zu berechnen.<br>
Der Sensorwert wird mit "_tv" im Ausdruck angegeben. Siehe dazu Beispiele oben zur Steuerung der Heizung nach einer Heizkennlinie.<br>
<li>setOnDeactivated</li>
Kommando, welches vor dem Deaktivieren ausgeführt werden soll. Mögliche Angaben: cmd1_gt, cmd2_lt<br>
</ul>
<br>