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
a86540ac
Commit
a86540ac
authored
Mar 15, 2012
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(unet2): исправил ошибку в конфигурировании датчика связи
parent
34413c52
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
6 deletions
+9
-6
libuniset.spec
conf/libuniset.spec
+4
-1
test.xml
conf/test.xml
+0
-0
UNetExchange.cc
extensions/UNet2/UNetExchange.cc
+4
-4
start_fg.sh
extensions/UNet2/start_fg.sh
+1
-1
No files found.
conf/libuniset.spec
View file @
a86540ac
...
...
@@ -3,7 +3,7 @@
Name: libuniset
Version: 1.3
Release: alt1
4
Release: alt1
5
Summary: UniSet - library for building distributed industrial control systems
License: GPL
Group: Development/C++
...
...
@@ -213,6 +213,9 @@ rm -f %buildroot%_libdir/*.la
%changelog
* Thu Mar 15 2012 Pavel Vainerman <pv@altlinux.ru> 1.3-alt15
- (unet2): fixed bug in respond sensors
* Thu Mar 15 2012 Pavel Vainerman <pv@altlinux.ru> 1.3-alt14
- (unet2): add 'unet_respond_invert' parameter
...
...
conf/test.xml
View file @
a86540ac
This diff is collapsed.
Click to expand it.
extensions/UNet2/UNetExchange.cc
View file @
a86540ac
...
...
@@ -152,7 +152,7 @@ sender2(0)
}
bool
resp_invert
=
n_it
.
getIntProp
(
"unet_respond_invert"
);
string
s_resp_id
(
n_it
.
getProp
(
"unet_respond1_id"
));
UniSetTypes
::
ObjectId
resp_id
=
UniSetTypes
::
DefaultObjectId
;
if
(
!
s_resp_id
.
empty
()
)
...
...
@@ -166,7 +166,7 @@ sender2(0)
throw
SystemError
(
err
.
str
());
}
}
string
s_resp2_id
(
n_it
.
getProp
(
"unet_respond2_id"
));
UniSetTypes
::
ObjectId
resp2_id
=
UniSetTypes
::
DefaultObjectId
;
if
(
!
s_resp2_id
.
empty
()
)
...
...
@@ -223,7 +223,7 @@ sender2(0)
}
}
string
s_resp_comm_id
(
n_it
.
getProp
(
"unet_respond
2
_id"
));
string
s_resp_comm_id
(
n_it
.
getProp
(
"unet_respond_id"
));
UniSetTypes
::
ObjectId
resp_comm_id
=
UniSetTypes
::
DefaultObjectId
;
if
(
!
s_resp_comm_id
.
empty
()
)
{
...
...
@@ -231,7 +231,7 @@ sender2(0)
if
(
resp_comm_id
==
UniSetTypes
::
DefaultObjectId
)
{
ostringstream
err
;
err
<<
myname
<<
": Unknown RespondID(
2
).. Not found id for '"
<<
s_resp_comm_id
<<
"'"
<<
endl
;
err
<<
myname
<<
": Unknown RespondID(
comm
).. Not found id for '"
<<
s_resp_comm_id
<<
"'"
<<
endl
;
dlog
[
Debug
::
CRIT
]
<<
myname
<<
"(init): "
<<
err
.
str
()
<<
endl
;
throw
SystemError
(
err
.
str
());
}
...
...
extensions/UNet2/start_fg.sh
View file @
a86540ac
#!/bin/sh
uniset-start.sh
-f
./uniset-unetexchange
--unet-name
UNetExchange
\
--confile
test.xml
\
--confile
test.xml
--smemory-id
SharedMemory
\
--unet-filter-field
rs
--unet-filter-value
2
--unet-maxdifferense
40
\
--dlog-add-levels
info,crit,warn
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