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
65441f29
Commit
65441f29
authored
Nov 13, 2014
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Исправил ошибку не позволявщую задать ObjectId=0.
Хотя это разрешено.
parent
b0310ae3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
libuniset.spec
conf/libuniset.spec
+4
-1
test.xml
conf/test.xml
+3
-0
ObjectIndex_idXML.cc
src/ObjectRepository/ObjectIndex_idXML.cc
+2
-2
No files found.
conf/libuniset.spec
View file @
65441f29
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
Name: libuniset
Name: libuniset
Version: 1.8
Version: 1.8
Release: alt
1
Release: alt
2
Summary: UniSet - library for building distributed industrial control systems
Summary: UniSet - library for building distributed industrial control systems
...
@@ -336,6 +336,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
...
@@ -336,6 +336,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%exclude %_pkgconfigdir/libUniSet.pc
%exclude %_pkgconfigdir/libUniSet.pc
%changelog
%changelog
* Thu Nov 13 2014 Pavel Vainerman <pv@altlinux.ru> 1.8-alt2
- fixed bug: Now ObjectID=0 does not cause an error
* Thu Oct 30 2014 Pavel Vainerman <pv@altlinux.ru> 1.8-alt1
* Thu Oct 30 2014 Pavel Vainerman <pv@altlinux.ru> 1.8-alt1
- (IOBase): added the ability to override the basic settings using the prefix.
- (IOBase): added the ability to override the basic settings using the prefix.
- (SQLiteInterface): fixed bug in SQLiteResult
- (SQLiteInterface): fixed bug in SQLiteResult
...
...
conf/test.xml
View file @
65441f29
...
@@ -158,7 +158,10 @@
...
@@ -158,7 +158,10 @@
</nodes>
</nodes>
<!-- ************************ Датчики ********************** -->
<!-- ************************ Датчики ********************** -->
<sensors
name=
"Sensors"
>
<sensors
name=
"Sensors"
>
<item
id=
"0"
iotype=
"DI"
name=
"ZeroInput1_S"
priority=
"Medium"
textname=
"Команда 0"
/>
<item
db_ignore=
"1"
default=
"1"
id=
"1"
iotype=
"DI"
name=
"Input1_S"
priority=
"Medium"
textname=
"Команда 1"
/>
<item
db_ignore=
"1"
default=
"1"
id=
"1"
iotype=
"DI"
name=
"Input1_S"
priority=
"Medium"
textname=
"Команда 1"
/>
<item
id=
"200"
iotype=
"DI"
mbaddr=
"0x01"
mbfunc=
"0x04"
mbreg=
"0"
mbtype=
"rtu"
name=
"MBREG0_S"
nbit=
"11"
priority=
"Medium"
rs=
"5"
textname=
"mbreg=0"
/>
<item
id=
"2"
iotype=
"DI"
mbaddr=
"0x01"
mbfunc=
"0x06"
mbreg=
"0x02"
mbtype=
"rtu"
name=
"Input2_S"
nbit=
"11"
priority=
"Medium"
rs=
"4"
textname=
"Команда 2"
/>
<item
id=
"2"
iotype=
"DI"
mbaddr=
"0x01"
mbfunc=
"0x06"
mbreg=
"0x02"
mbtype=
"rtu"
name=
"Input2_S"
nbit=
"11"
priority=
"Medium"
rs=
"4"
textname=
"Команда 2"
/>
<item
id=
"3"
iotype=
"DI"
mbtcp=
"1"
mbtcp_mbaddr=
"0x02"
mbtcp_mbfunc=
"0x03"
mbtcp_mbreg=
"0x02"
mbtcp_mbtype=
"rtu"
name=
"Input3_S"
priority=
"Medium"
textname=
"Команда 3"
/>
<item
id=
"3"
iotype=
"DI"
mbtcp=
"1"
mbtcp_mbaddr=
"0x02"
mbtcp_mbfunc=
"0x03"
mbtcp_mbreg=
"0x02"
mbtcp_mbtype=
"rtu"
name=
"Input3_S"
priority=
"Medium"
textname=
"Команда 3"
/>
<item
id=
"4"
iotype=
"DI"
mbaddr=
"0x02"
mbfunc=
"0x04"
mbreg=
"0x02"
mbtype=
"rtu"
name=
"Input4_S"
priority=
"Medium"
rs=
"2"
textname=
"Команда 4"
/>
<item
id=
"4"
iotype=
"DI"
mbaddr=
"0x02"
mbfunc=
"0x04"
mbreg=
"0x02"
mbtype=
"rtu"
name=
"Input4_S"
priority=
"Medium"
rs=
"2"
textname=
"Команда 4"
/>
...
...
src/ObjectRepository/ObjectIndex_idXML.cc
View file @
65441f29
...
@@ -131,9 +131,9 @@ void ObjectIndex_idXML::read_section( UniXML& xml, const std::string& sec )
...
@@ -131,9 +131,9 @@ void ObjectIndex_idXML::read_section( UniXML& xml, const std::string& sec )
for
(
;
it
.
getCurrent
();
it
.
goNext
()
)
for
(
;
it
.
getCurrent
();
it
.
goNext
()
)
{
{
ObjectInfo
inf
;
ObjectInfo
inf
;
inf
.
id
=
it
.
get
IntProp
(
"id"
);
inf
.
id
=
it
.
get
PIntProp
(
"id"
,
DefaultObjectId
);
if
(
inf
.
id
<=
0
)
if
(
inf
.
id
==
DefaultObjectId
)
{
{
ostringstream
msg
;
ostringstream
msg
;
msg
<<
"(ObjectIndex_idXML::build): НЕ УКАЗАН id для "
<<
it
.
getProp
(
"name"
)
msg
<<
"(ObjectIndex_idXML::build): НЕ УКАЗАН id для "
<<
it
.
getProp
(
"name"
)
...
...
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