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
8a647064
Commit
8a647064
authored
Oct 26, 2013
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(python): Исправил ошибку в UInterface (неверно работал с UGlobal::to_sid)
parent
ee59f584
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
1 deletion
+25
-1
libuniset.spec
conf/libuniset.spec
+4
-1
UGlobal.py
python/lib/UGlobal.py
+3
-0
UInterface.py
python/lib/UInterface.py
+18
-0
No files found.
conf/libuniset.spec
View file @
8a647064
...
...
@@ -7,7 +7,7 @@
Name: libuniset
Version: 1.6
Release: alt1
3
Release: alt1
4
Summary: UniSet - library for building distributed industrial control systems
...
...
@@ -319,6 +319,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
%exclude %_pkgconfigdir/libUniSet.pc
%changelog
* Sat Oct 26 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt14
- (python): fixed bug in UInterface
* Thu Oct 24 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt13
- (python): add getArgParam, getArgInt and checkArg functions for UGlobal.py
...
...
python/lib/UGlobal.py
View file @
8a647064
...
...
@@ -22,6 +22,9 @@ def to_int(s):
if
s
.
__class__
.
__name__
==
"int"
:
return
s
if
s
.
__class__
.
__name__
==
"float"
:
return
int
(
s
)
if
len
(
s
)
>
2
and
s
[
0
]
==
'0'
and
s
[
1
]
==
'x'
:
return
int
(
s
,
16
)
...
...
python/lib/UInterface.py
View file @
8a647064
...
...
@@ -103,3 +103,21 @@ class UInterface():
return
""
raise
UException
(
"(setValue): Unknown interface
%
s"
%
self
.
utype
)
def
getShortName
(
self
,
s_node
):
if
self
.
itype
==
"uniset"
:
return
self
.
i
.
getShortName
(
s_node
)
if
self
.
itype
==
"modbus"
:
return
""
raise
UException
(
"(getShortName): Unknown interface
%
s"
%
self
.
utype
)
def
getNodeID
(
self
,
s_node
):
if
self
.
itype
==
"uniset"
:
return
self
.
i
.
getNodeID
(
s_node
)
if
self
.
itype
==
"modbus"
:
return
None
raise
UException
(
"(getNodeID): Unknown interface
%
s"
%
self
.
utype
)
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