Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

67_ECMDDevice: optimization; honor param in expect

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@11649 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
borisneubert 2016-06-11 19:22:44 +00:00
parent 7404a1a645
commit 566b18d0ef
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FHEM/67_ECMDDevice.pm
View File

@ -151,12 +151,11 @@ ECMDDevice_Changed($$$)
################################### ###################################
sub sub
ECMDDevice_PostProc($$$) ECMDDevice_PostProc($$$%)
{ {
my ($hash, $postproc, $value)= @_; my ($hash, $postproc, $value, %specials)= @_;
if($postproc) { if($postproc) {
my %specials= ECMDDevice_GetCachedSpecials($hash);
my $command= ECMDDevice_ReplaceSpecials($postproc, %specials); my $command= ECMDDevice_ReplaceSpecials($postproc, %specials);
$_= $value; $_= $value;
Log3 $hash, 5, "Postprocessing \"" . escapeLogLine($value) . "\" with perl command $command."; Log3 $hash, 5, "Postprocessing \"" . escapeLogLine($value) . "\" with perl command $command.";
@ -237,12 +236,13 @@ ECMDDevice_Get($@)
} }
} }
$ecmd= ECMDDevice_ReplaceSpecials($ecmd, %specials); $ecmd= ECMDDevice_ReplaceSpecials($ecmd, %specials);
$expect= ECMDDevice_ReplaceSpecials($expect, %specials);
my $r = ECMDDevice_AnalyzeCommand($hash, $ecmd); my $r = ECMDDevice_AnalyzeCommand($hash, $ecmd);
my $v= IOWrite($hash, $r, $expect); my $v= IOWrite($hash, $r, $expect);
$v= ECMDDevice_PostProc($hash, $postproc, $v); $v= ECMDDevice_PostProc($hash, $postproc, $v, %specials);
return ECMDDevice_Changed($hash, $cmdname, $v); return ECMDDevice_Changed($hash, $cmdname, $v);
} }
@ -284,12 +284,13 @@ ECMDDevice_Set($@)
} }
} }
$ecmd= ECMDDevice_ReplaceSpecials($ecmd, %specials); $ecmd= ECMDDevice_ReplaceSpecials($ecmd, %specials);
$expect= ECMDDevice_ReplaceSpecials($expect, %specials);
my $r = ECMDDevice_AnalyzeCommand($hash, $ecmd); my $r = ECMDDevice_AnalyzeCommand($hash, $ecmd);
my $v= IOWrite($hash, $r, $expect); my $v= IOWrite($hash, $r, $expect);
$v= ECMDDevice_PostProc($hash, $postproc, $v); $v= ECMDDevice_PostProc($hash, $postproc, $v, %specials);
ECMDDevice_Changed($hash, $cmdname, $v); # was: return ECMDDevice_Changed($hash, $cmdname, $v); ECMDDevice_Changed($hash, $cmdname, $v); # was: return ECMDDevice_Changed($hash, $cmdname, $v);
return undef; return undef;