JetBrains · Sdmitrioul · Apr 14, 2023 · Apr 17, 2023 · Apr 18, 2023 · Apr 18, 2023
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/Project_check.xml b/.idea/inspectionProfiles/Project_check.xml
diff --git a/.idea/modules/fbme.iml b/.idea/modules/fbme.iml
diff --git a/.idea/runConfigurations/Remote_debug_MPS.xml b/.idea/runConfigurations/Remote_debug_MPS.xml
diff --git a/.idea/runConfigurations/Test_Teamcity_configuration_generation.xml b/.idea/runConfigurations/Test_Teamcity_configuration_generation.xml
diff --git a/.idea/scopes/Checked_source_files.xml b/.idea/scopes/Checked_source_files.xml
diff --git a/...on/solutions/org.fbme.ide.integration.fordiac/models/org.fbme.ide.integration.fordiac.mps b/...on/solutions/org.fbme.ide.integration.fordiac/models/org.fbme.ide.integration.fordiac.mps
@@ -2409,7 +2409,7 @@
       </node>
       <node concept="3Tm1VV" id="NsL_pTivx6" role="1B3o_S" />
       <node concept="2AHcQZ" id="NsL_pTiyGm" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="7fNS1Avd1cM" role="jymVt" />
@@ -3452,7 +3452,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="3m7NxmgdDk4" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="2hzhDSCJnar" role="jymVt" />
@@ -3515,7 +3515,7 @@
         </node>
       </node>
       <node concept="2AHcQZ" id="2hzhDSCJrIf" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" />
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
     <node concept="2tJIrI" id="7fNS1AuVdjo" role="jymVt" />

diff --git a/code/4diac-integration/solutions/stdlib/models/iec61499.4diac.stdlib/events/ARTimeOut.adp b/code/4diac-integration/solutions/stdlib/models/iec61499.4diac.stdlib/events/ARTimeOut.adp
@@ -1,43 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE AdapterType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
-<AdapterType Comment="Interface for a resetable time out service" Name="ARTimeOut">
-  <Identification Description="Copyright (c) 2017 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-1"/>
-  <VersionInfo Author="Alois Zoitl" Date="2017-09-22" Organization="fortiss GmbH" Remarks="initial API and implementation and/or initial documentation" Version="1.0"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE AdapterType SYSTEM "https://www.holobloc.com/xml/LibraryElement.dtd">
+
+<AdapterType Name="ARTimeOut">
   <InterfaceList>
     <EventInputs>
-      <Event Comment="Request from Socket" Name="TimeOut" Type="Event"/>
+      <Event Name="TimeOut" />
     </EventInputs>
     <EventOutputs>
-      <Event Comment="start/reset timeout notifcation" Name="START" Type="Event">
-        <With Var="DT"/>
+      <Event Name="START">
+        <With Var="DT" />
       </Event>
-      <Event Comment="stop timeout notification" Name="STOP" Type="Event"/>
+      <Event Name="STOP" />
     </EventOutputs>
-    <InputVars/>
     <OutputVars>
-      <VarDeclaration Comment="timeout duration" InitialValue="" Name="DT" Type="TIME"/>
+      <VarDeclaration Name="DT" Type="TIME" />
     </OutputVars>
   </InterfaceList>
-  <Service Comment="Interface for a resetable time out service" LeftInterface="SOCKET" RightInterface="PLUG">
-    <ServiceSequence Comment="" Name="Timeout">
-      <ServiceTransaction>
-        <InputPrimitive Event="START" Interface="PLUG" Parameters="TD"/>
-        <OutputPrimitive Event="START" Interface="SOCKET" Parameters="TD"/>
-      </ServiceTransaction>
-      <ServiceTransaction>
-        <InputPrimitive Event="TimeOut" Interface="SOCKET" Parameters=""/>
-        <OutputPrimitive Event="TimeOut" Interface="PLUG"/>
-      </ServiceTransaction>
-    </ServiceSequence>
-    <ServiceSequence Comment="" Name="normal operation">
-      <ServiceTransaction>
-        <InputPrimitive Event="Start" Interface="PLUG" Parameters="TD"/>
-        <OutputPrimitive Event="Start" Interface="SOCKET" Parameters="TD"/>
-      </ServiceTransaction>
-      <ServiceTransaction>
-        <InputPrimitive Event="STOP" Interface="PLUG" Parameters=""/>
-        <OutputPrimitive Event="STOP" Interface="SOCKET" Parameters=""/>
-      </ServiceTransaction>
-    </ServiceSequence>
-  </Service>
 </AdapterType>
