From a71fc29e6e9d5d680ac953faba002b911e901414 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Wed, 16 Mar 2016 09:11:47 +0000 Subject: [PATCH] 10_ZWave.pm: add new MULTI_CHANNEL report (Forum #50895) git-svn-id: https://svn.fhem.de/fhem/trunk@11074 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_ZWave.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm index 769d23809..de8c9eba3 100755 --- a/fhem/FHEM/10_ZWave.pm +++ b/fhem/FHEM/10_ZWave.pm @@ -291,7 +291,7 @@ my %zwave_class = ( set => { mcCreateAll => 'ZWave_mcCreateAll($hash,"")' }, get => { mcEndpoints => "07", mcCapability=> "09%02x"}, - parse => { "^046008(..)(..)" => '"mcEndpoints:total ".hex($2).'. + parse => { "^0[45]6008(..)(..)" => '"mcEndpoints:total ".hex($2).'. '(hex($1)&0x80 ? ", dynamic":"").'. '(hex($1)&0x40 ? ", identical":", different")', "^..600a(.*)"=> 'ZWave_mcCapability($hash, $1)' }, @@ -2072,11 +2072,11 @@ ZWave_mcCreateAll($$) { my ($hash, $data) = @_; if(!$data) { # called by the user - $zwave_parseHook{"$hash->{nodeIdHex}:046008...."} = \&ZWave_mcCreateAll; + $zwave_parseHook{"$hash->{nodeIdHex}:0[45]6008...."} = \&ZWave_mcCreateAll; ZWave_Get($hash, $hash->{NAME}, "mcEndpoints"); return("", "EMPTY"); } - $data =~ m/^046008(..)(..)/; + $data =~ m/^0[45]6008(..)(..)/; # 4 vs. 5: Forum #50895 my $nGrp = hex($2); for(my $c = 1; $c <= $nGrp; $c++) { ZWave_Get($hash, $hash->{NAME}, "mcCapability", $c);