FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 08:11:44 +00:00
Code Issues Releases Wiki Activity

fixed SemicolonEscape

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2948 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
damian-s 2013-03-19 16:23:54 +00:00
parent 85cfa8a2e8
commit fee72afbec
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/98_THRESHOLD.pm
View File

@ -148,8 +148,8 @@ THRESHOLD_Define($$$)
$cmd2 =~ s/@/$actor/g; $cmd2 =~ s/@/$actor/g;
} }
$hash->{helper}{actor_cmd1} = $cmd1; $hash->{helper}{actor_cmd1} = SemicolonEscape($cmd1);
$hash->{helper}{actor_cmd2} = $cmd2; $hash->{helper}{actor_cmd2} = SemicolonEscape($cmd2);
$hash->{helper}{actor_cmd_default} = $cmd_default; $hash->{helper}{actor_cmd_default} = $cmd_default;
$hash->{STATE} = 'initialized' if (!ReadingsVal($pn,"desired_value","")); $hash->{STATE} = 'initialized' if (!ReadingsVal($pn,"desired_value",""));
@ -312,16 +312,16 @@ THRESHOLD_setValue($$)
my $cmd_now = $cmd[$cmd_nr-1]; my $cmd_now = $cmd[$cmd_nr-1];
my $cmd_sym_now = $cmd_sym[$cmd_nr-1]; my $cmd_sym_now = $cmd_sym[$cmd_nr-1];
if ($cmd_now) {
if (ReadingsVal($pn,"cmd","") ne $cmd_sym_now) { if (ReadingsVal($pn,"cmd","") ne $cmd_sym_now) {
if ($ret = AnalyzeCommandChain(undef, $cmd_now)) { if ($cmd_now eq "") {
readingsSingleUpdate ($hash, "cmd",$cmd_sym_now, 1);
} elsif ($ret = AnalyzeCommandChain(undef, $cmd_now)) {
Log GetLogLevel($pn,3), "output of $pn $cmd_now: $ret"; Log GetLogLevel($pn,3), "output of $pn $cmd_now: $ret";
} else { } else {
readingsSingleUpdate ($hash, "cmd",$cmd_sym_now, 1); readingsSingleUpdate ($hash, "cmd",$cmd_sym_now, 1);
} }
} }
} }
}
1; 1;
@ -372,7 +372,7 @@ THRESHOLD_setValue($$)
the second sensor the second sensor
</li> </li>
<li>reading2<br> <li>reading2<br>
reading of the second sensor reading of the second sensor<br>
default value: state default value: state
</li> </li>
<li>state<br> <li>state<br>
@ -530,7 +530,7 @@ THRESHOLD_setValue($$)
ein definierter Sensor, dessen Status abgefragt wird ein definierter Sensor, dessen Status abgefragt wird
</li> </li>
<li>reading2<br> <li>reading2<br>
Reading, der den Status des Sensors beinhaltet Reading, der den Status des Sensors beinhaltet<br>
Defaultwert: state Defaultwert: state
</li> </li>
<li>state<br> <li>state<br>