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

98_fheminfo.pm: add special handling for zwave

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14657 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2017-07-06 20:56:31 +00:00
parent 41d2f20c98
commit ba5792edd7
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fhem/FHEM/98_fheminfo.pm
View File

@ -107,8 +107,7 @@ sub _fi2_Count() {
$model = ReadingsVal($name,'type',$model)
if (lc($type) eq 'bosest');
# special reading for ZWave
$model = ReadingsVal($name,'modelId',$model)
if (lc($type) eq 'zwave');
$model = _fi2_zwave(ReadingsVal($name,'modelId','')) if (lc($type) eq 'zwave');
# 5. ignore model for KNX
$model = $c_noModel if (lc($type) eq 'knx');
@ -251,6 +250,36 @@ sub _fi2_findRev {
return $rev;
}
sub _fi2_zwave($) {
my ($zwave) = @_;
my $xml = $attr{global}{modpath}.
"/FHEM/lib/openzwave_manufacturer_specific.xml";
my ($mf, $prod, $id) = split(/-/,$zwave);
($mf, $prod, $id) = (lc($mf), lc($prod), lc($id)); # Just to make it sure
my ($err,@data) = FileRead({FileName => $xml, ForceType=>'file'});
return $err if($err);
my ($lastMf, $mName, $ret) = ("","");
foreach my $l (@data) {
if($l =~ m/<Manufacturer.*id="([^"]*)".*name="([^"]*)"/) {
$lastMf = lc($1);
$mName = $2;
next;
}
if($l =~ m/<Product type\s*=\s*"([^"]*)".*id\s*=\s*"([^"]*)".*name\s*=\s*"([^"]*)"/) {
if($mf eq $lastMf && $prod eq lc($1) && $id eq lc($2)) {
$ret = "$mName $3";
last;
}
}
}
return $ret if($ret);
return $zwave;
}
1;
=pod