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

10_ZWave.pm: Add missing classes on get model (Forum #38012)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8824 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-06-25 12:00:36 +00:00
parent 396fdd3cec
commit b747f25843
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
fhem/FHEM/10_ZWave.pm
View File

@ -913,6 +913,32 @@ ZWave_mcCapability($$)
return "mcCapability_$chid:".join(" ", @classes); return "mcCapability_$chid:".join(" ", @classes);
} }
sub
ZWave_mfsAddClasses($$)
{
my ($hash, $cfgFile) = @_;
my $name = $hash->{NAME};
my $attr = $attr{$name}{classes};
return if(!$cfgFile || !$attr);
my $changed;
ZWave_configParseModel($cfgFile);
my $ci = $zwave_modelConfig{$cfgFile}{classInfo};
foreach my $id (keys %{$ci}) {
my $v = $ci->{$id};
if($v =~ m/setasreport="true"/ || $v =~ m/action="add"/) {
$id = sprintf("%02x", $id);
my $cn = $zwave_id2class{$id};
next if($attr =~ m/$cn/);
$attr .= " $cn";
$changed = 1;
}
}
return if(!$changed);
addStructChange("attr", $name, "$name classes $attr");
$attr{$name}{classes} = $attr;
}
sub sub
ZWave_mfsParse($$$$$) ZWave_mfsParse($$$$$)
{ {
@ -940,6 +966,7 @@ ZWave_mfsParse($$$$$)
if($mf eq $lastMf && $prod eq lc($1) && $id eq lc($2)) { if($mf eq $lastMf && $prod eq lc($1) && $id eq lc($2)) {
if($config) { if($config) {
$ret = "modelConfig:".(($l =~ m/config="([^"]*)"/) ? $1:"unknown"); $ret = "modelConfig:".(($l =~ m/config="([^"]*)"/) ? $1:"unknown");
ZWave_mfsAddClasses($hash, $1);
return $ret; return $ret;
} else { } else {
$ret = "model:$mName $3"; $ret = "model:$mName $3";
@ -1098,14 +1125,17 @@ ZWave_configParseModel($)
return; return;
} }
my ($line, $class, %hash, $cmdName); my ($line, $class, %hash, $cmdName, %classInfo);
while($gz->gzreadline($line)) { # Search the "file" entry while($gz->gzreadline($line)) { # Search the "file" entry
last if($line =~ m/^\s*<Product.*sourceFile="$cfg"/); last if($line =~ m/^\s*<Product.*sourceFile="$cfg"/);
} }
while($gz->gzreadline($line)) { while($gz->gzreadline($line)) {
last if($line =~ m+^\s*</Product>+); last if($line =~ m+^\s*</Product>+);
$class = $1 if($line =~ m/^\s*<CommandClass.*id="([^"]*)"/); if($line =~ m/^\s*<CommandClass.*id="([^"]*)"(.*)$/) {
$class = $1;
$classInfo{$class} = $2;
}
next if(!$class || $class ne "112"); next if(!$class || $class ne "112");
if($line =~ m/^\s*<Value /) { if($line =~ m/^\s*<Value /) {
my %h; my %h;
@ -1125,6 +1155,7 @@ ZWave_configParseModel($)
$h{Help} .= "Full text for $cmdName is $h{label}<br>" if($shortened); $h{Help} .= "Full text for $cmdName is $h{label}<br>" if($shortened);
$hash{$cmdName} = \%h; $hash{$cmdName} = \%h;
} }
$hash{$cmdName}{Help} .= "$1<br>" if($line =~ m+^\s*<Help>(.*)</Help>$+); $hash{$cmdName}{Help} .= "$1<br>" if($line =~ m+^\s*<Help>(.*)</Help>$+);
if($line =~ m/^\s*<Item/) { if($line =~ m/^\s*<Item/) {
my $label = $1 if($line =~ m/label="([^"]*)"/i); my $label = $1 if($line =~ m/label="([^"]*)"/i);
@ -1137,7 +1168,7 @@ ZWave_configParseModel($)
} }
$gz->gzclose(); $gz->gzclose();
my %mc = (set=>{}, get=>{}, config=>{}); my %mc = (set=>{}, get=>{}, config=>{}, classInfo=>\%classInfo);
foreach my $cmd (keys %hash) { foreach my $cmd (keys %hash) {
my $h = $hash{$cmd}; my $h = $hash{$cmd};
my $arg = ($h->{type} eq "button" ? "a" : "a%b"); my $arg = ($h->{type} eq "button" ? "a" : "a%b");
@ -1481,11 +1512,11 @@ ZWave_secureInit(@)
ZWave_Set($hash, $name, "secNonce"); ZWave_Set($hash, $name, "secNonce");
return undef; # No Event/Reading return undef; # No Event/Reading
} elsif($status == 4) { } else {
Log3 $iodev, 4, "secNonce report: $param"; Log3 $iodev, 4, "secNonce report: $param";
delete $iodev->{secInitName}; delete $iodev->{secInitName};
delete $hash->{secStatus}; delete $hash->{secStatus};
return ZWave_execInits($hash, 0);
} }
} }