Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

10_ZWave.pm: change getVal visibility (Forum #102514)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@19894 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2019-07-24 12:58:08 +00:00
parent c8bd502b14
commit 4f5d91e2a3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
FHEM/10_ZWave.pm
View File

@ -2346,7 +2346,7 @@ sub
ZWave_mfsParse($$$$$)
{
my ($hash, $mf, $prod, $id, $config) = @_;
sub getVal { return $_[0] =~ m/$_[1]\s*=\s*"([^"]*)"/ ? $1 : "unknown" }
my $getVal = sub { return $_[0] =~ m/$_[1]\s*=\s*"([^"]*)"/ ? $1 : "unknown"};
if($config == 2) {
setReadingsVal($hash, "modelId", "$mf-$prod-$id", TimeNow());
@ -2360,24 +2360,24 @@ ZWave_mfsParse($$$$$)
my ($lastMf, $mName, $ret) = ("","");
while(my $l = <FH>) {
if($l =~ m/<Manufacturer/) {
$lastMf = lc(getVal($l, "id"));
$mName = getVal($l, "name");
$lastMf = lc($getVal->($l, "id"));
$mName = $getVal->($l, "name");
next;
}
if($l =~ m/<Product/) {
my $lId = lc(getVal($l, "id"));
my $lProd = lc(getVal($l, "type"));
my $lId = lc($getVal->($l, "id"));
my $lProd = lc($getVal->($l, "type"));
if($mf eq $lastMf && $prod eq $lProd && $id eq $lId) {
if($config) {
$ret = getVal($l, "config");
$ret = $getVal->($l, "config");
ZWave_mfsAddClasses($hash, $1);
# execInits needs the modelId
setReadingsVal($hash, "modelId", "$mf-$prod-$id", TimeNow());
ZWave_execInits($hash, 50, $ret);
return "modelConfig:$ret";
} else {
my $pName = getVal($l, "name");
my $pName = $getVal->($l, "name");
$ret = "model:$mName $pName";
}
last;