FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

10_ZWave: add new config data (Forum #35416)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8290 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-03-26 14:59:45 +00:00
parent 25dd4b6dc9
commit ce3d863c26
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/10_ZWave.pm
View File

@ -884,16 +884,17 @@ ZWave_configParseModel($)
my ($line, $class, %hash, $cmdName);
while($gz->gzreadline($line)) { # Search the "file" entry
last if($line =~ m/^<Product sourceFile="$cfg">$/);
last if($line =~ m/^\s*<Product.*sourceFile="$cfg"/);
}
while($gz->gzreadline($line)) {
last if($line =~ m+^</Product>+);
$class = $1 if($line =~ m/^<CommandClass.*id="([^"]*)"/);
last if($line =~ m+^\s*</Product>+);
$class = $1 if($line =~ m/^\s*<CommandClass.*id="([^"]*)"/);
next if(!$class || $class ne "112");
if($line =~ m/^<Value /) {
if($line =~ m/^\s*<Value /) {
my %h;
$h{type} = $1 if($line =~ m/type="([^"]*)"/i);
$h{size} = $1 if($line =~ m/size="([^"]*)"/i);
$h{genre} = $1 if($line =~ m/genre="([^"]*)"/i); # config, user
$h{label} = $1 if($line =~ m/label="([^"]*)"/i);
$h{min} = $1 if($line =~ m/min="([^"]*)"/i);
@ -908,8 +909,8 @@ ZWave_configParseModel($)
$h{Help} .= "Full text for $cmdName is $h{label}<br>" if($shortened);
$hash{$cmdName} = \%h;
}
$hash{$cmdName}{Help} .= "$1<br>" if($line =~ m+^<Help>(.*)</Help>$+);
if($line =~ m/^<Item/) {
$hash{$cmdName}{Help} .= "$1<br>" if($line =~ m+^\s*<Help>(.*)</Help>$+);
if($line =~ m/^\s*<Item/) {
my $label = $1 if($line =~ m/label="([^"]*)"/i);
my $value = $1 if($line =~ m/value="([^"]*)"/i);
my ($item, $shortened) = ZWave_cleanString($label, $value);
@ -970,6 +971,10 @@ ZWave_configCheckParam($$$$@)
return ("Parameter is not decimal", "") if($arg[0] !~ m/^[0-9]+$/);
if($h->{size}) { # override type by size
$t = ($h->{size} eq "1" ? "byte" : ($h->{size} eq "2" ? "short" : "int"));
}
my $len = ($t eq "int" ? 8 : ($t eq "short" ? 4 : 2));
return ("", sprintf("04%02x%02x%0*x", $h->{index}, $len/2, $len, $arg[0]));
}

BIN
fhem/FHEM/lib/openzwave_deviceconfig.xml.gz
View File

Binary file not shown.

2
fhem/FHEM/lib/openzwave_manufacturer_specific.xml
View File

@ -194,7 +194,7 @@
<Product type="0400" id="0107" name="FGS211 Switch 3kW" config="fibaro/fgs211.xml" />
<Product type="0400" id="0108" name="FGS211 Switch 3kW" config="fibaro/fgs211.xml" />
<Product type="0400" id="0109" name="FGS221 Switch 3kW" config="fibaro/fgs221.xml" />
<Product type="0400" id="100a" name="FGS211 Switch 3kW" config="fibaro/fgs211.xml" />
<Product type="0400" id="100a" name="FGS211 Switch 3kW" config="fibaro/fgs211v102.xml" />
<Product type="0200" id="0104" name="FGS221 Double Relay Switch 2x1.5kW" config="fibaro/fgs221.xml" />
<Product type="0200" id="0105" name="FGS221 Double Relay Switch 2x1.5kW" config="fibaro/fgs221.xml" />
<Product type="0200" id="0106" name="FGS221 Double Relay Switch 2x1.5kW" config="fibaro/fgs221.xml" />