Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
89de470a
Commit
89de470a
authored
Aug 04, 2009
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
исправления в комментариях и по формированию документации
parent
fdedcea3
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
24 additions
and
24 deletions
+24
-24
IOController_i.idl
IDL/Processes/IOController_i.idl
+1
-1
LT_Object.h
include/LT_Object.h
+3
-3
Restorer.h
include/Restorer.h
+4
-4
TriggerAND.h
include/TriggerAND.h
+1
-1
TriggerOR.h
include/TriggerOR.h
+1
-1
UniversalInterface.h
include/UniversalInterface.h
+2
-2
UniSetObject.cc
src/ObjectRepository/UniSetObject.cc
+2
-2
IONotifyController.cc
src/Processes/IONotifyController.cc
+2
-2
TimerService.cc
src/Services/TimerService.cc
+8
-8
No files found.
IDL/Processes/IOController_i.idl
View file @
89de470a
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
//
--------------------------------------------------------------------------------------------------------------
//
--------------------------------------------------------------------------------------------------------------
/*
!
/*
!
*
\
inteface
IOController_i
*
\
inte
r
face
IOController_i
*
\
brief
/
*
\
brief
/
*
*
*/
*/
...
...
include/LT_Object.h
View file @
89de470a
...
@@ -92,7 +92,7 @@ class UniSetObject;
...
@@ -92,7 +92,7 @@ class UniSetObject;
\endcode
\endcode
\warning .
\warning .
\sa TimerService
\sa TimerService
*/
*/
class
LT_Object
class
LT_Object
...
@@ -183,9 +183,9 @@ class LT_Object
...
@@ -183,9 +183,9 @@ class LT_Object
private
:
private
:
TimersList
tlst
;
TimersList
tlst
;
/*! c */
/*! c */
UniSetTypes
::
uniset_mutex
lstMutex
;
UniSetTypes
::
uniset_mutex
lstMutex
;
int
sleepTime
;
timeout_t
sleepTime
;
/*!< */
PassiveTimer
tmLast
;
PassiveTimer
tmLast
;
};
};
//--------------------------------------------------------------------------
//--------------------------------------------------------------------------
...
...
include/Restorer.h
View file @
89de470a
...
@@ -47,8 +47,8 @@ class Restorer_XML
...
@@ -47,8 +47,8 @@ class Restorer_XML
/*! xml-.
/*! xml-.
\param uxml - xml-
\param uxml - xml-
\param it -
() xml- (<item>
)
\param it -
() xml- (item
)
\param sec -
() (<SubscriberList>
)
\param sec -
() (SubscriberList
)
\return TRUE - , FALSE -
\return TRUE - , FALSE -
*/
*/
typedef
sigc
::
slot
<
bool
,
UniXML
&
,
UniXML_iterator
&
,
xmlNode
*>
ReaderSlot
;
typedef
sigc
::
slot
<
bool
,
UniXML
&
,
UniXML_iterator
&
,
xmlNode
*>
ReaderSlot
;
...
@@ -61,8 +61,8 @@ class Restorer_XML
...
@@ -61,8 +61,8 @@ class Restorer_XML
UniXML_iterator& it, xmlNode* sec)
UniXML_iterator& it, xmlNode* sec)
uxml - xml-
uxml - xml-
it - () xml- (
<item>
)
it - () xml- (
item
)
sec - (
<SubscriberList>
)
sec - (
SubscriberList
)
*/
*/
void
setReadItem
(
ReaderSlot
sl
);
void
setReadItem
(
ReaderSlot
sl
);
...
...
include/TriggerAND.h
View file @
89de470a
...
@@ -77,7 +77,7 @@ class TriggerAND
...
@@ -77,7 +77,7 @@ class TriggerAND
/*!
/*!
\p
rar
m newstate - ''
\p
ara
m newstate - ''
*/
*/
typedef
void
(
Caller
::*
Action
)(
bool
newstate
);
typedef
void
(
Caller
::*
Action
)(
bool
newstate
);
...
...
include/TriggerOR.h
View file @
89de470a
...
@@ -76,7 +76,7 @@ class TriggerOR
...
@@ -76,7 +76,7 @@ class TriggerOR
/*!
/*!
\p
rar
m newstate - ''
\p
ara
m newstate - ''
*/
*/
typedef
void
(
Caller
::*
Action
)(
bool
newstate
);
typedef
void
(
Caller
::*
Action
)(
bool
newstate
);
...
...
include/UniversalInterface.h
View file @
89de470a
...
@@ -60,9 +60,9 @@ namespace UniversalIO
...
@@ -60,9 +60,9 @@ namespace UniversalIO
/*!
/*!
* \class UniversalInterface
* \class UniversalInterface
* ... ... ( 40!...)
* ... ... ( 40!...)
* cache ...
* cache ...
*
*
* . \ref UniversalIOCont
or
llerPage
* . \ref UniversalIOCont
ro
llerPage
*/
*/
class
UniversalInterface
class
UniversalInterface
{
{
...
...
src/ObjectRepository/UniSetObject.cc
View file @
89de470a
...
@@ -218,8 +218,8 @@ void UniSetObject::setID( UniSetTypes::ObjectId id )
...
@@ -218,8 +218,8 @@ void UniSetObject::setID( UniSetTypes::ObjectId id )
// ------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------
/*!
/*!
* \param
VoidMessage msg
- ,
* \param
vm
- ,
* \return \a true , \a false
* \return \a true , \a false
*/
*/
bool
UniSetObject
::
receiveMessage
(
VoidMessage
&
vm
)
bool
UniSetObject
::
receiveMessage
(
VoidMessage
&
vm
)
{
{
...
...
src/Processes/IONotifyController.cc
View file @
89de470a
...
@@ -201,7 +201,7 @@ void IONotifyController::askState( const IOController_i::SensorInfo& si,
...
@@ -201,7 +201,7 @@ void IONotifyController::askState( const IOController_i::SensorInfo& si,
unideb
[
Debug
::
INFO
]
<<
" "
<<
name
<<
" "
unideb
[
Debug
::
INFO
]
<<
" "
<<
name
<<
" "
<<
conf
->
oind
->
getNameById
(
si
.
id
,
si
.
node
)
<<
endl
;
<<
conf
->
oind
->
getNameById
(
si
.
id
,
si
.
node
)
<<
endl
;
// ...
//
,
...
DIOStateList
::
iterator
li
=
mydioEnd
();
DIOStateList
::
iterator
li
=
mydioEnd
();
bool
st
=
localGetState
(
li
,
si
);
bool
st
=
localGetState
(
li
,
si
);
...
@@ -286,7 +286,7 @@ void IONotifyController::askValue(const IOController_i::SensorInfo& si,
...
@@ -286,7 +286,7 @@ void IONotifyController::askValue(const IOController_i::SensorInfo& si,
<<
conf
->
oind
->
getNameById
(
si
.
id
,
si
.
node
)
<<
endl
;
<<
conf
->
oind
->
getNameById
(
si
.
id
,
si
.
node
)
<<
endl
;
}
}
// ...
//
,
...
AIOStateList
::
iterator
li
=
myaioEnd
();
AIOStateList
::
iterator
li
=
myaioEnd
();
long
val
=
localGetValue
(
li
,
si
);
long
val
=
localGetValue
(
li
,
si
);
if
(
li
->
second
.
type
!=
UniversalIO
::
AnalogInput
)
if
(
li
->
second
.
type
!=
UniversalIO
::
AnalogInput
)
...
...
src/Services/TimerService.cc
View file @
89de470a
...
@@ -66,17 +66,17 @@ TimerService::~TimerService()
...
@@ -66,17 +66,17 @@ TimerService::~TimerService()
}
}
// ------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------
/*
!
/*
* \param timerid -
* \param ti
.ti
merid -
* \param timeMS - (0 - )
* \param ti
.ti
meMS - (0 - )
* \param fromId -
* \param
ci.
fromId -
* \param
node -
* \param
ci.node - ,
* \exception TimerService_i::TimerAlreadyExist -
* \exception TimerService_i::TimerAlreadyExist -
* \b \b
* \b \b
*/
*/
void
TimerService
::
askTimer
(
const
TimerService_i
::
Timer
&
ti
,
const
UniSetTypes
::
ConsumerInfo
&
ci
)
void
TimerService
::
askTimer
(
const
TimerService_i
::
Timer
&
ti
,
const
UniSetTypes
::
ConsumerInfo
&
ci
)
{
{
if
(
ti
.
timeMS
>
0
)
//
if
(
ti
.
timeMS
>
0
)
//
{
{
if
(
tlst
.
size
()
>=
MaxCountTimers
)
if
(
tlst
.
size
()
>=
MaxCountTimers
)
{
{
...
@@ -85,10 +85,10 @@ void TimerService::askTimer( const TimerService_i::Timer& ti, const UniSetTypes:
...
@@ -85,10 +85,10 @@ void TimerService::askTimer( const TimerService_i::Timer& ti, const UniSetTypes:
throw
ex
;
throw
ex
;
}
}
if
(
ti
.
timeMS
<
UniSetTimer
::
M
IN_QUANTITY_TIME_MS
)
if
(
ti
.
timeMS
<
UniSetTimer
::
M
inQuantityTime
)
{
{
TimerService_i
::
TimeMSLowLimit
ex
;
TimerService_i
::
TimeMSLowLimit
ex
;
ex
.
lowLimitMS
=
UniSetTimer
::
M
IN_QUANTITY_TIME_MS
;
ex
.
lowLimitMS
=
UniSetTimer
::
M
inQuantityTime
;
throw
ex
;
throw
ex
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment