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
80fbfacf
Commit
80fbfacf
authored
Apr 24, 2014
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(IOControl): сделал в функции :setValue попытку сохранить как (DO)
в случае NotFound для AO
parent
b91eda75
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
libuniset.spec
conf/libuniset.spec
+4
-1
IOController.cc
src/Processes/IOController.cc
+10
-2
No files found.
conf/libuniset.spec
View file @
80fbfacf
...
...
@@ -8,7 +8,7 @@
Name: libuniset
Version: 1.7
Release: alt1
0
Release: alt1
1
Summary: UniSet - library for building distributed industrial control systems
...
...
@@ -335,6 +335,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%exclude %_pkgconfigdir/libUniSet.pc
%changelog
* Thu Apr 24 2014 Pavel Vainerman <pv@server> 1.7-alt11
- minor fixes IOControl::setValue
* Tue Apr 01 2014 Pavel Vainerman <pv@altlinux.ru> 1.7-alt10
- add new vtype: F2r, I2r, U2r (reverse data order)
...
...
src/Processes/IOController.cc
View file @
80fbfacf
...
...
@@ -469,8 +469,16 @@ void IOController::setValue( const IOController_i::SensorInfo& si, CORBA::Long v
if
(
sup_id
==
UniSetTypes
::
DefaultObjectId
)
sup_id
=
getId
();
IOController
::
AIOStateList
::
iterator
li
(
aioList
.
end
());
localSetValue
(
li
,
si
,
value
,
sup_id
);
try
{
IOController
::
AIOStateList
::
iterator
li
(
aioList
.
end
());
localSetValue
(
li
,
si
,
value
,
sup_id
);
}
// getValue if not found...
catch
(
IOController_i
::
NameNotFound
)
{
IOController
::
DIOStateList
::
iterator
li
(
dioList
.
end
());
localSetState
(
li
,
si
,
(
value
?
true
:
false
),
sup_id
);
}
}
void
IOController
::
fastSetValue
(
const
IOController_i
::
SensorInfo
&
si
,
CORBA
::
Long
value
,
UniSetTypes
::
ObjectId
sup_id
)
...
...
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