--- a/examples/example.xml Thu Feb 01 18:09:34 2007 +0100
+++ b/examples/example.xml Wed Feb 07 18:43:32 2007 +0100
@@ -451,9 +451,9 @@
<body>
<ST>
IF IN1 THEN
- IN2 := 1;
+ IN2 := 1;
ELSE
- IN3 := 1;
+ IN3 := 1;
END_IF;
</ST>
</body>
@@ -506,7 +506,7 @@
<relPosition y="13" x="29"/>
</connectionPointOutAction>
</step>
- <selectionDivergence localId="4" height="1" width="287">
+ <selectionDivergence localId="4" height="1" width="391">
<position y="181" x="105"/>
<connectionPointIn>
<relPosition y="0" x="0"/>
@@ -519,10 +519,10 @@
<relPosition y="1" x="0"/>
</connectionPointOut>
<connectionPointOut formalParameter="">
- <relPosition y="1" x="133"/>
- </connectionPointOut>
- <connectionPointOut formalParameter="">
- <relPosition y="1" x="287"/>
+ <relPosition y="1" x="228"/>
+ </connectionPointOut>
+ <connectionPointOut formalParameter="">
+ <relPosition y="1" x="391"/>
</connectionPointOut>
</selectionDivergence>
<transition localId="5" height="2" width="20">
@@ -544,12 +544,12 @@
</condition>
</transition>
<step localId="6" height="27" width="48" initialStep="false" name="Step1">
- <position y="234" x="81"/>
+ <position y="262" x="81"/>
<connectionPointIn>
<relPosition y="0" x="24"/>
- <connection refLocalId="5">
- <position y="234" x="105"/>
- <position y="209" x="105"/>
+ <connection refLocalId="21">
+ <position y="262" x="105"/>
+ <position y="237" x="105"/>
</connection>
</connectionPointIn>
<connectionPointOut formalParameter="">
@@ -557,12 +557,12 @@
</connectionPointOut>
</step>
<transition localId="7" height="2" width="20">
- <position y="207" x="228"/>
+ <position y="207" x="323"/>
<connectionPointIn>
<relPosition y="0" x="10"/>
<connection refLocalId="4">
- <position y="207" x="238"/>
- <position y="182" x="238"/>
+ <position y="207" x="333"/>
+ <position y="182" x="333"/>
</connection>
</connectionPointIn>
<connectionPointOut>
@@ -575,12 +575,12 @@
</condition>
</transition>
<step localId="8" height="27" width="48" initialStep="false" name="Step2">
- <position y="234" x="214"/>
+ <position y="234" x="309"/>
<connectionPointIn>
<relPosition y="0" x="24"/>
<connection refLocalId="7">
- <position y="234" x="238"/>
- <position y="209" x="238"/>
+ <position y="234" x="333"/>
+ <position y="209" x="333"/>
</connection>
</connectionPointIn>
<connectionPointOut formalParameter="">
@@ -588,12 +588,12 @@
</connectionPointOut>
</step>
<transition localId="9" height="2" width="20">
- <position y="207" x="382"/>
+ <position y="207" x="486"/>
<connectionPointIn>
<relPosition y="0" x="10"/>
<connection refLocalId="4">
- <position y="207" x="392"/>
- <position y="182" x="392"/>
+ <position y="207" x="496"/>
+ <position y="182" x="496"/>
</connection>
</connectionPointIn>
<connectionPointOut>
@@ -606,12 +606,12 @@
</condition>
</transition>
<step localId="10" height="27" width="48" initialStep="false" name="Step3">
- <position y="234" x="368"/>
+ <position y="234" x="472"/>
<connectionPointIn>
<relPosition y="0" x="24"/>
<connection refLocalId="9">
- <position y="234" x="392"/>
- <position y="209" x="392"/>
+ <position y="234" x="496"/>
+ <position y="209" x="496"/>
</connection>
</connectionPointIn>
<connectionPointOut formalParameter="">
@@ -622,12 +622,12 @@
</connectionPointOutAction>
</step>
<transition localId="11" height="2" width="20">
- <position y="286" x="95"/>
+ <position y="342" x="95"/>
<connectionPointIn>
<relPosition y="0" x="10"/>
- <connection refLocalId="6">
- <position y="286" x="105"/>
- <position y="261" x="105"/>
+ <connection refLocalId="23">
+ <position y="342" x="105"/>
+ <position y="317" x="105"/>
</connection>
</connectionPointIn>
<connectionPointOut>
@@ -640,12 +640,12 @@
</condition>
</transition>
<jumpStep localId="12" height="13" width="12" targetName="Start">
- <position y="313" x="99"/>
+ <position y="369" x="99"/>
<connectionPointIn>
<relPosition y="0" x="6"/>
<connection refLocalId="11">
- <position y="313" x="105"/>
- <position y="288" x="105"/>
+ <position y="369" x="105"/>
+ <position y="344" x="105"/>
</connection>
</connectionPointIn>
</jumpStep>
@@ -663,12 +663,12 @@
</action>
</actionBlock>
<transition localId="14" height="2" width="20">
- <position y="286" x="228"/>
+ <position y="286" x="323"/>
<connectionPointIn>
<relPosition y="0" x="10"/>
<connection refLocalId="8">
- <position y="286" x="238"/>
- <position y="261" x="238"/>
+ <position y="286" x="333"/>
+ <position y="261" x="333"/>
</connection>
</connectionPointIn>
<connectionPointOut>
@@ -681,12 +681,12 @@
</condition>
</transition>
<transition localId="15" height="2" width="20">
- <position y="316" x="382"/>
+ <position y="316" x="486"/>
<connectionPointIn>
<relPosition y="0" x="10"/>
<connection refLocalId="10">
- <position y="316" x="392"/>
- <position y="261" x="392"/>
+ <position y="316" x="496"/>
+ <position y="261" x="496"/>
</connection>
</connectionPointIn>
<connectionPointOut>
@@ -698,52 +698,101 @@
</inline>
</condition>
</transition>
- <selectionConvergence localId="16" height="1" width="154">
- <position y="343" x="238"/>
+ <selectionConvergence localId="16" height="1" width="163">
+ <position y="343" x="333"/>
<connectionPointIn>
<relPosition y="0" x="0"/>
<connection refLocalId="14">
- <position y="343" x="238"/>
- <position y="288" x="238"/>
- </connection>
- </connectionPointIn>
- <connectionPointIn>
- <relPosition y="0" x="154"/>
+ <position y="343" x="333"/>
+ <position y="288" x="333"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointIn>
+ <relPosition y="0" x="163"/>
<connection refLocalId="15">
- <position y="343" x="392"/>
- <position y="318" x="392"/>
- </connection>
- </connectionPointIn>
- <connectionPointOut>
- <relPosition y="1" x="78"/>
+ <position y="343" x="496"/>
+ <position y="318" x="496"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition y="1" x="80"/>
</connectionPointOut>
</selectionConvergence>
<jumpStep localId="19" height="13" width="12" targetName="Init">
- <position y="369" x="310"/>
+ <position y="369" x="407"/>
<connectionPointIn>
<relPosition y="0" x="6"/>
<connection refLocalId="16">
- <position y="369" x="316"/>
- <position y="344" x="316"/>
+ <position y="369" x="413"/>
+ <position y="344" x="413"/>
</connection>
</connectionPointIn>
</jumpStep>
<actionBlock localId="20" height="60" width="181">
- <position y="232" x="441"/>
+ <position y="232" x="545"/>
<connectionPointIn>
<relPosition y="15" x="0"/>
<connection refLocalId="10">
- <position y="247" x="441"/>
- <position y="247" x="416"/>
+ <position y="247" x="545"/>
+ <position y="247" x="520"/>
</connection>
</connectionPointIn>
<action indicator="IN5" qualifier="N">
<reference name="ACT1"/>
</action>
- <action qualifier="D" duration="10s">
+ <action qualifier="D" duration="T#10s">
<reference name="IN1"/>
</action>
</actionBlock>
+ <simultaneousDivergence localId="21" height="3" width="118">
+ <position y="234" x="105"/>
+ <connectionPointIn>
+ <relPosition y="0" x="0"/>
+ <connection refLocalId="5">
+ <position y="234" x="105"/>
+ <position y="209" x="105"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut formalParameter="">
+ <relPosition y="3" x="0"/>
+ </connectionPointOut>
+ <connectionPointOut formalParameter="">
+ <relPosition y="3" x="118"/>
+ </connectionPointOut>
+ </simultaneousDivergence>
+ <step localId="22" height="27" width="48" initialStep="false" name="Step4">
+ <position y="262" x="199"/>
+ <connectionPointIn>
+ <relPosition y="0" x="24"/>
+ <connection refLocalId="21">
+ <position y="262" x="223"/>
+ <position y="237" x="223"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut formalParameter="">
+ <relPosition y="27" x="24"/>
+ </connectionPointOut>
+ </step>
+ <simultaneousConvergence localId="23" height="3" width="118">
+ <position y="314" x="105"/>
+ <connectionPointIn>
+ <relPosition y="0" x="0"/>
+ <connection refLocalId="6">
+ <position y="314" x="105"/>
+ <position y="289" x="105"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointIn>
+ <relPosition y="0" x="118"/>
+ <connection refLocalId="22">
+ <position y="314" x="223"/>
+ <position y="289" x="223"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition y="3" x="0"/>
+ </connectionPointOut>
+ </simultaneousConvergence>
</SFC>
</body>
</pou>
@@ -797,16 +846,16 @@
<body>
<ST>
IF Collision THEN
- Speed := 0;
- Brakes := ON;
+ Speed := 0;
+ Brakes := ON;
END_IF;
IF (Gate = CLOSED) AND
- (Pump = ON) AND (Temp > 200.0) THEN
- Control_State := Active;
+ (Pump = ON) AND (Temp > 200.0) THEN
+ Control_State := Active;
ELSE
- Control_State := Hold;
- PumpSpeed := 10.0;
+ Control_State := Hold;
+ PumpSpeed := 10.0;
END_IF;
</ST>
</body>