Commit d04fdd02 authored by Pavel Vainerman's avatar Pavel Vainerman

(IOControl): немного откорректировал логи

parent 2c1149e4
...@@ -82,22 +82,22 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID, ...@@ -82,22 +82,22 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
s2 << "iodev" << i; s2 << "iodev" << i;
string iodev = conf->getArgParam(s1.str(),it.getProp(s2.str())); string iodev = conf->getArgParam(s1.str(),it.getProp(s2.str()));
if( iodev.empty() || iodev == "/dev/null" ) if( iodev.empty() )
continue;
if( iodev == "/dev/null" )
{ {
if( cards[i] == NULL ) if( cards[i] == NULL )
{ {
unideb[Debug::LEVEL3] << myname << "(init): Card N" << i unideb[Debug::LEVEL3] << myname << "(init): Card N" << i
<< " DISABLE (TestMode)!!! dev='" << " DISABLED! dev='"
<< iodev << "'" << endl; << iodev << "'" << endl;
cout << "******************** CARD" << i << ": IO IMITATOR MODE ****************" << endl;
} }
} }
else else
{ {
noCards = false; noCards = false;
// if( cards[i] != NULL ) delete cards[i];
cards[i] = new ComediInterface(iodev); cards[i] = new ComediInterface(iodev);
// cout << "card" << i << ": " << cards[i]->devname() << endl;
unideb[Debug::LEVEL3] << myname << "(init): ADD card" << i << " dev=" << iodev << endl; unideb[Debug::LEVEL3] << myname << "(init): ADD card" << i << " dev=" << iodev << endl;
} }
...@@ -1611,7 +1611,7 @@ void IOControl::buildCardsList() ...@@ -1611,7 +1611,7 @@ void IOControl::buildCardsList()
return; return;
} }
for( int i=0; i<cards.size(); i++ ) for( size_t i=0; i<cards.size(); i++ )
{ {
if( cards[i] == 0 ) if( cards[i] == 0 )
break; break;
...@@ -1651,7 +1651,7 @@ void IOControl::buildCardsList() ...@@ -1651,7 +1651,7 @@ void IOControl::buildCardsList()
{ {
cards[cardnum] = NULL; cards[cardnum] = NULL;
unideb[Debug::LEVEL3] << myname << "(init): card=" << it.getProp("card") << "(" << cname << ")" unideb[Debug::LEVEL3] << myname << "(init): card=" << it.getProp("card") << "(" << cname << ")"
<< " DISABLE! (" << s.str() << ")" << endl; << " DISABLED! (" << s.str() << ")" << endl;
continue; continue;
} }
...@@ -1661,9 +1661,8 @@ void IOControl::buildCardsList() ...@@ -1661,9 +1661,8 @@ void IOControl::buildCardsList()
{ {
cards[cardnum] = NULL; cards[cardnum] = NULL;
unideb[Debug::LEVEL3] << myname << "(init): card=" << it.getProp("card") << "(" << cname << ")" unideb[Debug::LEVEL3] << myname << "(init): card=" << it.getProp("card") << "(" << cname << ")"
<< " DISABLED (TestMode)!!! iodev='" << " DISABLED! iodev='"
<< iodev << "'" << endl; << iodev << "'" << endl;
cout << "******************** CARD" << cardnum << ": DISABLE!" << endl;
continue; continue;
} }
......
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