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
6b5e42ab
Commit
6b5e42ab
authored
Oct 08, 2015
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(codegen): немного поменял механизм "сброса датчиков сообщений",
добавил лог.
parent
54c59247
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
ctl-cpp-common.xsl
Utilities/codegen/ctl-cpp-common.xsl
+8
-0
libuniset2.spec
conf/libuniset2.spec
+4
-1
No files found.
Utilities/codegen/ctl-cpp-common.xsl
View file @
6b5e42ab
...
...
@@ -965,7 +965,10 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
// взводим автоматический сброс
if( _state )
{
ptResetMsg.reset();
trResetMsg.hi(false);
}
<xsl:for-each
select=
"//msgmap/item"
>
if( _code ==
<xsl:value-of
select=
"@name"
/>
)
...
...
@@ -995,6 +998,7 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
// -----------------------------------------------------------------------------
void
<xsl:value-of
select=
"$CLASSNAME"
/>
_SK::resetMsg()
{
mylog8
<<
myname
<<
"(resetMsg): reset messages.."
<<
endl;
// reset messages
<xsl:for-each
select=
"//msgmap/item"
>
m_
<xsl:value-of
select=
"@name"
/>
= 0;
...
...
@@ -1304,6 +1308,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updatePreviousValues()
// -----------------------------------------------------------------------------
void
<xsl:value-of
select=
"$CLASSNAME"
/>
_SK::resetMsg()
{
mylog8
<<
myname
<<
"(resetMsg): reset messages.."
<<
endl;
// reset messages
<xsl:for-each
select=
"//sensors/item"
>
<xsl:call-template
name=
"setmsg"
>
...
...
@@ -1325,7 +1330,10 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
// взводим таймер автоматического сброса
if( _state )
{
ptResetMsg.reset();
trResetMsg.hi(false);
}
<xsl:for-each
select=
"//sensors/item"
>
<xsl:call-template
name=
"setmsg"
>
...
...
conf/libuniset2.spec
View file @
6b5e42ab
...
...
@@ -13,7 +13,7 @@
Name: libuniset2
Version: 2.2
Release: alt
7
Release: alt
8
Summary: UniSet - library for building distributed industrial control systems
...
...
@@ -456,6 +456,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# ..
%changelog
* Thu Oct 08 2015 Pavel Vainerman <pv@altlinux.ru> 2.2-alt8
- (uniset-codegen): minor fixes in resetMsg() mechanism
* Mon Oct 05 2015 Pavel Vainerman <pv@altlinux.ru> 2.2-alt7
- (ModbusServer): rename receive(ModbusAddress addr..) --> receive_one(ModbusAddress addr..)
...
...
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