Commit 89de470a authored by Vitaly Lipatov's avatar Vitaly Lipatov

исправления в комментариях и по формированию документации

parent fdedcea3
......@@ -31,7 +31,7 @@
// --------------------------------------------------------------------------------------------------------------
/*!
* \inteface IOController_i
* \interface IOController_i
* \brief /
*
*/
......
......@@ -92,7 +92,7 @@ class UniSetObject;
\endcode
\warning .
\warning .
\sa TimerService
*/
class LT_Object
......@@ -183,9 +183,9 @@ class LT_Object
private:
TimersList tlst;
/*! c */
/*! c */
UniSetTypes::uniset_mutex lstMutex;
int sleepTime;
timeout_t sleepTime; /*!< */
PassiveTimer tmLast;
};
//--------------------------------------------------------------------------
......
......@@ -47,8 +47,8 @@ class Restorer_XML
/*! xml-.
\param uxml - xml-
\param it - () xml- (<item>)
\param sec - () (<SubscriberList>)
\param it - () xml- (item)
\param sec - () (SubscriberList)
\return TRUE - , FALSE -
*/
typedef sigc::slot<bool,UniXML&,UniXML_iterator&,xmlNode*> ReaderSlot;
......@@ -61,8 +61,8 @@ class Restorer_XML
UniXML_iterator& it, xmlNode* sec)
uxml - xml-
it - () xml- (<item>)
sec - (<SubscriberList>)
it - () xml- (item)
sec - (SubscriberList)
*/
void setReadItem( ReaderSlot sl );
......
......@@ -77,7 +77,7 @@ class TriggerAND
/*!
\prarm newstate - ''
\param newstate - ''
*/
typedef void(Caller::* Action)(bool newstate);
......
......@@ -76,7 +76,7 @@ class TriggerOR
/*!
\prarm newstate - ''
\param newstate - ''
*/
typedef void(Caller::* Action)(bool newstate);
......
......@@ -60,9 +60,9 @@ namespace UniversalIO
/*!
* \class UniversalInterface
* ... ... ( 40!...)
* cache ...
* cache ...
*
* . \ref UniversalIOContorllerPage
* . \ref UniversalIOControllerPage
*/
class UniversalInterface
{
......
......@@ -218,8 +218,8 @@ void UniSetObject::setID( UniSetTypes::ObjectId id )
// ------------------------------------------------------------------------------------------
/*!
* \param VoidMessage msg - ,
* \return \a true , \a false
* \param vm - ,
* \return \a true , \a false
*/
bool UniSetObject::receiveMessage( VoidMessage& vm )
{
......
......@@ -201,7 +201,7 @@ void IONotifyController::askState( const IOController_i::SensorInfo& si,
unideb[Debug::INFO] << " "<< name << " "
<< conf->oind->getNameById(si.id,si.node) << endl;
// ...
// , ...
DIOStateList::iterator li = mydioEnd();
bool st = localGetState(li,si);
......@@ -286,7 +286,7 @@ void IONotifyController::askValue(const IOController_i::SensorInfo& si,
<< conf->oind->getNameById(si.id,si.node) << endl;
}
// ...
// , ...
AIOStateList::iterator li = myaioEnd();
long val = localGetValue(li,si);
if( li->second.type != UniversalIO::AnalogInput )
......
......@@ -66,17 +66,17 @@ TimerService::~TimerService()
}
// ------------------------------------------------------------------------------------------
/*!
* \param timerid -
* \param timeMS - (0 - )
* \param fromId -
* \param node -
/*
* \param ti.timerid -
* \param ti.timeMS - (0 - )
* \param ci.fromId -
* \param ci.node - ,
* \exception TimerService_i::TimerAlreadyExist -
* \b \b
*/
void TimerService::askTimer( const TimerService_i::Timer& ti, const UniSetTypes::ConsumerInfo& ci )
{
if( ti.timeMS>0 ) //
if( ti.timeMS > 0 ) //
{
if( tlst.size() >= MaxCountTimers )
{
......@@ -85,10 +85,10 @@ void TimerService::askTimer( const TimerService_i::Timer& ti, const UniSetTypes:
throw ex;
}
if( ti.timeMS < UniSetTimer::MIN_QUANTITY_TIME_MS )
if( ti.timeMS < UniSetTimer::MinQuantityTime )
{
TimerService_i::TimeMSLowLimit ex;
ex.lowLimitMS = UniSetTimer::MIN_QUANTITY_TIME_MS;
ex.lowLimitMS = UniSetTimer::MinQuantityTime;
throw ex;
}
......
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