+
diff --git a/code/4diac-integration/solutions/stdlib/models/iec61499.4diac.stdlib/events/ATimeOut.adp b/code/4diac-integration/solutions/stdlib/models/iec61499.4diac.stdlib/events/ATimeOut.adp
@@ -1,43 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE AdapterType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
-<AdapterType Comment="Interface for a time out service roughly based on the definitions of ROOM" Name="ATimeOut">
-  <Identification Description="Copyright (c) 2017 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-1"/>
-  <VersionInfo Author="Alois Zoitl" Date="2017-09-22" Organization="fortiss GmbH" Remarks="initial API and implementation and/or initial documentation" Version="1.0"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE AdapterType SYSTEM "https://www.holobloc.com/xml/LibraryElement.dtd">
+
+<AdapterType Name="ATimeOut">
   <InterfaceList>
     <EventInputs>
-      <Event Comment="Request from Socket" Name="TimeOut" Type="Event"/>
+      <Event Name="TimeOut" />
     </EventInputs>
     <EventOutputs>
-      <Event Comment="start timeout notifcation" Name="START" Type="Event">
-        <With Var="DT"/>
+      <Event Name="START">
+        <With Var="DT" />
       </Event>
-      <Event Comment="stop timeout notification" Name="STOP" Type="Event"/>
+      <Event Name="STOP" />
     </EventOutputs>
-    <InputVars/>
     <OutputVars>
-      <VarDeclaration Comment="timeout duration" InitialValue="" Name="DT" Type="TIME"/>
+      <VarDeclaration Name="DT" Type="TIME" />
     </OutputVars>
   </InterfaceList>
-  <Service Comment="Interface for a time out service roughly based on the definitions of ROOM" LeftInterface="SOCKET" RightInterface="PLUG">
-    <ServiceSequence Comment="" Name="Timeout">
-      <ServiceTransaction>
-        <InputPrimitive Event="START" Interface="PLUG" Parameters="TD"/>
-        <OutputPrimitive Event="START" Interface="SOCKET" Parameters="TD"/>
-      </ServiceTransaction>
-      <ServiceTransaction>
-        <InputPrimitive Event="TimeOut" Interface="SOCKET" Parameters=""/>
-        <OutputPrimitive Event="TimeOut" Interface="PLUG"/>
-      </ServiceTransaction>
-    </ServiceSequence>
-    <ServiceSequence Comment="" Name="normal operation">
-      <ServiceTransaction>
-        <InputPrimitive Event="Start" Interface="PLUG" Parameters="TD"/>
-        <OutputPrimitive Event="Start" Interface="SOCKET" Parameters="TD"/>
-      </ServiceTransaction>
-      <ServiceTransaction>
-        <InputPrimitive Event="STOP" Interface="PLUG" Parameters=""/>
-        <OutputPrimitive Event="STOP" Interface="SOCKET" Parameters=""/>
-      </ServiceTransaction>
-    </ServiceSequence>
-  </Service>
 </AdapterType>
+
diff --git a/code/4diac-integration/solutions/stdlib/models/iec61499.4diac.stdlib/events/E_CTD.fbt b/code/4diac-integration/solutions/stdlib/models/iec61499.4diac.stdlib/events/E_CTD.fbt
@@ -1,53 +1,52 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
-<FBType Comment="Event-Driven Down Counter" Name="E_CTD">
-  <Identification Classification="Event-driven blocks" Description="Copyright (c) 2017 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Function="Down-counter" Standard="61499-1-A.x"/>
-  <VersionInfo Author="Alois Zoitl" Date="2017-09-22" Organization="fortiss GmbH" Remarks="initial API and implementation and/or initial documentation" Version="1.0"/>
-  <CompilerInfo/>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "https://www.holobloc.com/xml/LibraryElement.dtd">
+
+<FBType Name="E_CTD">
   <InterfaceList>
     <EventInputs>
-      <Event Comment="Count Down" Name="CD" Type="Event"/>
-      <Event Comment="Load counter value" Name="LD" Type="Event">
-        <With Var="PV"/>
+      <Event Name="CD" />
+      <Event Name="LD">
+        <With Var="PV" />
       </Event>
     </EventInputs>
     <EventOutputs>
-      <Event Comment="Count Down Output Event" Name="CDO" Type="Event">
-        <With Var="Q"/>
-        <With Var="CV"/>
+      <Event Name="CDO">
+        <With Var="Q" />
+        <With Var="CV" />
       </Event>
-      <Event Comment="Reset Output Event" Name="LDO" Type="Event">
-        <With Var="Q"/>
-        <With Var="CV"/>
+      <Event Name="LDO">
+        <With Var="Q" />
+        <With Var="CV" />
       </Event>
     </EventOutputs>
     <InputVars>
-      <VarDeclaration Comment="Preset Value" Name="PV" Type="UINT"/>
+      <VarDeclaration Name="PV" Type="UINT" />
     </InputVars>
     <OutputVars>
-      <VarDeclaration Comment="CV &lt;= 0" Name="Q" Type="BOOL"/>
-      <VarDeclaration Comment="" Name="CV" Type="UINT"/>
+      <VarDeclaration Name="Q" Type="BOOL" />
+      <VarDeclaration Name="CV" Type="UINT" />
     </OutputVars>
   </InterfaceList>
   <BasicFB>
     <ECC>
-      <ECState Comment="" Name="START" x="240.0" y="90.0"/>
-      <ECState Comment="" Name="CU" x="865.0" y="90.0">
-        <ECAction Algorithm="CD" Output="CDO"/>
+      <ECState Name="START" x="240" y="90" />
+      <ECState Name="CU" x="865" y="90">
+        <ECAction Output="CDO" Algorithm="CD" />
       </ECState>
-      <ECState Comment="" Name="LD" x="450.0" y="610.0">
-        <ECAction Algorithm="LD" Output="LDO"/>
+      <ECState Name="LD" x="450" y="610">
+        <ECAction Output="LDO" Algorithm="LD" />
       </ECState>
-      <ECTransition Comment="" Condition="CD[(CV &gt;= 1)]" Destination="CU" Source="START" x="1035.0" y="460.0"/>
-      <ECTransition Comment="" Condition="1" Destination="START" Source="CU" x="630.0" y="90.0"/>
-      <ECTransition Comment="" Condition="LD" Destination="LD" Source="START" x="395.0" y="510.0"/>
-      <ECTransition Comment="" Condition="1" Destination="START" Source="LD" x="240.0" y="610.0"/>
+      <ECTransition Source="START" Destination="CU" x="1035" y="460" Condition="CD[(CV &amp;#62;= 1)]" />
+      <ECTransition Source="CU" Destination="START" x="630" y="90" Condition="1" />
+      <ECTransition Source="START" Destination="LD" x="395" y="510" Condition="LD" />
+      <ECTransition Source="LD" Destination="START" x="240" y="610" Condition="1" />
     </ECC>
-    <Algorithm Comment="Count Down" Name="CD">
-      <ST Text="CV := CV - 1;&#10;Q := (CV &lt;= 0);&#10;&#10;"/>
+    <Algorithm Name="CD">
+      <ST Text="CV := CV - 1;&amp;#38;#10;Q := (CV &amp;#60;= 0);&amp;#38;#10;" />
     </Algorithm>
-    <Algorithm Comment="Load" Name="LD">
-      <ST Text="CV := PV;&#10;Q:= (CV &lt;= 0);&#10;"/>
+    <Algorithm Name="LD">
+      <ST Text="CV := PV;&amp;#38;#10;Q := (CV &amp;#60;= 0);&amp;#38;#10;" />
     </Algorithm>
   </BasicFB>
 </FBType>
+
diff --git a/code/4diac-integration/solutions/stdlib/models/iec61499.4diac.stdlib/events/E_CTU.fbt b/code/4diac-integration/solutions/stdlib/models/iec61499.4diac.stdlib/events/E_CTU.fbt
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
-<FBType Comment="Event driven up counter" Name="E_CTU">
-  <Identification Description="Copyright (c) 2017 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-1 Annex 2"/>
-  <VersionInfo Author="Alois Zoitl" Date="2017-09-21" Organization="fortiss GmbH" Remarks="initial API and implementation and/or initial documentation" Version="1.0"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE FBType SYSTEM "https://www.holobloc.com/xml/LibraryElement.dtd">
+
+<FBType Name="E_CTU">
   <InterfaceList>
     <EventInputs>
-      <Event Comment="Count up" Name="CU" Type="Event">
-        <With Var="PV"/>
+      <Event Name="CU">
+        <With Var="PV" />
       </Event>
-      <Event Comment="Reset" Name="R" Type="Event"/>
+      <Event Name="R" />
     </EventInputs>
     <EventOutputs>
-      <Event Comment="Count up output" Name="CUO" Type="Event">
-        <With Var="Q"/>
-        <With Var="CV"/>
+      <Event Name="CUO">
+        <With Var="Q" />
+        <With Var="CV" />
       </Event>
-      <Event Comment="Reset output" Name="RO" Type="Event">
-        <With Var="Q"/>
-        <With Var="CV"/>
+      <Event Name="RO">
+        <With Var="Q" />
+        <With Var="CV" />
       </Event>
     </EventOutputs>
     <InputVars>
-      <VarDeclaration Comment="Process Value" Name="PV" Type="UINT"/>
+      <VarDeclaration Name="PV" Type="UINT" />
     </InputVars>
     <OutputVars>
-      <VarDeclaration Comment="True if CV &gt;= PV" Name="Q" Type="BOOL"/>
-      <VarDeclaration Comment="Counter Value" Name="CV" Type="UINT"/>
+      <VarDeclaration Name="Q" Type="BOOL" />
+      <VarDeclaration Name="CV" Type="UINT" />
     </OutputVars>
   </InterfaceList>
   <BasicFB>
     <ECC>
-      <ECState Comment="Initial State" Name="START" x="550.0" y="425.0"/>
-      <ECState Comment="" Name="CU" x="1570.0" y="165.0">
-        <ECAction Algorithm="CU" Output="CUO"/>
+      <ECState Name="START" x="550" y="425" />
+      <ECState Name="CU" x="1570" y="165">
+        <ECAction Output="CUO" Algorithm="CU" />
       </ECState>
-      <ECState Comment="" Name="R" x="900.0" y="1000.0">
-        <ECAction Algorithm="R" Output="RO"/>
+      <ECState Name="R" x="900" y="1000">
+        <ECAction Output="RO" Algorithm="R" />
       </ECState>
-      <ECTransition Comment="" Condition="CU[CV &lt; 65535]" Destination="CU" Source="START" x="970.0" y="210.0"/>
-      <ECTransition Comment="" Condition="1" Destination="START" Source="CU" x="1285.0" y="510.0"/>
-      <ECTransition Comment="" Condition="R" Destination="R" Source="START" x="845.0" y="770.0"/>
-      <ECTransition Comment="" Condition="1" Destination="START" Source="R" x="545.0" y="1050.0"/>
+      <ECTransition Source="START" Destination="CU" x="970" y="210" Condition="CU[CV &amp;#60; 65535]" />
+      <ECTransition Source="CU" Destination="START" x="1285" y="510" Condition="1" />
+      <ECTransition Source="START" Destination="R" x="845" y="770" Condition="R" />
+      <ECTransition Source="R" Destination="START" x="545" y="1050" Condition="1" />
     </ECC>
-    <Algorithm Comment="reset counter" Name="R">
-      <ST Text="CV := 0;&#13;&#10;Q := FALSE;"/>
+    <Algorithm Name="R">
+      <ST Text="CV := 0;&amp;#38;#10;Q := FALSE;&amp;#38;#10;" />
     </Algorithm>
-    <Algorithm Comment="count up" Name="CU">
-      <ST Text="CV := CV + 1;&#13;&#10;Q  := (CV &gt;= PV);"/>
+    <Algorithm Name="CU">
+      <ST Text="CV := CV + 1;&amp;#38;#10;Q := (CV &amp;#62;= PV);&amp;#38;#10;" />
     </Algorithm>
   </BasicFB>
 </FBType>
+