FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

98_Modbus: small bugfix

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28647 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
StefanStrobel 2024-03-12 18:39:15 +00:00
parent 52cc31b597
commit a4f385dcb7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/98_Modbus.pm
View File

@ -23,6 +23,7 @@
# #
# ToDo / Ideas # ToDo / Ideas
# use group attrs in doRequest to group registers for set / get
# verify that nextOpenDelay is integer and >= 1 # verify that nextOpenDelay is integer and >= 1
# set 'active' results in error when tcp is already open # set 'active' results in error when tcp is already open
# enforce nextOpenDelay even if slave immediately closes # enforce nextOpenDelay even if slave immediately closes
@ -3770,6 +3771,7 @@ sub ProcessRequestQueue {
} }
return if (CheckDelays($ioHash, $mHash, $request)); # might set Profiler to delay return if (CheckDelays($ioHash, $mHash, $request)); # might set Profiler to delay
$now = gettimeofday(); # need current time after potential sleep
DropBuffer($ioHash); DropBuffer($ioHash);
RemoveInternalTimer ("timeout:$name"); # remove potential existing ResponseTimeout timer - will be set later RemoveInternalTimer ("timeout:$name"); # remove potential existing ResponseTimeout timer - will be set later
@ -3791,6 +3793,7 @@ sub ProcessRequestQueue {
my $timeout = DevInfo($mHash, 'timing', 'timeout', ($request->{RELAYHASH} ? 1.5 : 2)); my $timeout = DevInfo($mHash, 'timing', 'timeout', ($request->{RELAYHASH} ? 1.5 : 2));
my $toTime = $now+$timeout; my $toTime = $now+$timeout;
InternalTimer($toTime, \&Modbus::ResponseTimeout, "timeout:$name", 0); InternalTimer($toTime, \&Modbus::ResponseTimeout, "timeout:$name", 0);
$ioHash->{nextTimeout} = $toTime; # to be able to calculate remaining timeout time in ReadAnswer $ioHash->{nextTimeout} = $toTime; # to be able to calculate remaining timeout time in ReadAnswer
} else { } else {
@ -4400,6 +4403,11 @@ sub ResponseText {
###################################################### ######################################################
# log current frame in buffer # log current frame in buffer
# todo: new paraeter NoFrameLog - don't log current frame / error
# nenned when called from DoRequest and info from last incomplete response only creates confusion.
# in this case only the newly created request is relevant
# or: make doRequest call LogRequest (new function) instead of LogFrame
#
sub FrameText { sub FrameText {
my ($hash, $request, $response) = @_; my ($hash, $request, $response) = @_;
$request = $hash->{REQUEST} if (!$request); $request = $hash->{REQUEST} if (!$request);