2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 06:48:43 +00:00

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
This commit is contained in:
rudolfkoenig 2016-03-16 09:11:47 +00:00
parent ec985d6c05
commit a71fc29e6e

View File

@ -291,7 +291,7 @@ my %zwave_class = (
set => { mcCreateAll => 'ZWave_mcCreateAll($hash,"")' }, set => { mcCreateAll => 'ZWave_mcCreateAll($hash,"")' },
get => { mcEndpoints => "07", get => { mcEndpoints => "07",
mcCapability=> "09%02x"}, mcCapability=> "09%02x"},
parse => { "^046008(..)(..)" => '"mcEndpoints:total ".hex($2).'. parse => { "^0[45]6008(..)(..)" => '"mcEndpoints:total ".hex($2).'.
'(hex($1)&0x80 ? ", dynamic":"").'. '(hex($1)&0x80 ? ", dynamic":"").'.
'(hex($1)&0x40 ? ", identical":", different")', '(hex($1)&0x40 ? ", identical":", different")',
"^..600a(.*)"=> 'ZWave_mcCapability($hash, $1)' }, "^..600a(.*)"=> 'ZWave_mcCapability($hash, $1)' },
@ -2072,11 +2072,11 @@ ZWave_mcCreateAll($$)
{ {
my ($hash, $data) = @_; my ($hash, $data) = @_;
if(!$data) { # called by the user 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"); ZWave_Get($hash, $hash->{NAME}, "mcEndpoints");
return("", "EMPTY"); return("", "EMPTY");
} }
$data =~ m/^046008(..)(..)/; $data =~ m/^0[45]6008(..)(..)/; # 4 vs. 5: Forum #50895
my $nGrp = hex($2); my $nGrp = hex($2);
for(my $c = 1; $c <= $nGrp; $c++) { for(my $c = 1; $c <= $nGrp; $c++) {
ZWave_Get($hash, $hash->{NAME}, "mcCapability", $c); ZWave_Get($hash, $hash->{NAME}, "mcCapability", $c);