FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

00_ZWCUL.pm: fix s100 decoding (Forum #44905)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10151 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-12-11 10:54:54 +00:00
parent 3aa4369da4
commit 3f75c0a2bc
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fhem/FHEM/00_ZWCUL.pm
View File

@ -162,7 +162,7 @@ ZWCUL_cmd($$@)
if(!defined($cmdList->{$cmdName})) {
return "Unknown argument $cmdName, choose one of " .
join(",",sort keys %{$cmdList});
join(" ",sort keys %{$cmdList});
}
Log3 $hash, 4, "ZWCUL $type $name $cmdName ".join(" ",@a);
@ -290,8 +290,8 @@ ZWCUL_Parse($$$$)
my ($H, $S, $F, $f, $sn, $L, $T, $P, $C);
if($s100 && $rmsg =~ '^z(........)(..)(..)(..)(..)(..)(..)(.*)(....)$') {
($H,$S,$F,$f,$L,$sn,$T,$P,$C) = ($1,$2,$3,$4,$5,$6,$7,$8,$9);
if($s100 && $rmsg =~ '^z(........)(..)(..)(.)(.)(..)(..)(.*)(....)$') {
($H,$S,$F,$f,$sn,$L,$T,$P,$C) = ($1,$2,$3,$4,$5,$6,$7,$8,$9);
} elsif(!$s100 && $rmsg =~ '^z(........)(..)(..)(.)(.)(..)(..)(.*)(..)$') {
($H,$S,$F,$f,$sn,$L,$T,$P,$C) = ($1,$2,$3,$4,$5,$6,$7,$8,$9);
@ -304,7 +304,7 @@ ZWCUL_Parse($$$$)
my ($hF,$hf, $rf,$hc,$hops,$ri,$u1) = (hex($F),hex($f),"",0,"","","");
# ITU G.9959, 8-4, 8-11
if(($s100 && ($hF&8)) || (!$s100 && ($hF&0x80))) { # routing
if($hF&0x80) { # routing
$hc = hex(substr($P,2,1));
$ri = "R:".substr($P, 0, ($hc+2)*2)." ";
$rf = substr($P, 0, 2);
@ -324,21 +324,13 @@ ZWCUL_Parse($$$$)
($hF & 3)==2 ? " multiCast" :
($hF & 3)==3 ? " ack" : " unknownHeaderType:".($hF&0x3)).
(($hF & 4) ? " explorer" : "").
(($hF & 8) ? " routedFrame" : ""). # s100 only?
($s100 ?
((($hF & 0x40)==0x20 ? " lowPower":"").
(($hF & 0x80)==0x40 ? " ackReq":"").
(($hf&0x7)==0 ? " " :
($hf&0x7)==1 ? " shortBeam" :
($hf&0x7)==2 ? " longBeam" :
($hf&0x7)==4 ? " fragmentedBeam" : " unknownBeam"))
: ((($hF & 0x10)==0x10 ? " speedModified":"").
(($hF & 0x20)==0x20 ? " lowPower":"").
(($hF & 0x40)==0x40 ? " ackReq":"").
(($hF & 0x80)==0x80 ? " routed, rf:$rf hopCount:$hc, hops:$hops":"").
((($hf>>1)&3)==0 ? " " :
(($hf>>1)&3)==1 ? " shortBeam" :
(($hf>>1)&3)==2 ? " longBeam" :" unknownBeam")));
(($hF & 0x10)==0x10 ? " speedModified":"").
(($hF & 0x20)==0x20 ? " lowPower":"").
(($hF & 0x40)==0x40 ? " ackReq":"").
(($hF & 0x80)==0x80 ? " routed, rf:$rf hopCount:$hc, hops:$hops":"").
((($hf>>1)&3)==0 ? " " :
(($hf>>1)&3)==1 ? " shortBeam" :
(($hf>>1)&3)==2 ? " longBeam" :" unknownBeam");
}
return if(AttrVal($me, "noDispatch", 0));
@ -355,14 +347,6 @@ ZWCUL_Parse($$$$)
$th = $modules{ZWave}{defptr}{"$H $S"};
}
# Auto-Add classes, for easier monitor-mode set/get handling
my $pcl = $zwave_id2class{substr($P, 0, 2)};
if($th && $pcl) {
my $tname = $th->{NAME};
my $cl = AttrVal($tname, "classes", "");
$attr{$tname}{classes} = "$cl $pcl" if($cl !~ m/\b$pcl\b/);
}
} else {
$rmsg = sprintf("0013%s00", $6);