FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 02:10:32 +00:00
Code Issues Releases Wiki Activity

10_ZWave.pm: fix dimWithDuration issues and add Class-Version control to subdevices

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17156 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-08-17 16:59:46 +00:00
parent dba6193a42
commit ff243d4711
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/FHEM/10_ZWave.pm
View File

@ -4257,6 +4257,8 @@ ZWave_getHash($$$)
if($type eq "get" || $type eq "set") { if($type eq "get" || $type eq "set") {
my %h; my %h;
my $version = $hash->{".vclasses"}{$cl}; my $version = $hash->{".vclasses"}{$cl};
$version = $defs{$hash->{endpointParent}}{".vclasses"}{$cl}
if($hash->{endpointParent} && $defs{$hash->{endpointParent}});
$version = 0 if(!defined($version)); $version = 0 if(!defined($version));
map { map {
my $zv = $zwave_classVersion{$_}; my $zv = $zwave_classVersion{$_};
@ -5117,7 +5119,7 @@ ZWave_switchMultilevel_Set($$$)
if($cmdType == 0) { # dimWithDuration if($cmdType == 0) { # dimWithDuration
return "$n dimWithDuration: wrong format for $arg" return "$n dimWithDuration: wrong format for $arg"
if($arg !~ m/$p1_b (\d+)/); if($arg !~ m/$p1_b (\d+)/);
return ("", sprintf("01%02x%02x", $1, ZWave_time2byte($hash,$2))); return ("", sprintf("01%02x%s", $1, ZWave_time2byte($hash,$2)));
} elsif ($cmdType == 1) { # dimUpDown } elsif ($cmdType == 1) { # dimUpDown
$regexp = "(UP|DOWN) (IGNORE|USE) $p1_b"; $regexp = "(UP|DOWN) (IGNORE|USE) $p1_b";
@ -5144,8 +5146,8 @@ ZWave_switchMultilevel_Set($$$)
$duration = ZWave_time2byte($hash,$4) if ($cmdType >=2); $duration = ZWave_time2byte($hash,$4) if ($cmdType >=2);
my $rt = sprintf("04%02x%02x", $bitfield, $3); my $rt = sprintf("04%02x%02x", $bitfield, $3);
$rt .= sprintf("%02x", $duration) if ($cmdType == 2); $rt .= sprintf("%s", $duration) if ($cmdType == 2);
$rt .= sprintf("%02x%02x", $duration, $6) if ($cmdType == 3); $rt .= sprintf("%s%02x", $duration, $6) if ($cmdType == 3);
return ("", $rt); return ("", $rt);