mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10_ZWave.pm : Corrected merge error in 9948

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9949 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mrsidey
2015-11-20 23:42:19 +00:00
parent 91028e1cb0
commit 4f56a96ff5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/10_ZWave.pm
View File

@@ -2784,7 +2784,7 @@ ZWave_Parse($$@)
my @vals = ("learnReady", "nodeFound", "slave", my @vals = ("learnReady", "nodeFound", "slave",
"controller", "protocolDone", "done", "failed"); "controller", "protocolDone", "done", "failed");
$evt = ($id eq "00" || hex($id)>@vals+1) ? "unknownArg" : $vals[hex($id)-1]; $evt = ($id eq "00" || hex($id)>@vals+1) ? "unknownArg" : $vals[hex($id)-1];
if($evt eq "slave" && if(($evt eq "slave" || $evt eq "controller") &&
$arg =~ m/(..)....(..)..(.*)$/) { $arg =~ m/(..)....(..)..(.*)$/) {
my ($id,$type6,$classes) = ($1, $2, $3); my ($id,$type6,$classes) = ($1, $2, $3);
return ZWave_SetClasses($homeId, $id, $type6, $classes) return ZWave_SetClasses($homeId, $id, $type6, $classes)