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
da164e8b
Commit
da164e8b
authored
Sep 04, 2012
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Сделал чтобы getState искал в списке аналоговых датчиков, если не нашёл
в списке дискретных.. (аналогично getValue).
parent
e6d3b605
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
+11
-3
IOController.cc
src/Processes/IOController.cc
+11
-3
No files found.
src/Processes/IOController.cc
View file @
da164e8b
...
...
@@ -114,7 +114,15 @@ void IOController::sensorsUnregistration()
CORBA
::
Boolean
IOController
::
getState
(
const
IOController_i
::
SensorInfo
&
si
)
{
DIOStateList
::
iterator
li
(
dioList
.
end
());
return
localGetState
(
li
,
si
);
try
{
return
localGetState
(
li
,
si
);
}
// getValue if not found...
catch
(
IOController_i
::
NameNotFound
)
{
AIOStateList
::
iterator
a
(
aioList
.
end
());
return
(
localGetValue
(
a
,
si
)
?
true
:
false
);
}
}
// ------------------------------------------------------------------------------------------
...
...
@@ -127,8 +135,8 @@ CORBA::Long IOController::getValue( const IOController_i::SensorInfo& si )
}
// getState if not found...
catch
(
IOController_i
::
NameNotFound
)
{
DIOStateList
::
iterator
li
(
dioList
.
end
());
return
(
localGetState
(
li
,
si
)
?
1
:
0
);
DIOStateList
::
iterator
d
(
dioList
.
end
());
return
(
localGetState
(
d
,
si
)
?
1
:
0
);
}
}
// ------------------------------------------------------------------------------------------
...
...
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