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
434bc9b2
Commit
434bc9b2
authored
Apr 29, 2014
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(uniset-codegen): добавил возможность задавать параметр force="1"
для vartype="out", для принудительного обновления значения в SM, на каждом шаге.
parent
3e66b477
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
1 deletion
+10
-1
ctl-cpp-cc-alone-ask.xsl
Utilities/codegen/ctl-cpp-cc-alone-ask.xsl
+2
-0
ctl-cpp-cc-ask.xsl
Utilities/codegen/ctl-cpp-cc-ask.xsl
+2
-0
testgen.src.xml
Utilities/codegen/tests/testgen.src.xml
+2
-0
libuniset.spec
conf/libuniset.spec
+4
-1
No files found.
Utilities/codegen/ctl-cpp-cc-alone-ask.xsl
View file @
434bc9b2
...
...
@@ -265,7 +265,9 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force )
<xsl:if
test=
"normalize-space(../../@msg)!='1'"
>
<xsl:choose>
<xsl:when
test=
"normalize-space(@vartype)='out'"
>
<xsl:if
test=
"normalize-space(../../@force)=''"
>
if( _force || prev_
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"../../@name"
/>
!=
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"../../@name"
/>
)
</xsl:if>
{
<xsl:call-template
name=
"setdata"
/>
prev_
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"../../@name"
/>
=
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"../../@name"
/>
;
...
...
Utilities/codegen/ctl-cpp-cc-ask.xsl
View file @
434bc9b2
...
...
@@ -127,7 +127,9 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId _si
void
<xsl:value-of
select=
"$CLASSNAME"
/>
_SK::updateOutputs( bool _force )
{
<xsl:for-each
select=
"//smap/item"
>
<xsl:if
test=
"normalize-space(@force)=''"
>
if( _force || prev_
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"@name"
/>
!=
<xsl:call-template
name=
"setprefix"
/><xsl:value-of
select=
"@name"
/>
)
</xsl:if>
{
<xsl:choose>
<xsl:when
test=
"normalize-space(@vartype)='out'"
><xsl:call-template
name=
"setdata"
/></xsl:when>
...
...
Utilities/codegen/tests/testgen.src.xml
View file @
434bc9b2
...
...
@@ -42,7 +42,9 @@
<item
name=
"input1_s"
vartype=
"in"
iotype=
"DI"
comment=
"comment for input1"
smTestID=
"1"
/>
<item
name=
"input2_s"
vartype=
"in"
iotype=
"DI"
comment=
"comment for input2"
/>
<item
name=
"output1_c"
vartype=
"out"
iotype=
"DO"
omment=
"comment for output1"
no_check_id=
"1"
/>
<item
name=
"output2_c"
vartype=
"out"
iotype=
"DO"
omment=
"comment for output2"
no_check_id=
"1"
force=
"1"
/>
<item
name=
"loglevel_s"
vartype=
"in"
iotype=
"AI"
omment=
"log level control"
loglevel=
"1"
/>
</smap>
<msgmap>
...
...
conf/libuniset.spec
View file @
434bc9b2
...
...
@@ -8,7 +8,7 @@
Name: libuniset
Version: 1.7
Release: alt1
2
Release: alt1
3
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
* Tue Apr 29 2014 Pavel Vainerman <pv@altlinux.ru> 1.7-alt13
- (uniset-codegen): add "force" parameters for vartype="out"
* Thu Apr 24 2014 Pavel Vainerman <pv@altlinux.ru> 1.7-alt12
- remove deprecated Extensions:getHeartBeatTime(). Use conf->getHeartBeatTime()
- rename parameter: "time_msec" --> "msec" for <HeartBeatTime msec=""/>
...
...
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