minor fixes in codegen: set default reset messages time...(2000 msec)

Utilities/codegen/ctl-cpp-common.xsl

@@ -122,8 +122,18 @@
 			</xsl:when>		
 			<xsl:when test="$GENTYPE='R'">
 				m_<xsl:value-of select="../../@name"/> = 0;
-				si.id = mid_<xsl:value-of select="../../@name"/>;
-				ui.saveState( si,false,UniversalIO::DigitalInput,getId() );
+				if( mid_<xsl:value-of select="../../@name"/> != UniSetTypes::DefaultObjectId )
+				{
+				 	try
+					{
+						si.id = mid_<xsl:value-of select="../../@name"/>;
+						ui.saveState( si,false,UniversalIO::DigitalInput,getId() );
+					}
+					catch( UniSetTypes::Exception&amp; ex )
+					{
+						unideb[Debug::LEVEL1] &lt;&lt; getName() &lt;&lt; ex &lt;&lt; endl;
+					}
+				}
 			</xsl:when>
 			</xsl:choose>
 		</xsl:if>
@@ -550,7 +560,7 @@ activated(false)
 	
 	sleep_msec = conf->getArgPInt("--sleep-msec","<xsl:call-template name="settings"><xsl:with-param name="varname" select="'sleep-msec'"/></xsl:call-template>", <xsl:call-template name="settings"><xsl:with-param name="varname" select="'sleep-msec'"/></xsl:call-template>);
 
-	resetMsgTime = conf->getPIntProp(cnode,"resetMsgTime", 200);
+	resetMsgTime = conf->getPIntProp(cnode,"resetMsgTime", 2000);
 	ptResetMsg.setTiming(resetMsgTime);
 
 	smReadyTimeout = conf->getArgInt("--sm-ready-timeout","<xsl:call-template name="settings"><xsl:with-param name="varname" select="'smReadyTimeout'"/></xsl:call-template>");
@@ -657,9 +667,19 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::resetMsg()
 // reset messages
 <xsl:for-each select="//msgmap/item">
 	m_<xsl:value-of select="@name"/> = 0;
-	si.id = <xsl:value-of select="@name"/>;
-	si.node = node_<xsl:value-of select="@name"/>;
-	ui.saveState( si,false,UniversalIO::DigitalInput,getId() );
+	if( <xsl:value-of select="@name"/> != UniSetTypes::DefaultObjectId )
+	{
+		try
+		{
+			si.id = <xsl:value-of select="@name"/>;
+			si.node = node_<xsl:value-of select="@name"/>;
+			ui.saveState( si,false,UniversalIO::DigitalInput,getId() );
+		}
+		catch( UniSetTypes::Exception&amp; ex )
+		{
+			unideb[Debug::LEVEL1] &lt;&lt; getName() &lt;&lt; ex &lt;&lt; endl;
+		}
+	}
 </xsl:for-each>
 }
 // -----------------------------------------------------------------------------
@@ -766,7 +786,7 @@ activated(false)
 
 	sleep_msec = conf->getArgPInt("--sleep-msec","<xsl:call-template name="settings-alone"><xsl:with-param name="varname" select="'sleep-msec'"/></xsl:call-template>", <xsl:call-template name="settings-alone"><xsl:with-param name="varname" select="'sleep-msec'"/></xsl:call-template>);
 
-	resetMsgTime = conf->getPIntProp(cnode,"resetMsgTime", 0);
+	resetMsgTime = conf->getPIntProp(cnode,"resetMsgTime", 2000);
 	ptResetMsg.setTiming(resetMsgTime);
 
 	smReadyTimeout = conf->getArgInt("--sm-ready-timeout","<xsl:call-template name="settings"><xsl:with-param name="varname" select="'smReadyTimeout'"/></xsl:call-template>");

conf/libuniset.spec

@@ -3,7 +3,7 @@
 
 Name: libuniset
 Version: 0.97
-Release: eter54
+Release: eter55
 Summary: UniSet - library for building distributed industrial control systems
 License: GPL
 Group: Development/C++
@@ -183,6 +183,9 @@ rm -f %buildroot%_libdir/*.la
 %exclude %_pkgconfigdir/libUniSet.pc
 
 %changelog
+* Sat Feb 13 2010 Pavel Vainerman <pv@altlinux.ru> 0.97-eter54
+- fixed bug in codegen
+
 * Thu Feb 04 2010 Pavel Vainerman <pv@altlinux.ru> 0.97-eter53
 - new build
 

tests/passivetimer.cc

@@ -32,6 +32,19 @@ int main()
 	}
 
 
+	PassiveTimer pt4(350);
+
+	for( int i=0;i<12; i++ )
+	{
+		cerr << "pt4: check time = " << pt4.checkTime() << endl;
+		if( pt4.checkTime() )
+		{
+			cerr << "pt4: reset..." << endl;
+			pt4.reset();
+		}
+		msleep(200);
+	}
+
 	while(1)
 	{
 		cerr << "timer=" << pt.checkTime() << endl;