FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 01:14:19 +00:00
Code Issues Releases Wiki Activity

10_ZWave.pm: activate blocking get again (Forum #48962)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10775 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-02-08 20:21:05 +00:00
parent 93f8cf11e9
commit aa0f877635
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/10_ZWave.pm
View File

@ -792,7 +792,7 @@ ZWave_Cmd($$@)
my ($err, $ncmd) = eval($cmdFmt) if($cmdFmt !~ m/^\d/); my ($err, $ncmd) = eval($cmdFmt) if($cmdFmt !~ m/^\d/);
return $err if($err); return $err if($err);
$cmdFmt = $ncmd if(defined($ncmd)); $cmdFmt = $ncmd if(defined($ncmd));
return "Scheduled for retrieval" if($ncmd && $ncmd eq "EMPTY"); # configAll return "" if($ncmd && $ncmd eq "EMPTY"); # configAll
} }
Log3 $name, 2, "ZWave $type $name $cmd ".join(" ", @a); Log3 $name, 2, "ZWave $type $name $cmd ".join(" ", @a);
@ -840,7 +840,7 @@ ZWave_Cmd($$@)
} }
my $val; my $val;
if($type eq "get" && $hash->{CL}) { # Wait for result if($type eq "get") { # Wait for result
no strict "refs"; no strict "refs";
my $iohash = $hash->{IODev}; my $iohash = $hash->{IODev};
my $fn = $modules{$iohash->{TYPE}}{ReadAnswerFn}; my $fn = $modules{$iohash->{TYPE}}{ReadAnswerFn};
@ -2153,7 +2153,6 @@ sub
ZWave_ccsAllGet ($) ZWave_ccsAllGet ($)
{ {
my ($hash) = @_; my ($hash) = @_;
delete $hash->{CL}; # Make sure we wont block
foreach my $idx (1..int($#zwave_wd)) { foreach my $idx (1..int($#zwave_wd)) {
ZWave_Get($hash, $hash->{NAME}, "ccs", $zwave_wd[$idx]); ZWave_Get($hash, $hash->{NAME}, "ccs", $zwave_wd[$idx]);
} }
@ -2586,7 +2585,6 @@ ZWave_configAllGet($)
if(!$mc || !$mc->{config}); if(!$mc || !$mc->{config});
#use Data::Dumper; #use Data::Dumper;
#Log 1, Dumper $mc; #Log 1, Dumper $mc;
delete $hash->{CL}; # Make sure we wont block
foreach my $c (sort keys %{$mc->{get}}) { foreach my $c (sort keys %{$mc->{get}}) {
ZWave_Get($hash, $hash->{NAME}, $c); ZWave_Get($hash, $hash->{NAME}, $c);
} }
@ -2600,7 +2598,6 @@ ZWave_associationAllGet($$)
if(!$data) { # called by the user if(!$data) { # called by the user
$zwave_parseHook{"$hash->{nodeIdHex}:..85"} = \&ZWave_associationAllGet; $zwave_parseHook{"$hash->{nodeIdHex}:..85"} = \&ZWave_associationAllGet;
delete $hash->{CL}; # Make sure it won't block.
ZWave_Get($hash, $hash->{NAME}, "associationGroups"); ZWave_Get($hash, $hash->{NAME}, "associationGroups");
return("", "EMPTY"); return("", "EMPTY");
} }