Skip to content

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

uniset-codegen bug fixes

parent 8b514aa4
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 16 deletions
Utilities/codegen/ctl-cpp-cc-alone-ask.xsl
View file @ b38a1729
...@@ -347,19 +347,19 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setInfo( UniSetTypes::ObjectId code ...@@ -347,19 +347,19 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setInfo( UniSetTypes::ObjectId code
<xsl:template name="gensetdata"> <xsl:template name="gensetdata">
<xsl:choose> <xsl:choose>
<xsl:when test="normalize-space(../../@iotype)='DO'"> <xsl:when test="normalize-space(../../@iotype)='DO'">
ui.setState( <xsl:value-of select="../../@name"/>, <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>, <xsl:value-of select="../../@node"/>, ); ui.setState( <xsl:value-of select="../../@name"/>, <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>, node_<xsl:value-of select="../../@name"/>, );
</xsl:when> </xsl:when>
<xsl:when test="normalize-space(../../@iotype)='AO'"> <xsl:when test="normalize-space(../../@iotype)='AO'">
ui.setValue( <xsl:value-of select="../../@name"/>, <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>, <xsl:value-of select="../../@node"/> ); ui.setValue( <xsl:value-of select="../../@name"/>, <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>, node_<xsl:value-of select="../../@name"/> );
</xsl:when> </xsl:when>
<xsl:when test="normalize-space(../../@iotype)='DI'"> <xsl:when test="normalize-space(../../@iotype)='DI'">
si.id = <xsl:value-of select="../../@name"/>; si.id = <xsl:value-of select="../../@name"/>;
si.node = <xsl:value-of select="../../@node"/>; si.node = node_<xsl:value-of select="../../@name"/>;
ui.saveState( si, <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>,UniversalIO::DigitalInput, getId() ); ui.saveState( si, <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>,UniversalIO::DigitalInput, getId() );
</xsl:when> </xsl:when>
<xsl:when test="normalize-space(../../@iotype)='AI'"> <xsl:when test="normalize-space(../../@iotype)='AI'">
si.id = <xsl:value-of select="../../@name"/>; si.id = <xsl:value-of select="../../@name"/>;
si.node = <xsl:value-of select="../../@node"/>; si.node = node_<xsl:value-of select="../../@name"/>;
ui.saveValue( si,<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>,UniversalIO::AnalogInput, getId() ); ui.saveValue( si,<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>,UniversalIO::AnalogInput, getId() );
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
...@@ -369,19 +369,19 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setInfo( UniSetTypes::ObjectId code ...@@ -369,19 +369,19 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setInfo( UniSetTypes::ObjectId code
<xsl:param name="setval"></xsl:param> <xsl:param name="setval"></xsl:param>
<xsl:choose> <xsl:choose>
<xsl:when test="normalize-space(../../@iotype)='DO'"> <xsl:when test="normalize-space(../../@iotype)='DO'">
ui.setState( <xsl:value-of select="../../@name"/>,<xsl:value-of select="$setval"/>,<xsl:value-of select="../../@node"/> ); ui.setState( <xsl:value-of select="../../@name"/>,<xsl:value-of select="$setval"/>,node_<xsl:value-of select="../../@name"/> );
</xsl:when> </xsl:when>
<xsl:when test="normalize-space(../../@iotype)='AO'"> <xsl:when test="normalize-space(../../@iotype)='AO'">
ui.setValue( <xsl:value-of select="../../@name"/>,<xsl:value-of select="$setval"/>,<xsl:value-of select="../../@node"/> ); ui.setValue( <xsl:value-of select="../../@name"/>,<xsl:value-of select="$setval"/>,node_<xsl:value-of select="../../@name"/> );
</xsl:when> </xsl:when>
<xsl:when test="normalize-space(../../@iotype)='DI'"> <xsl:when test="normalize-space(../../@iotype)='DI'">
si.id = <xsl:value-of select="../../@name"/>; si.id = <xsl:value-of select="../../@name"/>;
si.node = <xsl:value-of select="../../@node"/> si.node = node_<xsl:value-of select="../../@name"/>;
ui.saveState( si,<xsl:value-of select="$setval"/>, UniversalIO::DigitalInput, getId() ); ui.saveState( si,<xsl:value-of select="$setval"/>, UniversalIO::DigitalInput, getId() );
</xsl:when> </xsl:when>
<xsl:when test="normalize-space(../../@iotype)='AI'"> <xsl:when test="normalize-space(../../@iotype)='AI'">
si.id = <xsl:value-of select="../../@name"/>; si.id = <xsl:value-of select="../../@name"/>;
si.node = <xsl:value-of select="../../@node"/> si.node = node_<xsl:value-of select="../../@name"/>;
ui.saveValue( si,<xsl:value-of select="$setval"/>,UniversalIO::AnalogInput, getId() ); ui.saveValue( si,<xsl:value-of select="$setval"/>,UniversalIO::AnalogInput, getId() );
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
......
Utilities/codegen/ctl-cpp-cc-alone.xsl
View file @ b38a1729
...@@ -276,12 +276,12 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setInfo( UniSetTypes::ObjectId code ...@@ -276,12 +276,12 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setInfo( UniSetTypes::ObjectId code
</xsl:when> </xsl:when>
<xsl:when test="normalize-space(../../@iotype)='DI'"> <xsl:when test="normalize-space(../../@iotype)='DI'">
si.id = <xsl:value-of select="../../@name"/>; si.id = <xsl:value-of select="../../@name"/>;
si.node = conf->getLocalNode(); si.node = node_<xsl:value-of select="../../@name"/>;
ui.saveState( si, <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>, UniversalIO::DigitalInput, getId() ); ui.saveState( si, <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>, UniversalIO::DigitalInput, getId() );
</xsl:when> </xsl:when>
<xsl:when test="normalize-space(../../@iotype)='AI'"> <xsl:when test="normalize-space(../../@iotype)='AI'">
si.id = <xsl:value-of select="../../@name"/>; si.id = <xsl:value-of select="../../@name"/>;
si.node = conf->getLocalNode(); si.node = node_<xsl:value-of select="../../@name"/>;
ui.saveValue( si,<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>,UniversalIO::AnalogInput, getId() ); ui.saveValue( si,<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>,UniversalIO::AnalogInput, getId() );
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
...@@ -298,12 +298,12 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setInfo( UniSetTypes::ObjectId code ...@@ -298,12 +298,12 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setInfo( UniSetTypes::ObjectId code
</xsl:when> </xsl:when>
<xsl:when test="normalize-space(../../@iotype)='DI'"> <xsl:when test="normalize-space(../../@iotype)='DI'">
si.id = <xsl:value-of select="../../@name"/>; si.id = <xsl:value-of select="../../@name"/>;
si.node = conf->getLocalNode(); si.node = node_<xsl:value-of select="../../@name"/>;
ui.saveState( si,<xsl:value-of select="$setval"/>, UniversalIO::DigitalInput, getId() ); ui.saveState( si,<xsl:value-of select="$setval"/>, UniversalIO::DigitalInput, getId() );
</xsl:when> </xsl:when>
<xsl:when test="normalize-space(../../@iotype)='AI'"> <xsl:when test="normalize-space(../../@iotype)='AI'">
si.id = <xsl:value-of select="../../@name"/>; si.id = <xsl:value-of select="../../@name"/>;
si.node = conf->getLocalNode(); si.node = node_<xsl:value-of select="../../@name"/>;
ui.saveValue( si,<xsl:value-of select="$setval"/>,UniversalIO::AnalogInput, getId() ); ui.saveValue( si,<xsl:value-of select="$setval"/>,UniversalIO::AnalogInput, getId() );
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
......
Utilities/codegen/ctl-cpp-cc-ask.xsl
View file @ b38a1729
...@@ -300,7 +300,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setInfo( UniSetTypes::ObjectId code ...@@ -300,7 +300,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setInfo( UniSetTypes::ObjectId code
<xsl:choose> <xsl:choose>
<xsl:when test="normalize-space(@iotype)='DI'"> <xsl:when test="normalize-space(@iotype)='DI'">
si.id = <xsl:value-of select="@name"/>; si.id = <xsl:value-of select="@name"/>;
si.node = node_<xsl:value-of select="@name"/> si.node = node_<xsl:value-of select="@name"/>;
ui.saveState( si, <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>,UniversalIO::DigitalInput,getId() ); ui.saveState( si, <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>,UniversalIO::DigitalInput,getId() );
</xsl:when> </xsl:when>
<xsl:when test="normalize-space(@iotype)='DO'"> <xsl:when test="normalize-space(@iotype)='DO'">
...@@ -308,7 +308,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setInfo( UniSetTypes::ObjectId code ...@@ -308,7 +308,7 @@ void <xsl:value-of select="$CLASSNAME"/>_SK::setInfo( UniSetTypes::ObjectId code
</xsl:when> </xsl:when>
<xsl:when test="normalize-space(@iotype)='AI'"> <xsl:when test="normalize-space(@iotype)='AI'">
si.id = <xsl:value-of select="@name"/>; si.id = <xsl:value-of select="@name"/>;
si.node = node_<xsl:value-of select="@name"/> si.node = node_<xsl:value-of select="@name"/>;
ui.saveValue( si, <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>,UniversalIO::AnalogInput, getId() ); ui.saveValue( si, <xsl:call-template name="setprefix"/><xsl:value-of select="@name"/>,UniversalIO::AnalogInput, getId() );
</xsl:when> </xsl:when>
<xsl:when test="normalize-space(@iotype)='AO'"> <xsl:when test="normalize-space(@iotype)='AO'">
......
Utilities/codegen/ctl-cpp-common.xsl
View file @ b38a1729
...@@ -60,6 +60,12 @@ ...@@ -60,6 +60,12 @@
<xsl:call-template name="settype"><xsl:with-param name="iotype" select="../../@iotype" /></xsl:call-template><xsl:text> prev_</xsl:text><xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>; /*!&lt; */ <xsl:call-template name="settype"><xsl:with-param name="iotype" select="../../@iotype" /></xsl:call-template><xsl:text> prev_</xsl:text><xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>; /*!&lt; */
</xsl:when> </xsl:when>
<xsl:when test="$GENTYPE='C'"><xsl:value-of select="../../@name"/>(<xsl:value-of select="../../@id"/>), <xsl:when test="$GENTYPE='C'"><xsl:value-of select="../../@name"/>(<xsl:value-of select="../../@id"/>),
<xsl:if test="normalize-space(../../@node)=''">
node_<xsl:value-of select="../../@name"/>(<xsl:value-of select="../../@node"/>),
</xsl:if>
<xsl:if test="not(normalize-space(../../@node)='')">
node_<xsl:value-of select="../../@name"/>(UniSetTypes::conf->getLocalNode()),
</xsl:if>
<xsl:if test="normalize-space(../../@default)=''"> <xsl:if test="normalize-space(../../@default)=''">
<xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>(0), <xsl:call-template name="setprefix"/><xsl:value-of select="../../@name"/>(0),
</xsl:if> </xsl:if>
......
conf/release_helper.sh
View file @ b38a1729
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
cd .. cd ..
SPECNAME=conf/uniset.spec SPECNAME=conf/uniset.spec
REL=setri REL=eter
DEFAULTARCH=i586 DEFAULTARCH=i586
RPMDIR=~/RPM/RPMS/$DEFAULTARCH RPMDIR=~/RPM/RPMS/$DEFAULTARCH
RPMSOURCEDIR=~/RPM/SOURCES RPMSOURCEDIR=~/RPM/SOURCES
......
conf/uniset.spec
View file @ b38a1729
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Name: uniset Name: uniset
Version: 0.96 Version: 0.96
Release: setri1 Release: eter2
Summary: UniSet Summary: UniSet
License: GPL License: GPL
Group: Development/C++ Group: Development/C++
...@@ -180,6 +180,12 @@ Libraries needed to develop for uniset extentions ...@@ -180,6 +180,12 @@ Libraries needed to develop for uniset extentions
%changelog %changelog
* Mon Apr 06 2009 Pavel Vainerman <pv@altlinux.ru> 0.96-eter1
- new build
* Mon Apr 06 2009 Pavel Vainerman <pv@altlinux.ru> 0.96-setri1
- new build
* Mon Apr 06 2009 Pavel Vainerman <pv@altlinux.ru> 0.96-alt11 * Mon Apr 06 2009 Pavel Vainerman <pv@altlinux.ru> 0.96-alt11
- new build - new build
......
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