Skip to content

Commit 52cf8cd

Browse files
T12zT12z
committed
Merge branch 'master' of https://github.com/openETCS/modeling 
2 parents 2a6cdc3 + 4738eaf commit 52cf8cd

File tree

118 files changed

+781972
-452301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+781972
-452301
lines changed

‎model/Scade/System/OBU_PreIntegrations/Testbench_Integration/Testbench_Integration.etp‎

Lines changed: 27 additions & 361 deletions
Large diffs are not rendered by default.

‎model/Scade/System/OBU_PreIntegrations/Testbench_Integration/Testbench_Integration_Pkg.xscade‎

Lines changed: 527 additions & 437 deletions
Large diffs are not rendered by default.

‎model/Scade/System/OBU_PreIntegrations/Toolbox/Toolbox.xscade‎

Lines changed: 1108 additions & 734 deletions
Large diffs are not rendered by default.

‎model/Scade/System/OBU_PreIntegrations/openETCS_EVC/openETCS_EVC.xscade‎

Lines changed: 102 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,30 @@
198198
</ed:Variable>
199199
</pragmas>
200200
</Variable>
201+
<Variable name="toRTM">
202+
<type>
203+
<NamedType>
204+
<type>
205+
<TypeRef name="TM_TrainTrack_Bus::M_TrainTrackMessageBus_t"/>
206+
</type>
207+
</NamedType>
208+
</type>
209+
<pragmas>
210+
<ed:Variable oid="!ed/f7e9e/1798/1120/561ce8874bf3"/>
211+
</pragmas>
212+
</Variable>
213+
<Variable name="API_RTM_management">
214+
<type>
215+
<NamedType>
216+
<type>
217+
<TypeRef name="API_RadioCommunication_Pkg::RadioManagement_T"/>
218+
</type>
219+
</NamedType>
220+
</type>
221+
<pragmas>
222+
<ed:Variable oid="!ed/105feb/50C5/1504/5620d9011fea"/>
223+
</pragmas>
224+
</Variable>
201225
<Variable name="API_toDMI">
202226
<type>
203227
<NamedType>
@@ -341,18 +365,6 @@
341365
</ed:Variable>
342366
</pragmas>
343367
</Variable>
344-
<Variable name="toRTM">
345-
<type>
346-
<NamedType>
347-
<type>
348-
<TypeRef name="TM_TrainTrack_Bus::M_TrainTrackMessageBus_t"/>
349-
</type>
350-
</NamedType>
351-
</type>
352-
<pragmas>
353-
<ed:Variable oid="!ed/f7e9e/1798/1120/561ce8874bf3"/>
354-
</pragmas>
355-
</Variable>
356368
</outputs>
357369
<locals>
358370
<Variable name="TIU_trainStatus">
@@ -7501,6 +7513,18 @@
75017513
<ed:Variable oid="!ed/faaca/75C/1AA8/561fdcd959ca"/>
75027514
</pragmas>
75037515
</Variable>
7516+
<Variable name="_L1579">
7517+
<type>
7518+
<NamedType>
7519+
<type>
7520+
<TypeRef name="API_RadioCommunication_Pkg::RadioManagement_T"/>
7521+
</type>
7522+
</NamedType>
7523+
</type>
7524+
<pragmas>
7525+
<ed:Variable oid="!ed/105fe4/50C5/1504/5620d8cc1494"/>
7526+
</pragmas>
7527+
</Variable>
75047528
</locals>
75057529
<data>
75067530
<!-- _L161, _L162 = output_to_TIU_API_Pkg::TIU_OutputIntegration(_L163, _L647, _L166, ... -->
@@ -17784,10 +17808,11 @@
1778417808
<ed:Equation oid="!ed/e9ed8/3E28/25C4/56192f922d5d"/>
1778517809
</pragmas>
1778617810
</Equation>
17787-
<!-- _L1529 = radioOutput_Pkg::nextGenRadioOutput(_L1541, _L1530, _L1536, _L1535); -->
17811+
<!-- _L1529, _L1579 = radioOutput_Pkg::nextGenRadioOutput(_L1541, _L1530, _L1536, _L15... -->
1778817812
<Equation>
1778917813
<lefts>
1779017814
<VariableRef name="_L1529"/>
17815+
<VariableRef name="_L1579"/>
1779117816
</lefts>
1779217817
<right>
1779317818
<!-- radioOutput_Pkg::nextGenRadioOutput(_L1541, _L1530, _L1536, _L1535) -->
@@ -18603,6 +18628,22 @@
1860318628
<ed:Equation oid="!ed/faace/75C/1AA8/561fdcd968ad"/>
1860418629
</pragmas>
1860518630
</Equation>
18631+
<!-- API_RTM_management = _L1579; -->
18632+
<Equation>
18633+
<lefts>
18634+
<VariableRef name="API_RTM_management"/>
18635+
</lefts>
18636+
<right>
18637+
<IdExpression>
18638+
<path>
18639+
<ConstVarRef name="_L1579"/>
18640+
</path>
18641+
</IdExpression>
18642+
</right>
18643+
<pragmas>
18644+
<ed:Equation oid="!ed/105fec/50C5/1504/5620d918c3b"/>
18645+
</pragmas>
18646+
</Equation>
1860618647
</data>
1860718648
<pragmas>
1860818649
<ed:Operator oid="!ed/a7031/2EE8/4498/54e4904e5281" xmlns="http://www.esterel-technologies.com/ns/scade/pragmas/editor/5">
@@ -20764,7 +20805,7 @@
2076420805
</EquationGE>
2076520806
<EquationGE presentable="!ed/f7e9f/1798/1120/561ce8a537ea">
2076620807
<position>
20767-
<Point x="30480" y="15901"/>
20808+
<Point x="30480" y="14949"/>
2076820809
</position>
2076920810
<size>
2077020811
<Size width="318" height="502"/>
@@ -21064,20 +21105,44 @@
2106421105
<Point x="16140" y="28998"/>
2106521106
</positions>
2106621107
</Edge>
21067-
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/f7e92/1798/1120/561ce8144816" dstEquation="!ed/f7e9f/1798/1120/561ce8a537ea">
21108+
<EquationGE presentable="!ed/faa1c/1530/1BF8/561fd8ff659">
21109+
<position>
21110+
<Point x="30110" y="13891"/>
21111+
</position>
21112+
<size>
21113+
<Size width="344" height="502"/>
21114+
</size>
21115+
</EquationGE>
21116+
<EquationGE presentable="!ed/faa7b/1530/1BF8/561fdb285fd2">
21117+
<position>
21118+
<Point x="30295" y="7355"/>
21119+
</position>
21120+
<size>
21121+
<Size width="344" height="503"/>
21122+
</size>
21123+
</EquationGE>
21124+
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/58f436/1AFE/2754/54f5c2de3423" dstEquation="!ed/faa7b/1530/1BF8/561fdb285fd2">
2106821125
<positions>
21069-
<Point x="28760" y="16193"/>
21070-
<Point x="29845" y="16193"/>
21071-
<Point x="29845" y="16193"/>
21072-
<Point x="30533" y="16193"/>
21126+
<Point x="28734" y="7646"/>
21127+
<Point x="29157" y="7646"/>
21128+
<Point x="29157" y="7646"/>
21129+
<Point x="30295" y="7646"/>
2107321130
</positions>
2107421131
</Edge>
21075-
<Edge leftVarIndex="5" rightExprIndex="1" srcEquation="!ed/c3b95/1418/2190/554791176c59" dstEquation="!ed/f7e92/1798/1120/561ce8144816">
21132+
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/f7e92/1798/1120/561ce8144816" dstEquation="!ed/faa1c/1530/1BF8/561fd8ff659">
2107621133
<positions>
21077-
<Point x="15214" y="20929"/>
21078-
<Point x="19923" y="20929"/>
21079-
<Point x="19923" y="15240"/>
21080-
<Point x="24659" y="15240"/>
21134+
<Point x="28760" y="15240"/>
21135+
<Point x="29528" y="15240"/>
21136+
<Point x="29528" y="14155"/>
21137+
<Point x="30110" y="14155"/>
21138+
</positions>
21139+
</Edge>
21140+
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/f7e92/1798/1120/561ce8144816" dstEquation="!ed/f7e9f/1798/1120/561ce8a537ea">
21141+
<positions>
21142+
<Point x="28760" y="15240"/>
21143+
<Point x="29633" y="15240"/>
21144+
<Point x="29633" y="15240"/>
21145+
<Point x="30533" y="15240"/>
2108121146
</positions>
2108221147
</Edge>
2108321148
<Edge leftVarIndex="1" rightExprIndex="4" srcEquation="!ed/f7ed0/1798/1120/561cea025040" dstEquation="!ed/f7e92/1798/1120/561ce8144816">
@@ -21102,36 +21167,28 @@
2110221167
<Point x="24659" y="17119"/>
2110321168
</positions>
2110421169
</Edge>
21105-
<EquationGE presentable="!ed/faa1c/1530/1BF8/561fd8ff659">
21106-
<position>
21107-
<Point x="30348" y="17992"/>
21108-
</position>
21109-
<size>
21110-
<Size width="344" height="502"/>
21111-
</size>
21112-
</EquationGE>
21113-
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/f7e92/1798/1120/561ce8144816" dstEquation="!ed/faa1c/1530/1BF8/561fd8ff659">
21170+
<Edge leftVarIndex="5" rightExprIndex="1" srcEquation="!ed/c3b95/1418/2190/554791176c59" dstEquation="!ed/f7e92/1798/1120/561ce8144816">
2111421171
<positions>
21115-
<Point x="28760" y="16193"/>
21116-
<Point x="29554" y="16193"/>
21117-
<Point x="29554" y="18256"/>
21118-
<Point x="30348" y="18256"/>
21172+
<Point x="15214" y="20929"/>
21173+
<Point x="19923" y="20929"/>
21174+
<Point x="19923" y="15240"/>
21175+
<Point x="24659" y="15240"/>
2111921176
</positions>
2112021177
</Edge>
21121-
<EquationGE presentable="!ed/faa7b/1530/1BF8/561fdb285fd2">
21178+
<EquationGE presentable="!ed/105fec/50C5/1504/5620d918c3b">
2112221179
<position>
21123-
<Point x="29580" y="7355"/>
21180+
<Point x="29845" y="16854"/>
2112421181
</position>
2112521182
<size>
21126-
<Size width="344" height="503"/>
21183+
<Size width="318" height="503"/>
2112721184
</size>
2112821185
</EquationGE>
21129-
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/58f436/1AFE/2754/54f5c2de3423" dstEquation="!ed/faa7b/1530/1BF8/561fdb285fd2">
21186+
<Edge leftVarIndex="2" rightExprIndex="1" srcEquation="!ed/f7e92/1798/1120/561ce8144816" dstEquation="!ed/105fec/50C5/1504/5620d918c3b">
2113021187
<positions>
21131-
<Point x="28734" y="7646"/>
21132-
<Point x="29157" y="7646"/>
21133-
<Point x="29157" y="7620"/>
21134-
<Point x="29580" y="7620"/>
21188+
<Point x="28760" y="17119"/>
21189+
<Point x="29316" y="17119"/>
21190+
<Point x="29316" y="17119"/>
21191+
<Point x="29898" y="17119"/>
2113521192
</positions>
2113621193
</Edge>
2113721194
</presentationElements>

‎model/Scade/System/ObuFunctions/ManageLevelsAndModes/Level_And_Mode_Types/Level_And_Mode_Types.pdf‎

51.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)