Commit d341c2a9 authored by Pavel Vainerman's avatar Pavel Vainerman

(MBTCPMaster): Сделал force-disconnect по умолчанию включённым.

Т.к. это более вероятный вариант использования.
parent 6695b0f6
...@@ -20,7 +20,7 @@ force_out(false), ...@@ -20,7 +20,7 @@ force_out(false),
mbregFromID(false), mbregFromID(false),
activated(false), activated(false),
noQueryOptimization(false), noQueryOptimization(false),
force_disconnect(false), force_disconnect(true),
allNotRespond(false), allNotRespond(false),
prefix(prefix), prefix(prefix),
no_extimer(false), no_extimer(false),
...@@ -80,7 +80,8 @@ poll_count(0) ...@@ -80,7 +80,8 @@ poll_count(0)
force = conf->getArgInt("--" + prefix + "-force",it.getProp("force")); force = conf->getArgInt("--" + prefix + "-force",it.getProp("force"));
force_out = conf->getArgInt("--" + prefix + "-force-out",it.getProp("force_out")); force_out = conf->getArgInt("--" + prefix + "-force-out",it.getProp("force_out"));
force_disconnect = conf->getArgInt("--" + prefix + "-force-disconnect",it.getProp("force_disconnect"));
force_disconnect = conf->getArgInt("--" + prefix + "-persistent-connection",it.getProp("persistent_connection")) ? false : true;
if( shm->isLocalwork() ) if( shm->isLocalwork() )
{ {
...@@ -590,7 +591,7 @@ void MBTCPMaster::updateSM() ...@@ -590,7 +591,7 @@ void MBTCPMaster::updateSM()
if( dlog.debugging(Debug::LEVEL4) ) if( dlog.debugging(Debug::LEVEL4) )
{ {
dlog[Debug::LEVEL4] << "check respond addr=" << ModbusRTU::addr2str(d->mbaddr) dlog[Debug::LEVEL4] << "check respond addr=" << ModbusRTU::addr2str(d->mbaddr)
<< " respond=" << d->resp_id << " respond_id=" << d->resp_id
<< " real=" << d->resp_real << " real=" << d->resp_real
<< " state=" << d->resp_state << " state=" << d->resp_state
<< endl; << endl;
...@@ -1450,6 +1451,7 @@ void MBTCPMaster::help_print( int argc, const char* const* argv ) ...@@ -1450,6 +1451,7 @@ void MBTCPMaster::help_print( int argc, const char* const* argv )
// cout << "--prefix-sm-ready-timeout - время на ожидание старта SM" << endl; // cout << "--prefix-sm-ready-timeout - время на ожидание старта SM" << endl;
cout << " Настройки протокола TCP: " << endl; cout << " Настройки протокола TCP: " << endl;
cout << "--prefix-recv-timeout - Таймаут на ожидание ответа." << endl; cout << "--prefix-recv-timeout - Таймаут на ожидание ответа." << endl;
cout << "--prefix-persistent-connection - Не закрывать соединение на каждом цикле опроса" << endl;
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
MBTCPMaster* MBTCPMaster::init_mbmaster( int argc, const char* const* argv, UniSetTypes::ObjectId icID, SharedMemory* ic, MBTCPMaster* MBTCPMaster::init_mbmaster( int argc, const char* const* argv, UniSetTypes::ObjectId icID, SharedMemory* ic,
......
/*! $Id: ModbusTCPMaster.h,v 1.1 2008/11/22 23:22:24 vpashka Exp $ */
// -------------------------------------------------------------------------
#ifndef ModbusTCPMaster_H_ #ifndef ModbusTCPMaster_H_
#define ModbusTCPMaster_H_ #define ModbusTCPMaster_H_
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
......
...@@ -14,7 +14,7 @@ ModbusTCPMaster::ModbusTCPMaster(): ...@@ -14,7 +14,7 @@ ModbusTCPMaster::ModbusTCPMaster():
tcp(0), tcp(0),
nTransaction(0), nTransaction(0),
iaddr(""), iaddr(""),
force_disconnect(false) force_disconnect(true)
{ {
setCRCNoCheckit(true); setCRCNoCheckit(true);
} }
......
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