FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

fhem.pl: add $DEV to rReplaceSetMagic (Forum #57210)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12094 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-08-30 13:05:47 +00:00
parent 13890e361c
commit e4d3bdd483
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/docs/commandref_frame.html
View File

@ -1066,14 +1066,16 @@ The following local attributes are used by a wider range of devices:
Each device has different set parameters, see the corresponding device Each device has different set parameters, see the corresponding device
section for details.<br> section for details.<br>
<br><br> <br><br>
From featurelevel 5.7 on the set (and setreading) command replaces: From featurelevel 5.7 on the set and setreading command replaces:
<ul> <ul>
<li>[device:reading] with the corresponding reading of device, if both device <li>[device:reading] with the corresponding reading of device, if both device
and reading exists.</li> and reading exists.</li>
<li>[device:reading:d] same as above, but only the number is retrieved, see <li>[device:reading:d] same as above, but only the number is retrieved, see
ReadingsNum </li> ReadingsNum </li>
<li>{(perlExpression)} with the result of perlExpression, if the expression <li>{(perlExpression)} with the result of perlExpression.
does not generates an error.</li> If this construct is used inside of a notify or cmdalias, the $DEV variable
is additionally available, designating the set device name.
</li>
</ul> </ul>
<br><br> <br><br>

7
fhem/docs/commandref_frame_DE.html
View File

@ -1134,8 +1134,11 @@ Die folgenden lokalen Attribute werden von mehreren Ger&auml;ten verwendet:
device, als auch Reading existiert, und nicht leer ist.</li> device, als auch Reading existiert, und nicht leer ist.</li>
<li>[device:reading:d] wie ohne :d, aber alles nicht-numerische wird <li>[device:reading:d] wie ohne :d, aber alles nicht-numerische wird
entfernt, siehe ReadingsNum</li> entfernt, siehe ReadingsNum</li>
<li>{(perlExpression)} mit dem Ergebnis der perlExpression, falls der Ausdruck <li>{(perlExpression)} mit dem Ergebnis der perlExpression.
keinen Fehler generiert.</li> Falls dieser Konstrukt innerhalb einer notify oder cmdalias verwendet wird,
dann wird zus&auml;tzlich $DEV mit dem Namen des vom set betroffenen
Ger&auml;tes ersetzt.
</li>
</ul> </ul>
<br><br> <br><br>

1
fhem/fhem.pl
View File

@ -1566,6 +1566,7 @@ ReplaceSetMagic($$@) # Forum #38276
$x eq "" ? "[$1:$2$3]" : $x $x eq "" ? "[$1:$2$3]" : $x
}/egi; }/egi;
$evalSpecials->{'%DEV'} = $hash->{NAME} if($evalSpecials);
$a =~ s/{\((.*?)\)}/AnalyzePerlCommand($hash->{CL},$1,1)/egs; $a =~ s/{\((.*?)\)}/AnalyzePerlCommand($hash->{CL},$1,1)/egs;
return (undef, @_) if($oa eq $a); return (undef, @_) if($oa eq $a);