Commit 6b5e42ab authored by Pavel Vainerman's avatar Pavel Vainerman

(codegen): немного поменял механизм "сброса датчиков сообщений",

добавил лог.
parent 54c59247
...@@ -965,7 +965,10 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code ...@@ -965,7 +965,10 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
// взводим автоматический сброс // взводим автоматический сброс
if( _state ) if( _state )
{
ptResetMsg.reset(); ptResetMsg.reset();
trResetMsg.hi(false);
}
<xsl:for-each select="//msgmap/item"> <xsl:for-each select="//msgmap/item">
if( _code == <xsl:value-of select="@name"/> ) if( _code == <xsl:value-of select="@name"/> )
...@@ -995,6 +998,7 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code ...@@ -995,6 +998,7 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::resetMsg() void <xsl:value-of select="$CLASSNAME"/>_SK::resetMsg()
{ {
mylog8 &lt;&lt; myname &lt;&lt; "(resetMsg): reset messages.." &lt;&lt; endl;
// reset messages // reset messages
<xsl:for-each select="//msgmap/item"> <xsl:for-each select="//msgmap/item">
m_<xsl:value-of select="@name"/> = 0; m_<xsl:value-of select="@name"/> = 0;
...@@ -1304,6 +1308,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updatePreviousValues() ...@@ -1304,6 +1308,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updatePreviousValues()
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::resetMsg() void <xsl:value-of select="$CLASSNAME"/>_SK::resetMsg()
{ {
mylog8 &lt;&lt; myname &lt;&lt; "(resetMsg): reset messages.." &lt;&lt; endl;
// reset messages // reset messages
<xsl:for-each select="//sensors/item"> <xsl:for-each select="//sensors/item">
<xsl:call-template name="setmsg"> <xsl:call-template name="setmsg">
...@@ -1325,7 +1330,10 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code ...@@ -1325,7 +1330,10 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::setMsg( UniSetTypes::ObjectId _code
// взводим таймер автоматического сброса // взводим таймер автоматического сброса
if( _state ) if( _state )
{
ptResetMsg.reset(); ptResetMsg.reset();
trResetMsg.hi(false);
}
<xsl:for-each select="//sensors/item"> <xsl:for-each select="//sensors/item">
<xsl:call-template name="setmsg"> <xsl:call-template name="setmsg">
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
Name: libuniset2 Name: libuniset2
Version: 2.2 Version: 2.2
Release: alt7 Release: alt8
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
...@@ -456,6 +456,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname ...@@ -456,6 +456,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
# .. # ..
%changelog %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 * Mon Oct 05 2015 Pavel Vainerman <pv@altlinux.ru> 2.2-alt7
- (ModbusServer): rename receive(ModbusAddress addr..) --> receive_one(ModbusAddress addr..) - (ModbusServer): rename receive(ModbusAddress addr..) --> receive_one(ModbusAddress addr..)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment