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

10_ZWave.pm/00_ZWCUL.pm/00_ZWDongle.pm: CtrlNodeId goes hex (Forum #50212)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10992 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-03-05 07:18:07 +00:00
parent a8941a40e5
commit d263731b50
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/00_ZWCUL.pm
View File

@ -86,7 +86,7 @@ ZWCUL_Define($$)
$hash->{baudRate} = "40k"; $hash->{baudRate} = "40k";
$hash->{monitor} = 1 if($hash->{homeIdSet} eq "00000000"); $hash->{monitor} = 1 if($hash->{homeIdSet} eq "00000000");
setReadingsVal($hash, "homeId", # ZWDongle compatibility setReadingsVal($hash, "homeId", # ZWDongle compatibility
"HomeId:$hash->{homeId} CtrlNodeId:$hash->{nodeIdHex}", TimeNow()); "HomeId:$hash->{homeId} CtrlNodeIdHex:$hash->{nodeIdHex}", TimeNow());
$hash->{Clients} = ":ZWave:STACKABLE_CC:"; $hash->{Clients} = ":ZWave:STACKABLE_CC:";
my %matchList = ( "1:ZWave" => ".*", my %matchList = ( "1:ZWave" => ".*",

2
fhem/FHEM/00_ZWDongle.pm
View File

@ -279,7 +279,7 @@ ZWDongle_Get($@)
$msg .= " ".join(" ",@list); $msg .= " ".join(" ",@list);
} elsif($cmd eq "homeId") { ############################ } elsif($cmd eq "homeId") { ############################
$msg = sprintf("HomeId:%s CtrlNodeId:%s", $msg = sprintf("HomeId:%s CtrlNodeIdHex:%s",
substr($ret,4,8), substr($ret,12,2)); substr($ret,4,8), substr($ret,12,2));
$hash->{homeId} = substr($ret,4,8); $hash->{homeId} = substr($ret,4,8);
$hash->{nodeIdHex} = substr($ret,12,2); $hash->{nodeIdHex} = substr($ret,12,2);

2
fhem/FHEM/10_ZWave.pm
View File

@ -686,7 +686,7 @@ ZWave_execInits($$)
my $NAME = $hash->{NAME}; my $NAME = $hash->{NAME};
my $iodev = $hash->{IODev}; my $iodev = $hash->{IODev};
my $homeReading = ReadingsVal($iodev->{NAME}, "homeId", "") if($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; my @cmd;
foreach my $i (sort { $a->{ORDER}<=>$b->{ORDER} } @initList) { foreach my $i (sort { $a->{ORDER}<=>$b->{ORDER} } @initList) {