Skip to content

U
uniset2
Commit 741852ac authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(codegen): Исправление ошибки с обновлением prev_xx значений

(prev_out_xx обновляются теперь только в updateOutputs при успешном сохранении в SM).
parent f3117f1b
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 16 deletions
Utilities/codegen/ctl-cpp-common.xsl
View file @ 741852ac
...@@ -1029,9 +1029,9 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateValues() ...@@ -1029,9 +1029,9 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::updateValues()
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::updatePreviousValues() void <xsl:value-of select="$CLASSNAME"/>_SK::updatePreviousValues()
{ {
<xsl:for-each select="//smap/item">prev_<xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>; <xsl:for-each select="//smap/item"><xsl:if test="normalize-space(@vartype)='in'">prev_<xsl:call-template name="setprefix"/><xsl:value-of select="@name"/> = <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>;
</xsl:if>
</xsl:for-each> </xsl:for-each>
<xsl:for-each select="//msgmap/item">prev_m_<xsl:value-of select="@name"/> = m_<xsl:value-of select="@name"/>; <xsl:for-each select="//msgmap/item">prev_m_<xsl:value-of select="@name"/> = m_<xsl:value-of select="@name"/>;
</xsl:for-each> </xsl:for-each>
} }
...@@ -1429,20 +1429,21 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::checkSensors() ...@@ -1429,20 +1429,21 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::checkSensors()
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::updatePreviousValues() void <xsl:value-of select="$CLASSNAME"/>_SK::updatePreviousValues()
{ {
<xsl:for-each select="//sensors/item/consumers/consumer"> <xsl:for-each select="//sensors/item/consumers/consumer">
<xsl:if test="normalize-space(../../@msg)!='1'"> <xsl:if test="normalize-space(../../@msg)!='1'">
<xsl:if test="normalize-space(@name)=$OID"> prev_<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>; <xsl:if test="normalize-space(@name)=$OID"><xsl:if test="normalize-space(@vartype)='in'">prev_<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>;
</xsl:if> </xsl:if>
</xsl:if> </xsl:if>
</xsl:for-each> </xsl:if>
</xsl:for-each>
<xsl:for-each select="//sensors/item/consumers/consumer"> <xsl:text>
<xsl:if test="normalize-space(../../@msg)='1'"> </xsl:text>
<xsl:if test="normalize-space(@name)=$OID"> prev_m_<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = m_<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>; <xsl:for-each select="//sensors/item/consumers/consumer">
</xsl:if> <xsl:if test="normalize-space(../../@msg)='1'">
</xsl:if> <xsl:if test="normalize-space(@name)=$OID"> prev_m_<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/> = m_<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>;
</xsl:for-each> </xsl:if>
</xsl:if>
</xsl:for-each>
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
void <xsl:value-of select="$CLASSNAME"/>_SK::resetMsg() void <xsl:value-of select="$CLASSNAME"/>_SK::resetMsg()
......
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