FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 23:06:37 +00:00
Code Issues Releases Wiki Activity

98_Modbus.pm: litte bug fix

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19133 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
StefanStrobel 2019-04-06 18:40:30 +00:00
parent 3cc8421848
commit ca9a7850ef
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/98_Modbus.pm
View File

@ -132,6 +132,7 @@
# 2019-01-31 fixed bug in GetSetCheck (failed to check for busy) # 2019-01-31 fixed bug in GetSetCheck (failed to check for busy)
# 2019-02-09 optimized logging in level 4/5 # 2019-02-09 optimized logging in level 4/5
# 2019-02-19 little bug fix (warning) # 2019-02-19 little bug fix (warning)
# 2019-04-05 add a require for DevIO also in LDInitialize to be on the safe side ...
# #
# #
# #
@ -316,7 +317,7 @@ sub ModbusLD_GetIOHash($);
sub ModbusLD_DoRequest($$$;$$$$); sub ModbusLD_DoRequest($$$;$$$$);
sub ModbusLD_StartUpdateTimer($); sub ModbusLD_StartUpdateTimer($);
my $Modbus_Version = '4.0.24 - 18.2.2019'; my $Modbus_Version = '4.0.25 - 5.4.2019';
my $Modbus_PhysAttrs = my $Modbus_PhysAttrs =
"queueDelay " . "queueDelay " .
"queueMax " . "queueMax " .
@ -421,6 +422,8 @@ sub ModbusLD_Initialize($ )
{ {
my ($modHash) = @_; my ($modHash) = @_;
require "$attr{global}{modpath}/FHEM/DevIo.pm";
$modHash->{DefFn} = "ModbusLD_Define"; # functions are provided by the Modbus base module $modHash->{DefFn} = "ModbusLD_Define"; # functions are provided by the Modbus base module
$modHash->{UndefFn} = "ModbusLD_Undef"; $modHash->{UndefFn} = "ModbusLD_Undef";
$modHash->{ReadFn} = "Modbus_Read"; $modHash->{ReadFn} = "Modbus_Read";

3
fhem/FHEM/98_ModbusAttr.pm
View File

@ -43,6 +43,7 @@
# 2018-11-10 fixed doku for defSetexpr # 2018-11-10 fixed doku for defSetexpr
# 2019-01-29 added doku for defSet and defHint # 2019-01-29 added doku for defSet and defHint
# 2019-01-30 added once as option for pollDelay in doku # 2019-01-30 added once as option for pollDelay in doku
# 2019-04-05 put require for devio to top
# #
package main; package main;
@ -55,9 +56,9 @@ ModbusAttr_Initialize($)
{ {
my ($modHash) = @_; my ($modHash) = @_;
require "$attr{global}{modpath}/FHEM/DevIo.pm";
#require "$attr{global}{modpath}/FHEM/98_Modbus.pm"; #require "$attr{global}{modpath}/FHEM/98_Modbus.pm";
LoadModule "Modbus"; LoadModule "Modbus";
require "$attr{global}{modpath}/FHEM/DevIo.pm";
ModbusLD_Initialize($modHash); # Generic function of the Modbus module does the rest ModbusLD_Initialize($modHash); # Generic function of the Modbus module does the rest