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
bb0b29c8
Commit
bb0b29c8
authored
Jun 04, 2009
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor fixes
parent
73d3fbb6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
test.xml
conf/test.xml
+3
-3
IOControl.cc
extentions/IOControl/IOControl.cc
+4
-4
IOControl.h
extentions/IOControl/IOControl.h
+3
-3
No files found.
conf/test.xml
View file @
bb0b29c8
...
@@ -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"
/>
...
...
extentions/IOControl/IOControl.cc
View file @
bb0b29c8
...
@@ -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
)
{
{
...
...
extentions/IOControl/IOControl.h
View file @
bb0b29c8
...
@@ -68,9 +68,9 @@ class IOControl:
...
@@ -68,9 +68,9 @@ class IOControl:
{}
{}
short
subdev
;
/*!< (UNIO) (. comedi_test /) */
int
subdev
;
/*!< (UNIO) (. comedi_test /) */
shor
t
channel
;
/*!< (UNIO) [0...23] */
in
t
channel
;
/*!< (UNIO) [0...23] */
short
ncard
;
/*!< [1|2]. 0 - */
int
ncard
;
/*!< [1|2]. 0 - */
/*!
/*!
0 - analog ref = analog ground
0 - analog ref = analog ground
...
...
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