(uniset-codegen): Исправил ошибку в генерируемой функции getValue().

Utilities/codegen/ctl-cpp-cc-alone-ask.xsl

@@ -193,9 +193,15 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::askValue( UniSetTypes::ObjectId _si
 {
 	ui.askRemoteSensor(_sid,_cmd,_node,getId());
 }
+
 // -----------------------------------------------------------------------------
 bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId _sid )
 {
+	return (bool)getValue(_sid);
+}
+// -----------------------------------------------------------------------------
+long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _sid )
+{
 	try
 	{
 	<xsl:for-each select="//sensors/item/consumers/consumer">
@@ -228,7 +234,7 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId _si
 		unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getState): Обращение к неизвестному ДИСКРЕТНОМУ датчику sid="
 			&lt;&lt; _sid &lt;&lt; endl;
 
-		return false;
+		return 0;
 	}
 	catch(Exception&amp; ex)
 	{

Utilities/codegen/ctl-cpp-cc-alone.xsl

@@ -171,9 +171,15 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setValue( UniSetTypes::ObjectId _si
 	</xsl:if>
 	</xsl:for-each>
 }
+
 // -----------------------------------------------------------------------------
 bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId _sid )
 {
+	return (bool)getValue(_sid);
+}
+// -----------------------------------------------------------------------------
+long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _sid )
+{
 	<xsl:for-each select="//sensors/item/consumers/consumer">
 	<xsl:if test="normalize-space(../../@msg)!='1'">
 	<xsl:if test="normalize-space(@name)=$OID">
@@ -186,7 +192,7 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId _si
 	unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getState): Обращение к неизвестному ДИСКРЕТНОМУ датчику sid="
 		&lt;&lt; _sid &lt;&lt; endl;
 
-	return false;
+	return 0;
 }
 // -----------------------------------------------------------------------------
 void <xsl:value-of select="$CLASSNAME"/>_SK::updateOutputs( bool _force )

Utilities/codegen/ctl-cpp-cc-ask.xsl

@@ -168,6 +168,11 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::askValue( UniSetTypes::ObjectId _si
 // -----------------------------------------------------------------------------
 bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId _sid )
 {
+	return (bool)getValue(_sid);
+}
+// -----------------------------------------------------------------------------
+long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _sid )
+{
 	try
 	{
 <xsl:for-each select="//smap/item">
@@ -202,7 +207,7 @@ bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId _si
 		throw ex;
 	}
 	
-	return false;
+	return 0;
 }
 // -----------------------------------------------------------------------------
 

Utilities/codegen/ctl-cpp-cc.xsl

@@ -175,16 +175,21 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::askValue( UniSetTypes::ObjectId sid
 	}
 }
 // -----------------------------------------------------------------------------
-bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId sid )
+bool <xsl:value-of select="$CLASSNAME"/>_SK::getState( UniSetTypes::ObjectId _sid )
+{
+	return (bool)getValue(_sid);
+}
+// -----------------------------------------------------------------------------
+long <xsl:value-of select="$CLASSNAME"/>_SK::getValue( UniSetTypes::ObjectId _sid )
 {
 	<xsl:for-each select="//smap/item">
-	if( sid == <xsl:value-of select="@name"/> )
+	if( _sid == <xsl:value-of select="@name"/> )
 		return <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>;
 	</xsl:for-each>
 
 	unideb[Debug::CRIT] &lt;&lt; myname &lt;&lt; "(getState): Обращение к неизвестному ДИСКРЕТНОМУ датчику sid="
-		&lt;&lt; sid &lt;&lt; endl;
-	return false;
+		&lt;&lt; _sid &lt;&lt; endl;
+	return 0;
 }
 // -----------------------------------------------------------------------------
 void <xsl:value-of select="$CLASSNAME"/>_SK::preSensorInfo( UniSetTypes::SensorMessage* sm )

Utilities/codegen/ctl-cpp-common.xsl

@@ -178,7 +178,7 @@
 
 		bool alarm( UniSetTypes::ObjectId sid, bool state );
 		bool getState( UniSetTypes::ObjectId sid );
-		bool getValue( UniSetTypes::ObjectId sid );
+		long getValue( UniSetTypes::ObjectId sid );
 		void setValue( UniSetTypes::ObjectId sid, long value );
 		void setState( UniSetTypes::ObjectId sid, bool state );
 		void askState( UniSetTypes::ObjectId sid, UniversalIO::UIOCommand, UniSetTypes::ObjectId node = UniSetTypes::conf->getLocalNode() );

conf/libuniset.spec

@@ -7,7 +7,7 @@
 
 Name: libuniset
 Version: 1.6
-Release: alt7
+Release: alt8
 
 Summary: UniSet - library for building distributed industrial control systems
 
@@ -319,6 +319,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %exclude %_pkgconfigdir/libUniSet.pc
 
 %changelog
+* Wed May 08 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt8
+- fixed minor bug in uniset-codegen (getValue) 
+
 * Wed Mar 20 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt7
 - modbus: add new function 0x2B/0x0E(43/14)"Read device identification"
 

conf/test.xml

@@ -101,9 +101,9 @@
                 </device>
 			</MEI>
 		</MBSlave1>
-		<RTUExchange name="RTUExchange" speed="38400">
+		<RTUExchange name="RTUExchange">
 			<DeviceList>
-				<item addr="0x01" invert="0" respondSensor="RespondRTU_S" speed="9600" timeout="5000"/>
+				<item addr="0x01" invert="0" respondSensor="RespondRTU_S" timeout="5000"/>
 			</DeviceList>
 		</RTUExchange>
 		<UDPExchange name="UDPExchange"/>
@@ -190,6 +190,7 @@
 		</thresholds>
 		<controllers name="Controllers">
 			<item id="5000" name="SharedMemory1"/>
+			<item id="5003" name="SharedMemory"/>
 			<item id="5001" name="UniExchange"/>
 			<item id="5002" name="UniExchange2"/>
 		</controllers>