mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-06 06:08:44 +00:00
10_ZWave.pm: implement sequential callbackId (Forum #50090)
git-svn-id: https://svn.fhem.de/fhem/trunk@11049 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
parent
036a63d861
commit
28f8855776
@ -25,7 +25,8 @@ sub ZWCUL_Write($$$);
|
||||
sub ZWCUL_ProcessSendStack($);
|
||||
|
||||
use vars qw(%zwave_id2class);
|
||||
my %sentIdx;
|
||||
my %ZWCUL_sentIdx;
|
||||
my %ZWCUL_sentIdx2cbid;
|
||||
|
||||
my %sets = (
|
||||
"reopen" => { cmd=>"" },
|
||||
@ -279,12 +280,14 @@ ZWCUL_Write($$$)
|
||||
my ($hash,$fn,$msg) = @_;
|
||||
|
||||
Log3 $hash, 5, "ZWCUL_Write $fn $msg";
|
||||
if($msg =~ m/0013(..)(..)(.*)(....)/) {
|
||||
my ($targetId,$l,$p) = ($1,$2,$3);
|
||||
if($msg =~ m/0013(..)(..)(.*)(..)(..)/) {
|
||||
my ($targetId,$l,$p,$flags,$cbid) = ($1,$2,$3,$4,$5);
|
||||
my ($homeId,$route) = split(",",$fn);
|
||||
|
||||
$sentIdx{$targetId} = 0 if(!$sentIdx{$targetId} || $sentIdx{$targetId}==15);
|
||||
$sentIdx{$targetId}++;
|
||||
my $sn = $ZWCUL_sentIdx{$targetId};
|
||||
$sn = (!$sn || $sn==15) ? 1 : ($sn+1);
|
||||
$ZWCUL_sentIdx2cbid{"$targetId$sn"} = $cbid;
|
||||
$ZWCUL_sentIdx{$targetId} = $sn;
|
||||
|
||||
my $s100 = ($hash->{baudRate} eq "100k");
|
||||
|
||||
@ -295,7 +298,7 @@ ZWCUL_Write($$$)
|
||||
}
|
||||
|
||||
$msg = sprintf("%s%s%02x%02x%02x%s%s",
|
||||
$homeId, $hash->{nodeIdHex}, $rf, $sentIdx{$targetId},
|
||||
$homeId, $hash->{nodeIdHex}, $rf, $sn,
|
||||
length($p)/2+($s100 ? 11 : 10), $targetId, $p);
|
||||
$msg .= ($s100 ? zwlib_checkSum_16($msg) : zwlib_checkSum_8($msg));
|
||||
|
||||
@ -516,7 +519,8 @@ ZWCUL_Parse($$$$$)
|
||||
return;
|
||||
}
|
||||
|
||||
$rmsg = sprintf("0013%s00", $S);
|
||||
$rmsg = sprintf("0013%s00",
|
||||
$ZWCUL_sentIdx2cbid{"$S$sn"} ? $ZWCUL_sentIdx2cbid{"$S$sn"} : 00);
|
||||
|
||||
}
|
||||
return $rmsg if($nodispatch);
|
||||
|
||||
@ -20,6 +20,7 @@ sub ZWave_addToSendStack($$$);
|
||||
sub ZWave_secStart($);
|
||||
sub ZWave_secEnd($);
|
||||
sub ZWave_configParseModel($;$);
|
||||
sub ZWave_callbackId($);
|
||||
|
||||
use vars qw($FW_ME $FW_tp $FW_ss);
|
||||
use vars qw(%zwave_id2class);
|
||||
@ -865,7 +866,7 @@ ZWave_Cmd($$@)
|
||||
my $len = sprintf("%02x", length($cmdFmt)/2+1);
|
||||
my $cmdEf = (AttrVal($name, "noExplorerFrames", 0) == 0 ? "25" : "05");
|
||||
$data = "13$id$len$cmdId${cmdFmt}$cmdEf"; # 13==SEND_DATA
|
||||
$data .= $id; # callback=>id
|
||||
$data .= ZWave_callbackId($baseHash);
|
||||
}
|
||||
|
||||
if ($data =~ m/(......)(....)(.*)(....)/) {
|
||||
@ -2924,7 +2925,7 @@ ZWave_secAddToSendStack($$)
|
||||
my $id = $hash->{nodeIdHex};
|
||||
my $len = sprintf("%02x", (length($cmd)-2)/2+1);
|
||||
my $cmdEf = (AttrVal($name, "noExplorerFrames", 0) == 0 ? "25" : "05");
|
||||
my $data = "13$id$len$cmd$cmdEf$id"; # 13==SEND_DATA
|
||||
my $data = "13$id$len$cmd$cmdEf" . ZWave_callbackId($hash);
|
||||
ZWave_addToSendStack($hash, "set", $data);
|
||||
}
|
||||
|
||||
@ -3506,6 +3507,20 @@ ZWave_getHash($$$)
|
||||
return $ptr;
|
||||
}
|
||||
|
||||
my $zwave_cbid = 0;
|
||||
my %zwave_cbid2dev;
|
||||
sub
|
||||
ZWave_callbackId($)
|
||||
{
|
||||
my ($p) = @_;
|
||||
if(ref($p) eq "HASH") {
|
||||
$zwave_cbid = 0 if($zwave_cbid == 255);
|
||||
$zwave_cbid2dev{++$zwave_cbid} = $p;
|
||||
return sprintf("%02x", $zwave_cbid);
|
||||
}
|
||||
return $zwave_cbid2dev{hex($p)};
|
||||
}
|
||||
|
||||
sub
|
||||
ZWave_wakeupTimer($$)
|
||||
{
|
||||
@ -3525,7 +3540,7 @@ ZWave_wakeupTimer($$)
|
||||
# wakeupNoMoreInformation
|
||||
IOWrite($hash,
|
||||
$hash->{homeId}.($hash->{route} ? ",".$hash->{route} : ""),
|
||||
"0013${nodeId}028408${cmdEf}$nodeId");
|
||||
"0013${nodeId}028408${cmdEf}".ZWave_callbackId($hash));
|
||||
}
|
||||
delete $hash->{wakeupAlive};
|
||||
|
||||
@ -3563,11 +3578,17 @@ ZWave_processSendStack($$;$)
|
||||
return;
|
||||
}
|
||||
|
||||
if($ss->[0] =~ m/^sent(.*?):(.*)$/) {
|
||||
my ($stype,$smsg) = ($1,$2);
|
||||
if($stype =~ m/get/ && $ackType eq "ack") { # accept double-ACK
|
||||
$ss->[0] = "sentackget:$smsg";
|
||||
return;
|
||||
if($ss->[0] =~ m/^sent(.*?):(.*)(..)$/) {
|
||||
my ($stype,$smsg, $cbid) = ($1,$2,$3);
|
||||
if($ackType eq "ack") {
|
||||
if($cbid ne $omsg) {
|
||||
Log 4, "ZWave: wrong callbackid $omsg received, expecting $cbid";
|
||||
return;
|
||||
}
|
||||
if($stype eq "get") {
|
||||
$ss->[0] = "sentackget:$smsg$cbid";
|
||||
return;
|
||||
}
|
||||
|
||||
} elsif($stype eq "ackget" && $ackType eq "msg") {# compare answer class
|
||||
my $cs = substr($smsg, 6, 2);
|
||||
@ -3752,21 +3773,21 @@ ZWave_Parse($$@)
|
||||
return $ret;
|
||||
|
||||
} elsif($cmd eq "ZW_SEND_DATA") { # 0013cb00....
|
||||
my $hash = $modules{ZWave}{defptr}{"$homeId $callbackid"};
|
||||
my $hash = ZWave_callbackId($callbackid);
|
||||
my %msg = ('00'=>'OK', '01'=>'NO_ACK', '02'=>'FAIL',
|
||||
'03'=>'NOT_IDLE', '04'=>'NOROUTE' );
|
||||
my $lmsg = ($msg{$id} ? $msg{$id} : "UNKNOWN_ERROR");
|
||||
|
||||
if($id eq "00") {
|
||||
Log3 $ioName, 4, "$ioName transmit $lmsg for $callbackid";
|
||||
Log3 $ioName, 4, "$ioName transmit $lmsg for CB $callbackid";
|
||||
if($hash) {
|
||||
readingsSingleUpdate($hash, "transmit", $lmsg, 0);
|
||||
ZWave_processSendStack($hash, "ack");
|
||||
ZWave_processSendStack($hash, "ack", $callbackid);
|
||||
}
|
||||
return "";
|
||||
|
||||
} else { # Wait for the retry timer to remove this cmd from the stack.
|
||||
Log3 $ioName, 2, "$ioName transmit $lmsg for $callbackid";
|
||||
Log3 $ioName, 2, "$ioName transmit $lmsg for CB $callbackid";
|
||||
return "" if(!$hash);
|
||||
readingsSingleUpdate($hash, "state", "TRANSMIT_$lmsg", 1);
|
||||
readingsSingleUpdate($hash, "transmit", $lmsg, 1);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user