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

ZWave: patches from fhem-me (forum #19147)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5564 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2014-04-19 06:07:06 +00:00
parent 714ebae901
commit 99cdfac2f2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/FHEM/00_ZWDongle.pm
View File

@ -410,9 +410,10 @@ ZWave_HandleSendStack($)
{ {
my $hash = shift; my $hash = shift;
shift @{$hash->{SendStack}}; shift @{$hash->{SendStack}};
RemoveInternalTimer($hash); # remove timer to avoid re-trigger
return if(!@{$hash->{SendStack}}); return if(!@{$hash->{SendStack}});
ZWDongle_Write($hash, "00", $hash->{SendStack}->[0], 1); ZWDongle_Write($hash, "00", $hash->{SendStack}->[0], 1);
InternalTimer(gettimeofday()+0.1, "ZWave_HandleSendStack", $hash, 0); InternalTimer(gettimeofday()+0.5, "ZWave_HandleSendStack", $hash, 0);
} }
##################################### #####################################
@ -509,7 +510,6 @@ ZWDongle_ReadAnswer($$$)
if(!$hash || ($^O !~ /Win/ && !defined($hash->{FD}))); if(!$hash || ($^O !~ /Win/ && !defined($hash->{FD})));
my $to = ($hash->{RA_Timeout} ? $hash->{RA_Timeout} : 3); my $to = ($hash->{RA_Timeout} ? $hash->{RA_Timeout} : 3);
shift @{$hash->{SendStack}}; # Hope this is right.
for(;;) { for(;;) {
my $buf; my $buf;

6
fhem/FHEM/10_ZWave.pm
View File

@ -619,7 +619,11 @@ ZWave_Parse($$@)
return $ret; return $ret;
} elsif($cmd eq "ZW_SEND_DATA") { } elsif($cmd eq "ZW_SEND_DATA") {
Log3 $ioName, 2, "$ioName ERROR: SEND_DATA returned $id" if($id ne "00"); if($id ne "00") {
Log3 $ioName, 2, "$ioName ERROR: SEND_DATA returned $id";
} else {
ZWave_HandleSendStack($iodev);
}
return ""; return "";
} }