Commit accf2dca authored by Pavel Vaynerman's avatar Pavel Vaynerman

add --use485F command line parameter

parent 50a826ff
......@@ -3,7 +3,7 @@
Name: libuniset
Version: 0.96
Release: eter62
Release: eter64
Summary: UniSet - library for building distributed industrial control systems
License: GPL
Group: Development/C++
......@@ -179,6 +179,12 @@ rm -f %buildroot%_libdir/*.la
%exclude %_pkgconfigdir/libUniSet.pc
%changelog
* Tue Sep 15 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter63
- new build
* Tue Sep 15 2009 Pavel Vainerman <pv@etersoft.ru> 0.96-eter62
- new build
* Mon Sep 14 2009 Pavel Vainerman <pv@altlinux.ru> 0.96-eter61
- new build
......
......@@ -13,6 +13,7 @@ RTUExchange::RTUExchange( UniSetTypes::ObjectId objId, UniSetTypes::ObjectId shm
UniSetObject_LT(objId),
mb(0),
defSpeed(ComPort::ComSpeed0),
use485F(false),
shm(0),
initPause(0),
force(false),
......@@ -53,6 +54,7 @@ allNotRespond(false)
if( speed.empty() )
speed = "38400";
use485F = conf->getArgInt("--rs-use485F",it.getProp("use485F"));
defSpeed = ComPort::getSpeed(speed);
recv_timeout = conf->getArgInt("--rs-recv-timeout",it.getProp("recv_timeout"));
......@@ -183,7 +185,7 @@ void RTUExchange::initMB( bool reopen )
try
{
mb = new ModbusRTUMaster(devname);
mb = new ModbusRTUMaster(devname,use485F);
if( defSpeed != ComPort::ComSpeed0 )
mb->setSpeed(defSpeed);
......
......@@ -173,6 +173,7 @@ class RTUExchange:
std::string devname;
ComPort::Speed defSpeed;
int recv_timeout;
bool use485F;
xmlNode* cnode;
std::string s_field;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment