Merge "[559417] edited names and description of FB templates" into 1.11.x
diff --git a/data/template/Basic.fbt b/data/template/Basic.fbt
index 87b3e33..e3a84d7 100644
--- a/data/template/Basic.fbt
+++ b/data/template/Basic.fbt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!--
/*******************************************************************************
- * Copyright (c) 2010, 2016 Profactor GmbH, fortiss GmbH
+ * Copyright (c) 2016 fortiss GmbH
*
* All rights reserved.
*
@@ -29,67 +29,23 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* Contributors:
- * Gerhard Ebenhofer, Alois Zoitl
+ * Alois Zoitl
* - initial API and implementation and/or initial documentation
*******************************************************************************/
-->
<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
-<FBType Comment="Template for a simple Basic Function Block Type" Name="Basic">
+<FBType Comment="Basic FB with empty ECC" Name="Basic">
<Identification Standard="61499-2"/>
- <VersionInfo Author="4DIAC-IDE" Date="2016-05-26" Organization="4DIAC-Consortium" Version="0.0"/>
<VersionInfo Author="AZ" Date="2016-05-26" Organization="fortiss GmbH" Version="1.0"/>
<InterfaceList>
- <EventInputs>
- <Event Comment="Initialization Request" Name="INIT" Type="Event">
- <With Var="QI"/>
- </Event>
- <Event Comment="Normal Execution Request" Name="REQ" Type="Event">
- <With Var="QI"/>
- </Event>
- </EventInputs>
- <EventOutputs>
- <Event Comment="Initialization Confirm" Name="INITO" Type="Event">
- <With Var="QO"/>
- </Event>
- <Event Comment="Execution Confirmation" Name="CNF" Type="Event">
- <With Var="QO"/>
- </Event>
- </EventOutputs>
- <InputVars>
- <VarDeclaration Comment="Input event qualifier" Name="QI" Type="BOOL"/>
- </InputVars>
- <OutputVars>
- <VarDeclaration Comment="Output event qualifier" Name="QO" Type="BOOL"/>
- </OutputVars>
+ <EventInputs/>
+ <EventOutputs/>
+ <InputVars/>
+ <OutputVars/>
</InterfaceList>
<BasicFB>
<ECC>
- <ECState Comment="Initial State" Name="START" x="475.0" y="1125.0"/>
- <ECState Comment="Initialization" Name="Init" x="1235.0" y="665.0">
- <ECAction Algorithm="initialize" Output="INITO"/>
- </ECState>
- <ECState Comment="Normal execution" Name="NormalOp" x="2850.0" y="1140.0">
- <ECAction Algorithm="normalOperation" Output="CNF"/>
- </ECState>
- <ECState Name="Initialized" x="1900.0" y="1140.0"/>
- <ECState Name="DeInit" x="1140.0" y="1520.0">
- <ECAction Algorithm="deInitialize" Output="INITO"/>
- </ECState>
- <ECTransition Comment="" Condition="INIT[TRUE = QI]" Destination="Init" Source="START" x="840.0" y="920.0"/>
- <ECTransition Comment="" Condition="1" Destination="Initialized" Source="Init" x="1660.0" y="975.0"/>
- <ECTransition Comment="" Condition="REQ" Destination="NormalOp" Source="Initialized" x="2615.0" y="1000.0"/>
- <ECTransition Comment="" Condition="1" Destination="Initialized" Source="NormalOp" x="2575.0" y="1430.0"/>
- <ECTransition Comment="" Condition="1" Destination="START" Source="DeInit" x="940.0" y="1445.0"/>
- <ECTransition Comment="" Condition="INIT[FALSE = QI]" Destination="DeInit" Source="Initialized" x="1690.0" y="1340.0"/>
+ <ECState Comment="Initial State" Name="START" x="550.0" y="425.0"/>
</ECC>
- <Algorithm Comment="Initialization algorithm" Name="initialize">
- <ST Text=" QO := QI;"/>
- </Algorithm>
- <Algorithm Comment="Normally executed algorithm" Name="deInitialize">
- <ST Text=" QO := FALSE;"/>
- </Algorithm>
- <Algorithm Comment="new algorithm" Name="normalOperation">
- <ST Text="QO := QI; IF TRUE = QI THEN (* only perform normal operation of QI is true*) END_IF; "/>
- </Algorithm>
</BasicFB>
</FBType>
diff --git a/data/template/Composite.fbt b/data/template/Composite.fbt
index e74b289..5f03173 100644
--- a/data/template/Composite.fbt
+++ b/data/template/Composite.fbt
@@ -34,7 +34,7 @@
*******************************************************************************/
-->
<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
-<FBType Name="Composite" Comment="Composite Function Block Type" >
+<FBType Name="Composite" Comment="Composite FB wrapping other FBs" >
<Identification Standard="61499-2" />
<VersionInfo Organization="4DIAC-Consortium" Version="0.0" Author="4DIAC-IDE" Date="2008-07-10" />
<InterfaceList>
diff --git a/data/template/EmptyBasic.fbt b/data/template/EmptyBasic.fbt
deleted file mode 100644
index 0a75fa7..0000000
--- a/data/template/EmptyBasic.fbt
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-/*******************************************************************************
- * Copyright (c) 2016 fortiss GmbH
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * - Neither the name of the Eclipse Foundation, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Contributors:
- * Alois Zoitl
- * - initial API and implementation and/or initial documentation
- *******************************************************************************/
- -->
-<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
-<FBType Comment="Template for an empty basic function block" Name="EmptyBasic">
- <Identification Standard="61499-2"/>
- <VersionInfo Author="AZ" Date="2016-05-26" Organization="fortiss GmbH" Version="1.0"/>
- <InterfaceList>
- <EventInputs/>
- <EventOutputs/>
- <InputVars/>
- <OutputVars/>
- </InterfaceList>
- <BasicFB>
- <ECC>
- <ECState Comment="Initial State" Name="START" x="550.0" y="425.0"/>
- </ECC>
- </BasicFB>
-</FBType>
diff --git a/data/template/Simple.fbt b/data/template/Simple.fbt
index d9a4cd3..ef30c44 100644
--- a/data/template/Simple.fbt
+++ b/data/template/Simple.fbt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*******************************************************************************
- * Copyright (c) 2010 Profactor GmbH, 2018 TU Wien/ACIN
+ * Copyright (c) 2018 TU Wien/ACIN
*
* All rights reserved.
*
@@ -29,38 +29,31 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* Contributors:
- * Gerhard Ebenhofer
- * - initial API and implementation and/or initial documentation
- *
* Peter Gsellmann
- * - Change from BasicFB to SimpleFB tag
+ * - initial API and implementation and/or initial documentation
*******************************************************************************/
-->
<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
-<FBType Name="Simple" Comment="Template for a Simple Function Block Type" >
+<FBType Name="Simple" Comment="Simple FB with one algorithm" >
<Identification Standard="61499-1" />
<VersionInfo Organization="TU Wien/ACIN" Version="0.0" Author="Peter Gsellmann" Date="2018-10-15" />
<InterfaceList>
<EventInputs>
<Event Name="REQ" Comment="Normal Execution Request" >
- <With Var="IN" />
</Event>
</EventInputs>
<EventOutputs>
<Event Name="CNF" Comment="Execution Confirmation" >
- <With Var="OUT" />
</Event>
</EventOutputs>
<InputVars>
- <VarDeclaration Name="IN" Type="BOOL" Comment="Input" />
</InputVars>
<OutputVars>
- <VarDeclaration Name="OUT" Type="BOOL" Comment="Output" />
</OutputVars>
</InterfaceList>
<SimpleFB>
- <Algorithm Name="REQ" Comment="Normally executed algorithm" >
- <ST Text="OUT := IN; " />
+ <Algorithm Name="REQ" Comment="" >
+ <ST Text="" />
</Algorithm>
</SimpleFB>
</FBType>
diff --git a/data/template/TemplateBasic.fbt b/data/template/TemplateBasic.fbt
new file mode 100644
index 0000000..a18d3f3
--- /dev/null
+++ b/data/template/TemplateBasic.fbt
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+/*******************************************************************************
+ * Copyright (c) 2010, 2016 Profactor GmbH, fortiss GmbH
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * - Neither the name of the Eclipse Foundation, Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Contributors:
+ * Gerhard Ebenhofer, Alois Zoitl
+ * - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+ -->
+<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
+<FBType Comment="Template for a Basic Function Block Type" Name="TemplateBasic">
+ <Identification Standard="61499-2"/>
+ <VersionInfo Author="4DIAC-IDE" Date="2016-05-26" Organization="4DIAC-Consortium" Version="0.0"/>
+ <VersionInfo Author="AZ" Date="2016-05-26" Organization="fortiss GmbH" Version="1.0"/>
+ <InterfaceList>
+ <EventInputs>
+ <Event Comment="Initialization Request" Name="INIT" Type="Event">
+ <With Var="QI"/>
+ </Event>
+ <Event Comment="Normal Execution Request" Name="REQ" Type="Event">
+ <With Var="QI"/>
+ </Event>
+ </EventInputs>
+ <EventOutputs>
+ <Event Comment="Initialization Confirm" Name="INITO" Type="Event">
+ <With Var="QO"/>
+ </Event>
+ <Event Comment="Execution Confirmation" Name="CNF" Type="Event">
+ <With Var="QO"/>
+ </Event>
+ </EventOutputs>
+ <InputVars>
+ <VarDeclaration Comment="Input event qualifier" Name="QI" Type="BOOL"/>
+ </InputVars>
+ <OutputVars>
+ <VarDeclaration Comment="Output event qualifier" Name="QO" Type="BOOL"/>
+ </OutputVars>
+ </InterfaceList>
+ <BasicFB>
+ <ECC>
+ <ECState Comment="Initial State" Name="START" x="475.0" y="1125.0"/>
+ <ECState Comment="Initialization" Name="Init" x="1235.0" y="665.0">
+ <ECAction Algorithm="initialize" Output="INITO"/>
+ </ECState>
+ <ECState Comment="Normal execution" Name="NormalOp" x="2850.0" y="1140.0">
+ <ECAction Algorithm="normalOperation" Output="CNF"/>
+ </ECState>
+ <ECState Name="Initialized" x="1900.0" y="1140.0"/>
+ <ECState Name="DeInit" x="1140.0" y="1520.0">
+ <ECAction Algorithm="deInitialize" Output="INITO"/>
+ </ECState>
+ <ECTransition Comment="" Condition="INIT[TRUE = QI]" Destination="Init" Source="START" x="840.0" y="920.0"/>
+ <ECTransition Comment="" Condition="1" Destination="Initialized" Source="Init" x="1660.0" y="975.0"/>
+ <ECTransition Comment="" Condition="REQ" Destination="NormalOp" Source="Initialized" x="2615.0" y="1000.0"/>
+ <ECTransition Comment="" Condition="1" Destination="Initialized" Source="NormalOp" x="2575.0" y="1430.0"/>
+ <ECTransition Comment="" Condition="1" Destination="START" Source="DeInit" x="940.0" y="1445.0"/>
+ <ECTransition Comment="" Condition="INIT[FALSE = QI]" Destination="DeInit" Source="Initialized" x="1690.0" y="1340.0"/>
+ </ECC>
+ <Algorithm Comment="Initialization algorithm" Name="initialize">
+ <ST Text=" QO := QI;"/>
+ </Algorithm>
+ <Algorithm Comment="Normally executed algorithm" Name="deInitialize">
+ <ST Text=" QO := FALSE;"/>
+ </Algorithm>
+ <Algorithm Comment="new algorithm" Name="normalOperation">
+ <ST Text="QO := QI; IF TRUE = QI THEN (* only perform normal operation of QI is true*) END_IF; "/>
+ </Algorithm>
+ </BasicFB>
+</FBType>
diff --git a/data/template/EmptySimple.fbt b/data/template/TemplateSimple.fbt
similarity index 83%
rename from data/template/EmptySimple.fbt
rename to data/template/TemplateSimple.fbt
index da02d4a..8fb203e 100644
--- a/data/template/EmptySimple.fbt
+++ b/data/template/TemplateSimple.fbt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*******************************************************************************
- * Copyright (c) 2018 TU Wien/ACIN
+ * Copyright (c) 2010 Profactor GmbH, 2018 TU Wien/ACIN
*
* All rights reserved.
*
@@ -29,31 +29,38 @@
* POSSIBILITY OF SUCH DAMAGE.
*
* Contributors:
- * Peter Gsellmann
+ * Gerhard Ebenhofer
* - initial API and implementation and/or initial documentation
+ *
+ * Peter Gsellmann
+ * - Change from BasicFB to SimpleFB tag
*******************************************************************************/
-->
<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd" >
-<FBType Name="EmptySimple" Comment="Template for an empty simple function block" >
+<FBType Name="TemplateSimple" Comment="Example for a Simple Function Block Type" >
<Identification Standard="61499-1" />
<VersionInfo Organization="TU Wien/ACIN" Version="0.0" Author="Peter Gsellmann" Date="2018-10-15" />
<InterfaceList>
<EventInputs>
<Event Name="REQ" Comment="Normal Execution Request" >
+ <With Var="IN" />
</Event>
</EventInputs>
<EventOutputs>
<Event Name="CNF" Comment="Execution Confirmation" >
+ <With Var="OUT" />
</Event>
</EventOutputs>
<InputVars>
+ <VarDeclaration Name="IN" Type="BOOL" Comment="Input" />
</InputVars>
<OutputVars>
+ <VarDeclaration Name="OUT" Type="BOOL" Comment="Output" />
</OutputVars>
</InterfaceList>
<SimpleFB>
- <Algorithm Name="REQ" Comment="" >
- <Other Language="AnyText" Text=""/>
+ <Algorithm Name="REQ" Comment="Executed algorithm" >
+ <ST Text="OUT := IN; " />
</Algorithm>
</SimpleFB>
</FBType>
