Commit ccd4598b authored by Pavel Vainerman's avatar Pavel Vainerman

сделал в codegen-е обработку команды на вывод списка

используемых процессом идентификаторов.
parent 7af410b3
...@@ -105,10 +105,10 @@ ...@@ -105,10 +105,10 @@
ui.saveState( si,m_<xsl:value-of select="../../@name"/>, UniversalIO::DigitalInput, getId() ); ui.saveState( si,m_<xsl:value-of select="../../@name"/>, UniversalIO::DigitalInput, getId() );
</xsl:when> </xsl:when>
<xsl:when test="$GENTYPE='A'"> <xsl:when test="$GENTYPE='A'">
if( code == mid_<xsl:value-of select="../../@name"/> ) if( _code == mid_<xsl:value-of select="../../@name"/> )
{ {
unideb(Debug::LEVEL8) &lt;&lt; "<xsl:value-of select="../../@name"/>" &lt;&lt; endl; unideb(Debug::LEVEL8) &lt;&lt; "<xsl:value-of select="../../@name"/>" &lt;&lt; endl;
m_<xsl:value-of select="../../@name"/> = state; m_<xsl:value-of select="../../@name"/> = _state;
try try
{ {
// сохраняем сразу... // сохраняем сразу...
...@@ -422,6 +422,20 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te ...@@ -422,6 +422,20 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::waitSM( int wait_msec, ObjectId _te
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
</xsl:template> </xsl:template>
<xsl:template name="COMMON-ID-LIST">
if( UniSetTypes::findArgParam("--print-id-list",conf->getArgc(),conf->getArgv()) != -1 )
{
<xsl:for-each select="//smap/item">
if( <xsl:value-of select="normalize-space(@name)"/> != UniSetTypes::DefaultObjectId )
cout &lt;&lt; "id:" &lt;&lt; <xsl:value-of select="normalize-space(@name)"/> &lt;&lt; endl;
</xsl:for-each>
<xsl:for-each select="//msgmap/item">
if( <xsl:value-of select="normalize-space(@name)"/> != UniSetTypes::DefaultObjectId )
cout &lt;&lt; "id:" &lt;&lt; <xsl:value-of select="normalize-space(@name)"/> &lt;&lt; endl;
</xsl:for-each>
// abort();
}
</xsl:template>
<xsl:template name="COMMON-CC-HEAD"> <xsl:template name="COMMON-CC-HEAD">
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
...@@ -496,6 +510,8 @@ confnode(cnode), ...@@ -496,6 +510,8 @@ confnode(cnode),
smReadyTimeout(0), smReadyTimeout(0),
activated(false) activated(false)
{ {
<xsl:call-template name="COMMON-ID-LIST"/>
<xsl:for-each select="//smap/item"> <xsl:for-each select="//smap/item">
<xsl:if test="normalize-space(@no_check_id)!='1'"> <xsl:if test="normalize-space(@no_check_id)!='1'">
if( <xsl:value-of select="normalize-space(@name)"/> == UniSetTypes::DefaultObjectId ) if( <xsl:value-of select="normalize-space(@name)"/> == UniSetTypes::DefaultObjectId )
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
Name: libuniset Name: libuniset
Version: 0.99 Version: 0.99
Release: eter6 Release: eter7
Summary: UniSet - library for building distributed industrial control systems Summary: UniSet - library for building distributed industrial control systems
License: GPL License: GPL
Group: Development/C++ Group: Development/C++
...@@ -184,6 +184,9 @@ rm -f %buildroot%_libdir/*.la ...@@ -184,6 +184,9 @@ rm -f %buildroot%_libdir/*.la
%exclude %_pkgconfigdir/libUniSet.pc %exclude %_pkgconfigdir/libUniSet.pc
%changelog %changelog
* Sun Oct 03 2010 Pavel Vainerman <pv@altlinux.ru> 0.99-eter6
- test codegen build
* Tue Sep 28 2010 Pavel Vainerman <pv@etersoft.ru> 0.99-eter5 * Tue Sep 28 2010 Pavel Vainerman <pv@etersoft.ru> 0.99-eter5
- MBSlave (RTU|TCP) optimization - MBSlave (RTU|TCP) optimization
......
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