Commit 3586e716 authored by Pavel Vainerman's avatar Pavel Vainerman

minor fixed: remove SIGTERM

parent 6b9b559d
...@@ -614,7 +614,6 @@ void RTUExchange::processingMessage(UniSetTypes::VoidMessage *msg) ...@@ -614,7 +614,6 @@ void RTUExchange::processingMessage(UniSetTypes::VoidMessage *msg)
{ {
dlog[Debug::CRIT] << myname << "(SystemError): " << ex << std::endl; dlog[Debug::CRIT] << myname << "(SystemError): " << ex << std::endl;
// throw SystemError(ex); // throw SystemError(ex);
raise(SIGTERM);
} }
catch( Exception& ex ) catch( Exception& ex )
{ {
...@@ -626,7 +625,7 @@ void RTUExchange::processingMessage(UniSetTypes::VoidMessage *msg) ...@@ -626,7 +625,7 @@ void RTUExchange::processingMessage(UniSetTypes::VoidMessage *msg)
} }
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void RTUExchange::sysCommand(UniSetTypes::SystemMessage *sm) void RTUExchange::sysCommand( UniSetTypes::SystemMessage *sm )
{ {
switch( sm->command ) switch( sm->command )
{ {
...@@ -1080,93 +1079,6 @@ bool RTUExchange::initRTU188item( UniXML_iterator& it, RSProperty& p ) ...@@ -1080,93 +1079,6 @@ bool RTUExchange::initRTU188item( UniXML_iterator& it, RSProperty& p )
p.rtuChan = UniSetTypes::uni_atoi(chan.c_str()); p.rtuChan = UniSetTypes::uni_atoi(chan.c_str());
/*
if( p.stype == UniversalIO::DigitalInput )
{
if( jack =="J1" )
p.mbreg = 32+nchan;
else if( jack == "J2" )
p.mbreg = 32+24+nchan;
else if( jack == "X4" )
p.mbreg = nchan;
else if( jack == "X5" )
p.mbreg = 8+nchan;
else if( jack == "J5" )
p.mbreg = 16+nchan;
else
{
dlog[Debug::CRIT] << myname << "(readRTUItem): "
<< " ߣ jack=" << jack
<< " " << it.getProp("name")
<< std::endl;
return false;
}
}
else if( p.stype == UniversalIO::DigitalOutput )
{
if( jack =="J1" )
p.mbreg = 16+nchan;
else if( jack == "J2" )
p.mbreg = 16+24+nchan;
else if( jack == "J5" )
p.mbreg = nchan;
else
{
dlog[Debug::CRIT] << myname << "(readRTUItem): "
<< " ߣ jack=" << jack
<< " " << it.getProp("name")
<< std::endl;
return false;
}
}
else if( p.stype == UniversalIO::AnalogInput )
{
if( jack =="J1" )
p.mbreg = 1032+(nchan<<1);
else if( jack == "J2" )
p.mbreg = 1032+((24+nchan)<<1);
else if( jack == "X1" )
p.mbreg = 1016+(nchan<<1);
else if( jack == "X2" )
p.mbreg = 1016+((4+nchan)<<1);
else if( jack == "J5" )
p.mbreg = 1000+(nchan<<1);
else
{
dlog[Debug::CRIT] << myname << "(readRTUItem): "
<< " ߣ jack=" << jack
<< " " << it.getProp("name")
<< std::endl;
return false;
}
}
else if( p.stype == UniversalIO::AnalogOutput )
{
if( jack =="J1" )
p.mbreg = 1016+(nchan<<1);
else if( jack == "J2" )
p.mbreg = 1016+((24+nchan)<<1);
else if( jack == "J5" )
p.mbreg = 1000+(nchan<<1);
else
{
dlog[Debug::CRIT] << myname << "(readRTUItem): "
<< " ߣ jack=" << jack
<< " " << it.getProp("name")
<< std::endl;
return false;
}
}
else
{
dlog[Debug::CRIT] << myname << "(readItem): "
<< " iotype=" << p.stype
<< " " << it.getProp("name")
<< std::endl;
return false;
}
*/
if( dlog.debugging(Debug::LEVEL2) ) if( dlog.debugging(Debug::LEVEL2) )
dlog[Debug::LEVEL2] << myname << "(readItem): " << p << endl; dlog[Debug::LEVEL2] << myname << "(readItem): " << p << endl;
...@@ -1207,20 +1119,20 @@ RTUExchange* RTUExchange::init_rtuexchange( int argc, char* argv[], UniSetTypes: ...@@ -1207,20 +1119,20 @@ RTUExchange* RTUExchange::init_rtuexchange( int argc, char* argv[], UniSetTypes:
string name = conf->getArgParam("--rs-name","RTUExchange1"); string name = conf->getArgParam("--rs-name","RTUExchange1");
if( name.empty() ) if( name.empty() )
{ {
cerr << "(rsexchange): name'" << endl; cerr << "(rtuexchange): name'" << endl;
return 0; return 0;
} }
ObjectId ID = conf->getObjectID(name); ObjectId ID = conf->getObjectID(name);
if( ID == UniSetTypes::DefaultObjectId ) if( ID == UniSetTypes::DefaultObjectId )
{ {
cerr << "(rsexchange): '" << name cerr << "(rtuexchange): '" << name
<< "' . !" << "' . !"
<< " " << conf->getObjectsSection() << endl; << " " << conf->getObjectsSection() << endl;
return 0; return 0;
} }
dlog[Debug::INFO] << "(rsexchange): name = " << name << "(" << ID << ")" << endl; dlog[Debug::INFO] << "(rtuexchange): name = " << name << "(" << ID << ")" << endl;
return new RTUExchange(ID,icID,ic); return new RTUExchange(ID,icID,ic);
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
......
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