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: fix manuf. spec. init bug, and subdevice naming (Forum #65842)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@13264 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-01-28 22:03:46 +00:00
parent c069256e40
commit 6661c4dcad
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
FHEM/10_ZWave.pm
View File

@ -2160,7 +2160,8 @@ ZWave_mcCapability($$)
my $id = $hash->{nodeIdHex}; my $id = $hash->{nodeIdHex};
my @classes; my @classes;
shift(@l); shift(@l); # Skip generic and specific class my $genericClass = shift(@l);
my $specificClass = shift(@l);
for my $classId (@l) { for my $classId (@l) {
push @classes, $zwave_id2class{lc($classId)} ? push @classes, $zwave_id2class{lc($classId)} ?
$zwave_id2class{lc($classId)} : "UNKNOWN_".uc($classId); $zwave_id2class{lc($classId)} : "UNKNOWN_".uc($classId);
@ -2172,8 +2173,7 @@ ZWave_mcCapability($$)
my $lcaps = substr($caps, 6); my $lcaps = substr($caps, 6);
$id = hex($id); $id = hex($id);
DoTrigger("global", DoTrigger("global",
"UNDEFINED ZWave_$classes[0]_$id.$chid ZWave $homeId $lid $lcaps", "UNDEFINED ZWave_${genericClass}_$id.$chid ZWave $homeId $lid $lcaps", 1);
1);
} }
return "mcCapability_$chid:".join(" ", @classes); return "mcCapability_$chid:".join(" ", @classes);
@ -2249,6 +2249,8 @@ ZWave_mfsParse($$$$$)
if($config) { if($config) {
$ret = (($l =~ m/config\s*=\s*"([^"]*)"/) ? $1 : "unknown"); $ret = (($l =~ m/config\s*=\s*"([^"]*)"/) ? $1 : "unknown");
ZWave_mfsAddClasses($hash, $1); ZWave_mfsAddClasses($hash, $1);
# execInits needs the modelId
setReadingsVal($hash, "modelId", "$mf-$prod-$id", TimeNow());
ZWave_execInits($hash, 50, $ret); ZWave_execInits($hash, 50, $ret);
return "modelConfig:$ret"; return "modelConfig:$ret";
} else { } else {