Commit bb0b29c8 authored by Pavel Vainerman's avatar Pavel Vainerman

minor fixes

parent 73d3fbb6
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<ServicesSection name="Services"/> <ServicesSection name="Services"/>
<NameService host="localhost" port="2809"/> <NameService host="localhost" port="2809"/>
<SizeOfMessageQueue name="2000"/> <SizeOfMessageQueue name="2000"/>
<LocalIOR name="1"/> <LocalIOR name="0"/>
<!-- Debug, logs --> <!-- Debug, logs -->
<UniSetDebug name="unideb" levels="crit,warn" file=""/> <UniSetDebug name="unideb" levels="crit,warn" file=""/>
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
<ConfDir name=""/> <ConfDir name=""/>
<DataDir name=""/> <DataDir name=""/>
<BinDir name=""/> <BinDir name=""/>
<LogDir name="/home/pv/tmp/"/> <LogDir name=""/>
<DocDir name=""/> <DocDir name=""/>
<LockDir name="/home/pv/tmp/"/> <LockDir name=""/>
<Services> <Services>
<LocalTimeService name="TimeService" MaxCountTimers="100" AskLifeTimeSEC="10"/> <LocalTimeService name="TimeService" MaxCountTimers="100" AskLifeTimeSEC="10"/>
......
...@@ -23,7 +23,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID, ...@@ -23,7 +23,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
SharedMemory* ic, int numcards ): SharedMemory* ic, int numcards ):
UniSetObject(id), UniSetObject(id),
polltime(500), polltime(500),
cards(numcards), cards(numcards+1),
noCards(true), noCards(true),
iomap(100), iomap(100),
maxItem(0), maxItem(0),
...@@ -56,7 +56,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID, ...@@ -56,7 +56,7 @@ IOControl::IOControl( UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
UniXML_iterator it(cnode); UniXML_iterator it(cnode);
noCards = true; noCards = true;
for( unsigned int i=0; i <cards.size(); i++ ) for( unsigned int i=0; i=<cards.size(); i++ )
{ {
stringstream s1; stringstream s1;
s1 << "--iodev" << i; s1 << "--iodev" << i;
...@@ -278,7 +278,7 @@ void IOControl::execute() ...@@ -278,7 +278,7 @@ void IOControl::execute()
try try
{ {
// init first time.... // init first time....
if( !force ) if( !force && !noCards )
{ {
uniset_mutex_lock l(iopollMutex,5000); uniset_mutex_lock l(iopollMutex,5000);
force = true; force = true;
...@@ -743,7 +743,7 @@ void IOControl::initIOCard() ...@@ -743,7 +743,7 @@ void IOControl::initIOCard()
if( noCards ) if( noCards )
return; return;
ComediInterface* card(0); ComediInterface* card = 0;
for( IOMap::iterator it=iomap.begin(); it!=iomap.end(); ++it ) for( IOMap::iterator it=iomap.begin(); it!=iomap.end(); ++it )
{ {
......
...@@ -68,9 +68,9 @@ class IOControl: ...@@ -68,9 +68,9 @@ class IOControl:
{} {}
short subdev; /*!< (UNIO) (. comedi_test /) */ int subdev; /*!< (UNIO) (. comedi_test /) */
short channel; /*!< (UNIO) [0...23] */ int channel; /*!< (UNIO) [0...23] */
short ncard; /*!< [1|2]. 0 - */ int ncard; /*!< [1|2]. 0 - */
/*! /*!
0 - analog ref = analog ground 0 - analog ref = analog ground
......
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