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
833ce917
Commit
833ce917
authored
Aug 06, 2009
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add comments and fix tabs
parent
b5a34d4b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
11 deletions
+17
-11
IOControl.cc
extensions/IOControl/IOControl.cc
+1
-1
TriggerOR.h
include/TriggerOR.h
+4
-4
TriggerOutput.h
include/TriggerOutput.h
+4
-4
Configuration.cc
src/Various/Configuration.cc
+1
-1
MessageType.cc
src/Various/MessageType.cc
+1
-1
UniXML.cc
src/Various/UniXML.cc
+6
-0
No files found.
extensions/IOControl/IOControl.cc
View file @
833ce917
...
@@ -742,7 +742,7 @@ void IOControl::initIOCard()
...
@@ -742,7 +742,7 @@ void IOControl::initIOCard()
try
try
{
{
// /
// /
// "" (.. )
// "" (.. )
if
(
it
->
lamp
)
if
(
it
->
lamp
)
card
->
configureChannel
(
it
->
subdev
,
it
->
channel
,
ComediInterface
::
DO
);
card
->
configureChannel
(
it
->
subdev
,
it
->
channel
,
ComediInterface
::
DO
);
else
if
(
it
->
stype
==
UniversalIO
::
DigitalInput
)
else
if
(
it
->
stype
==
UniversalIO
::
DigitalInput
)
...
...
include/TriggerOR.h
View file @
833ce917
...
@@ -87,10 +87,10 @@ class TriggerOR
...
@@ -87,10 +87,10 @@ class TriggerOR
bool
getState
(
InputType
in
);
bool
getState
(
InputType
in
);
bool
commit
(
InputType
in
,
bool
state
);
bool
commit
(
InputType
in
,
bool
state
);
void
add
(
InputType
in
,
bool
state
);
void
add
(
InputType
in
,
bool
state
);
void
remove
(
InputType
in
);
void
remove
(
InputType
in
);
typedef
std
::
map
<
InputType
,
bool
>
InputMap
;
typedef
std
::
map
<
InputType
,
bool
>
InputMap
;
...
@@ -104,7 +104,7 @@ class TriggerOR
...
@@ -104,7 +104,7 @@ class TriggerOR
return
inputs
.
end
();
return
inputs
.
end
();
}
}
void
update
();
void
update
();
void
reset
();
void
reset
();
protected
:
protected
:
...
...
include/TriggerOutput.h
View file @
833ce917
...
@@ -85,7 +85,7 @@ class TriggerOutput
...
@@ -85,7 +85,7 @@ class TriggerOutput
\param out - ''
\param out - ''
\param val -
\param val -
*/
*/
typedef
void
(
Caller
::*
Action
)(
OutIdType
out
,
ValueType
val
);
typedef
void
(
Caller
::*
Action
)(
OutIdType
out
,
ValueType
val
);
TriggerOutput
(
Caller
*
r
,
Action
a
);
TriggerOutput
(
Caller
*
r
,
Action
a
);
~
TriggerOutput
();
~
TriggerOutput
();
...
@@ -98,16 +98,16 @@ class TriggerOutput
...
@@ -98,16 +98,16 @@ class TriggerOutput
\param out - ''
\param out - ''
\param val -
\param val -
*/
*/
void
set
(
OutIdType
out
,
ValueType
val
);
void
set
(
OutIdType
out
,
ValueType
val
);
/*! '' .
/*! '' .
\param out - ''
\param out - ''
\param val -
\param val -
*/
*/
void
add
(
OutIdType
out
,
ValueType
val
);
void
add
(
OutIdType
out
,
ValueType
val
);
/*! '' */
/*! '' */
void
remove
(
OutIdType
out
);
void
remove
(
OutIdType
out
);
void
update
();
void
update
();
void
reset
();
void
reset
();
...
...
src/Various/Configuration.cc
View file @
833ce917
...
@@ -318,7 +318,7 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
...
@@ -318,7 +318,7 @@ void Configuration::initConfiguration( int argc, const char* const* argv )
new_argv
[
i
]
=
"-ORBInitRef"
;
new_argv
[
i
]
=
"-ORBInitRef"
;
string
name
(
oind
->
getRealNodeName
(
it
->
id
));
string
name
(
oind
->
getRealNodeName
(
it
->
id
));
ostringstream
param
;
ostringstream
param
;
param
<<
name
<<
"=corbaname::"
<<
it
->
host
<<
":"
<<
it
->
port
;
param
<<
name
<<
"=corbaname::"
<<
it
->
host
<<
":"
<<
it
->
port
;
new_argv
[
i
+
1
]
=
strdup
(
param
.
str
().
c_str
());
new_argv
[
i
+
1
]
=
strdup
(
param
.
str
().
c_str
());
...
...
src/Various/MessageType.cc
View file @
833ce917
...
@@ -198,7 +198,7 @@ character(ch),
...
@@ -198,7 +198,7 @@ character(ch),
broadcast
(
true
),
broadcast
(
true
),
route
(
false
)
route
(
false
)
{
{
this
->
node
=
node
;
this
->
node
=
node
;
type
=
Message
::
Info
;
type
=
Message
::
Info
;
this
->
priority
=
priority
;
this
->
priority
=
priority
;
this
->
consumer
=
consumer
;
this
->
consumer
=
consumer
;
...
...
src/Various/UniXML.cc
View file @
833ce917
...
@@ -39,6 +39,12 @@
...
@@ -39,6 +39,12 @@
using
namespace
UniSetTypes
;
using
namespace
UniSetTypes
;
using
namespace
std
;
using
namespace
std
;
/* FIXME:
,
, .
libxmlmm.
UniXML.
*/
const
string
UniXML
::
InternalEncoding
(
"koi8-r"
);
const
string
UniXML
::
InternalEncoding
(
"koi8-r"
);
const
string
UniXML
::
ExternalEncoding
(
"koi8-r"
);
const
string
UniXML
::
ExternalEncoding
(
"koi8-r"
);
const
string
UniXML
::
xmlEncoding
(
"utf-8"
);
const
string
UniXML
::
xmlEncoding
(
"utf-8"
);
...
...
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