From d263731b502e142503ba05c8da6d3543a4bceec0 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Sat, 5 Mar 2016 07:18:07 +0000
Subject: [PATCH] 10_ZWave.pm/00_ZWCUL.pm/00_ZWDongle.pm: CtrlNodeId goes hex
 (Forum #50212)

git-svn-id: https://svn.fhem.de/fhem/trunk@10992 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/00_ZWCUL.pm    | 2 +-
 fhem/FHEM/00_ZWDongle.pm | 2 +-
 fhem/FHEM/10_ZWave.pm    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fhem/FHEM/00_ZWCUL.pm b/fhem/FHEM/00_ZWCUL.pm
index f87be602b..39616cdd5 100755
--- a/fhem/FHEM/00_ZWCUL.pm
+++ b/fhem/FHEM/00_ZWCUL.pm
@@ -86,7 +86,7 @@ ZWCUL_Define($$)
   $hash->{baudRate} = "40k";
   $hash->{monitor} = 1 if($hash->{homeIdSet} eq "00000000");
   setReadingsVal($hash, "homeId",       # ZWDongle compatibility
-            "HomeId:$hash->{homeId} CtrlNodeId:$hash->{nodeIdHex}", TimeNow());
+          "HomeId:$hash->{homeId} CtrlNodeIdHex:$hash->{nodeIdHex}", TimeNow());
 
   $hash->{Clients} = ":ZWave:STACKABLE_CC:";
   my %matchList = ( "1:ZWave" => ".*",
diff --git a/fhem/FHEM/00_ZWDongle.pm b/fhem/FHEM/00_ZWDongle.pm
index f57ebbb6d..0d77c31c2 100755
--- a/fhem/FHEM/00_ZWDongle.pm
+++ b/fhem/FHEM/00_ZWDongle.pm
@@ -279,7 +279,7 @@ ZWDongle_Get($@)
     $msg .= " ".join(" ",@list);
 
   } elsif($cmd eq "homeId") {                  ############################
-    $msg = sprintf("HomeId:%s CtrlNodeId:%s", 
+    $msg = sprintf("HomeId:%s CtrlNodeIdHex:%s", 
                 substr($ret,4,8), substr($ret,12,2));
     $hash->{homeId} = substr($ret,4,8);
     $hash->{nodeIdHex} = substr($ret,12,2);
diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index 56a56b455..d415370f6 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -686,7 +686,7 @@ ZWave_execInits($$)
   my $NAME = $hash->{NAME};
   my $iodev = $hash->{IODev};
   my $homeReading = ReadingsVal($iodev->{NAME}, "homeId", "") if($iodev);
-  my $CTRLID = $1 if($homeReading && $homeReading =~ m/CtrlNodeId:(..)/);
+  my $CTRLID=hex($1) if($homeReading && $homeReading =~ m/CtrlNodeIdHex:(..)/);
 
   my @cmd;
   foreach my $i (sort { $a->{ORDER}<=>$b->{ORDER} } @initList) {