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

00_ZWDongle: setReadingOnAck only for set (Forum #112955)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23140 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2020-11-11 21:22:55 +00:00
parent 7f9bbb54f7
commit 884dd3ee29
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/00_ZWDongle.pm
View File

@ -1319,9 +1319,9 @@ ZWDongle_Ready($)
</li>
<li><a name="ZWDonglesetReadingOnAck">setReadingOnAck</a><br>
If the attribute is set to 1, and a command with an argument is issued to
a ZWave device, then a reading with the same name will be updated upon
reception of the corresponding ZWave ACK radio telegram.
If the attribute is set to 1, and a set command with an argument is
issued to a ZWave device, then a reading with the same name will be
updated upon reception of the corresponding ZWave ACK radio telegram.
</li>
</ul>

11
fhem/FHEM/10_ZWave.pm
View File

@ -997,7 +997,7 @@ ZWave_Cmd($$@)
my ($type, $hash, @a) = @_;
return "no $type argument specified" if(int(@a) < 2);
my $name = shift(@a);
my $fullCmd = join(" ",@a);
my $fullCmd = $type." ".join(" ",@a);
my $cmd = shift(@a);
# Collect the commands from the distinct classes
@ -4118,7 +4118,7 @@ ZWave_secNonceReceived($$)
}
my $enc = ZWave_secEncrypt($hash, $r_nonce_hex, $secMsg);
ZWave_secAddToSendStack($hash, '98'.$enc, $cmd);
ZWave_secAddToSendStack($hash, '98'.$enc, "$type $cmd");
if ($type eq "set" && $cmd && $cmd !~ m/^config.*request$/) {
readingsSingleUpdate($hash, "state", $cmd, 1);
Log3 $name, 5, "$name: type=$type, cmd=$cmd ($getSecMsg)";
@ -4632,6 +4632,7 @@ ZWave_callbackId($;$)
$zwave_cbid = ($zwave_cbid+1) % 256;
my $hx = sprintf("%02x", $zwave_cbid);
$zwave_cbid2dev{$hx} = $p;
#Log 1, "CB: $cmd => $hx" if($cmd);
$zwave_cbid2cmd{$hx} = $cmd if(defined($cmd));
return $hx;
}
@ -5116,8 +5117,10 @@ ZWave_Parse($$@)
if($iodev->{setReadingOnAck}) {
my $ackCmd = $zwave_cbid2cmd{$callbackid};
if($ackCmd) {
my ($reading, $val) = split(" ", $ackCmd, 2);
readingsBulkUpdate($defs{$lname},$reading,$val,1) if(defined($val));
#Log 1, "ACK: $callbackid => $ackCmd";
my ($type, $reading, $val) = split(" ", $ackCmd, 3);
readingsBulkUpdate($defs{$lname}, $reading, $val, 1)
if($type eq "set" && defined($val));
}
}