Skip to content

Commit 4e289c8

Browse files
author
BerndHekele
committed
Workaround for #791 
1 parent 88950d4 commit 4e289c8

File tree

3 files changed

+601
-213
lines changed

3 files changed

+601
-213
lines changed

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10630,45 +10630,65 @@
1063010630
</Prop>
1063110631
<Prop id="241" name="@GENERATOR:OBSERVED_NODES">
1063210632
<value>manage_TextMessages_Pkg::setNew</value>
10633+
<value>xdebugSupport_Pkg::setProbesBalises</value>
10634+
<value>xdebugSupport_Pkg::distanceLastBG</value>
1063310635
<value>manage_DMI_Output_Pkg::sendTrainData</value>
1063410636
<value>manage_DMI_Input_Pkg::receiveRequestsModesAndLevel</value>
10637+
<value>xdebugSupport_Pkg::locationOfReferenceLRBG</value>
10638+
<value>xdebugSupport_Pkg::getLRBGFromMsg</value>
10639+
<value>packagesSupport_Pkg::simplePacketCheck</value>
10640+
<value>packagesSupport_Pkg::checkRadioManagementType</value>
1063510641
<value>manage_DMI_Output_Pkg::synchWithDMI</value>
1063610642
<value>manage_DMI_Input_Pkg::manageDMI_Input</value>
1063710643
<value>manage_TextMessages_Pkg::deleteElement</value>
1063810644
<value>manage_TextMessages_Pkg::findForCheck</value>
1063910645
<value>manage_DMI_Input_Pkg::doDriverRequests</value>
1064010646
<value>manage_TextMessages_Pkg::sendTextMessage</value>
10647+
<value>xdebugSupport_Pkg::bypassGeneralMessage</value>
1064110648
<value>manage_DMI_Output_Pkg::cyclicReportToDMI</value>
10642-
<value>Acknowledgement::IsAckNeeded</value>
1064310649
<value>ManageLevels</value>
10650+
<value>xdebugSupport_Pkg::countPackets</value>
10651+
<value>xdebugSupport_Pkg::combineForLevelChange</value>
10652+
<value>packagesSupport_Pkg::getRadioManagement</value>
1064410653
<value>manage_DMI_Output_Pkg::isSendingNeeded</value>
10654+
<value>xdebugSupport_Pkg::checkNTCPriority</value>
1064510655
<value>manage_TextMessages_Pkg::receiveTextMessageAck</value>
1064610656
<value>manage_TextMessages_Pkg::mapMLtoElement</value>
1064710657
<value>manage_DMI_Output_Pkg::sendVersion</value>
10658+
<value>OutputManagement::Output_To_BG_Management</value>
1064810659
<value>manage_DMI_Output_Pkg::sendLevelListPkg</value>
1064910660
<value>manage_DMI_Input_Pkg::updateDMIStatus</value>
10661+
<value>OutputManagement::Output_Mode_Level_To_Use</value>
10662+
<value>xdebugSupport_Pkg::packetValid</value>
10663+
<value>packagesSupport_Pkg::getParameterPositionReport</value>
1065010664
<value>manage_DMI_Output_Pkg::manageDMI_Output</value>
1065110665
<value>manage_DMI_Output_Pkg::copyTrackDescription</value>
1065210666
<value>manage_DMI_Output_Pkg::copyGradientElement</value>
1065310667
<value>manage_TextMessages_Pkg::manageTextMessages</value>
1065410668
<value>manage_DMI_Output_Pkg::mapMoRCtoRadio_CS</value>
1065510669
<value>manage_TextMessages_Pkg::findElement</value>
1065610670
<value>ManageModes</value>
10671+
<value>xdebugSupport_Pkg::countBasics</value>
10672+
<value>xdebugSupport_Pkg::packetValidBasics</value>
1065710673
<value>manage_DMI_Output_Pkg::sendDynamic</value>
1065810674
<value>manage_DMI_Output_Pkg::calcDistances</value>
1065910675
<value>ManageLevelAndMode</value>
10660-
<value>Acknowledgement::ManageAck</value>
10661-
<value>Acknowledgement::Position_In_Ack_Area</value>
10676+
<value>xdebugSupport_Pkg::checkOnErrors</value>
10677+
<value>xdebugSupport_Pkg::distanceLastMSG</value>
10678+
<value>xdebugSupport_Pkg::countPacketsMsg</value>
1066210679
<value>EVC</value>
1066310680
<value>manage_DMI_Output_Pkg::copySpeedProfileElement</value>
1066410681
<value>manage_TextMessages_Pkg::checkIfNeeded</value>
1066510682
<value>manage_TextMessages_Pkg::saveStatus</value>
10666-
<value>Acknowledgement::RequestAck</value>
10683+
<value>xdebugSupport_Pkg::setProbes</value>
1066710684
<value>manage_DMI_Input_Pkg::changeLevelByDiver</value>
1066810685
<value>manage_DMI_Output_Pkg::doEntryRequest</value>
1066910686
<value>manage_DMI_Output_Pkg::mapEntryForLevel</value>
10687+
<value>OutputManagement::Output_To_DMI</value>
1067010688
<value>manage_DMI_Input_Pkg::triggerForMA</value>
10689+
<value>packagesSupport_Pkg::getMetaDataElement</value>
1067110690
<value>manage_TextMessages_Pkg::clearStatus</value>
10691+
<value>xdebugSupport_Pkg::dataForLevelTransition</value>
1067210692
<value>manage_DMI_Output_Pkg::sendBrakesToDMI</value>
1067310693
<value>manage_DMI_Output_Pkg::collectDMIPackets</value>
1067410694
<configuration>176</configuration>

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

Lines changed: 138 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6926,6 +6926,30 @@
69266926
<ed:Variable oid="!ed/e9f46/2BE4/2004/56190d401a94"/>
69276927
</pragmas>
69286928
</Variable>
6929+
<Variable name="_L1527">
6930+
<type>
6931+
<NamedType>
6932+
<type>
6933+
<TypeRef name="Level_And_Mode_Types_Pkg::T_Mode_Level"/>
6934+
</type>
6935+
</NamedType>
6936+
</type>
6937+
<pragmas>
6938+
<ed:Variable oid="!ed/e9ecd/6EFA/1E80/561929077555"/>
6939+
</pragmas>
6940+
</Variable>
6941+
<Variable name="_L1528">
6942+
<type>
6943+
<NamedType>
6944+
<type>
6945+
<TypeRef name="M_LEVEL"/>
6946+
</type>
6947+
</NamedType>
6948+
</type>
6949+
<pragmas>
6950+
<ed:Variable oid="!ed/e9ed3/6EFA/1E80/56192918108b"/>
6951+
</pragmas>
6952+
</Variable>
69296953
</locals>
69306954
<data>
69316955
<!-- _L161, _L162 = output_to_TIU_API_Pkg::TIU_OutputIntegration(_L163, _L647, _L166, ... -->
@@ -10919,7 +10943,7 @@
1091910943
</IdExpression>
1092010944
<IdExpression>
1092110945
<path>
10922-
<ConstVarRef name="_L1519"/>
10946+
<ConstVarRef name="_L1528"/>
1092310947
</path>
1092410948
</IdExpression>
1092510949
</callParameters>
@@ -17195,6 +17219,62 @@
1719517219
<ed:Equation oid="!ed/e9f45/2BE4/2004/56190d404ccb"/>
1719617220
</pragmas>
1719717221
</Equation>
17222+
<!-- _L1527 = last 'ML_ModeAndLevel; -->
17223+
<Equation>
17224+
<lefts>
17225+
<VariableRef name="_L1527"/>
17226+
</lefts>
17227+
<right>
17228+
<Last>
17229+
<variable>
17230+
<ConstVarRef name="ML_ModeAndLevel"/>
17231+
</variable>
17232+
</Last>
17233+
</right>
17234+
<pragmas>
17235+
<ed:Equation oid="!ed/e9ecc/6EFA/1E80/561929076a3c"/>
17236+
</pragmas>
17237+
</Equation>
17238+
<!-- _L1528 = _L1527.level; -->
17239+
<Equation>
17240+
<lefts>
17241+
<VariableRef name="_L1528"/>
17242+
</lefts>
17243+
<right>
17244+
<!-- _L1527.level -->
17245+
<PrjOp name="112">
17246+
<flow>
17247+
<IdExpression>
17248+
<path>
17249+
<ConstVarRef name="_L1527"/>
17250+
</path>
17251+
</IdExpression>
17252+
</flow>
17253+
<with>
17254+
<Label name="level"/>
17255+
</with>
17256+
</PrjOp>
17257+
</right>
17258+
<pragmas>
17259+
<ed:Equation oid="!ed/e9ed2/6EFA/1E80/5619291817c8"/>
17260+
</pragmas>
17261+
</Equation>
17262+
<!-- _ = _L1519; -->
17263+
<Equation>
17264+
<lefts>
17265+
<VariableRef name="_"/>
17266+
</lefts>
17267+
<right>
17268+
<IdExpression>
17269+
<path>
17270+
<ConstVarRef name="_L1519"/>
17271+
</path>
17272+
</IdExpression>
17273+
</right>
17274+
<pragmas>
17275+
<ed:Equation oid="!ed/e9ed8/3E28/25C4/56192f922d5d"/>
17276+
</pragmas>
17277+
</Equation>
1719817278
</data>
1719917279
<pragmas>
1720017280
<ed:Operator oid="!ed/a7031/2EE8/4498/54e4904e5281" xmlns="http://www.esterel-technologies.com/ns/scade/pragmas/editor/5">
@@ -23579,26 +23659,26 @@
2357923659
</EquationGE>
2358023660
<EquationGE presentable="!ed/e93b2/3D4/1070/56165dddc85">
2358123661
<position>
23582-
<Point x="3281" y="22013"/>
23662+
<Point x="3577" y="23686"/>
2358323663
</position>
2358423664
<size>
2358523665
<Size width="254" height="508"/>
2358623666
</size>
2358723667
</EquationGE>
2358823668
<EquationGE presentable="!ed/e93b8/3D4/1070/56165df83a5e">
2358923669
<position>
23590-
<Point x="4974" y="21781"/>
23670+
<Point x="5271" y="23453"/>
2359123671
</position>
2359223672
<size>
2359323673
<Size width="974" height="973"/>
2359423674
</size>
2359523675
</EquationGE>
2359623676
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/e93b2/3D4/1070/56165dddc85" dstEquation="!ed/e93b8/3D4/1070/56165df83a5e">
2359723677
<positions>
23598-
<Point x="3535" y="22267"/>
23599-
<Point x="4255" y="22267"/>
23600-
<Point x="4255" y="22267"/>
23601-
<Point x="4974" y="22267"/>
23678+
<Point x="3831" y="23940"/>
23679+
<Point x="4551" y="23940"/>
23680+
<Point x="4551" y="23940"/>
23681+
<Point x="5271" y="23940"/>
2360223682
</positions>
2360323683
</Edge>
2360423684
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/5fa75/2DC5/1BB0/555997131111" dstEquation="!ed/5fa8c/2DC5/1BB0/5559a07135db">
@@ -23609,14 +23689,6 @@
2360923689
<Point x="19050" y="4043"/>
2361023690
</positions>
2361123691
</Edge>
23612-
<Edge leftVarIndex="1" rightExprIndex="13" srcEquation="!ed/e93b8/3D4/1070/56165df83a5e" dstEquation="!ed/5fa75/2DC5/1BB0/555997131111">
23613-
<positions>
23614-
<Point x="5948" y="22267"/>
23615-
<Point x="8043" y="22267"/>
23616-
<Point x="8043" y="21505"/>
23617-
<Point x="10160" y="21505"/>
23618-
</positions>
23619-
</Edge>
2362023692
<Edge leftVarIndex="1" rightExprIndex="12" srcEquation="!ed/244f9e/846/1008/55ed86e52a41" dstEquation="!ed/5fa75/2DC5/1BB0/555997131111">
2362123693
<positions>
2362223694
<Point x="8594" y="20807"/>
@@ -23761,6 +23833,54 @@
2376123833
<Point x="19050" y="16743"/>
2376223834
</positions>
2376323835
</Edge>
23836+
<EquationGE presentable="!ed/e9ecc/6EFA/1E80/561929076a3c">
23837+
<position>
23838+
<Point x="3175" y="21527"/>
23839+
</position>
23840+
<size>
23841+
<Size width="254" height="508"/>
23842+
</size>
23843+
</EquationGE>
23844+
<EquationGE presentable="!ed/e9ed2/6EFA/1E80/5619291817c8">
23845+
<position>
23846+
<Point x="4678" y="21273"/>
23847+
</position>
23848+
<size>
23849+
<Size width="974" height="973"/>
23850+
</size>
23851+
</EquationGE>
23852+
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/e9ecc/6EFA/1E80/561929076a3c" dstEquation="!ed/e9ed2/6EFA/1E80/5619291817c8">
23853+
<positions>
23854+
<Point x="3429" y="21759"/>
23855+
<Point x="4043" y="21759"/>
23856+
<Point x="4043" y="21759"/>
23857+
<Point x="4678" y="21759"/>
23858+
</positions>
23859+
</Edge>
23860+
<Edge leftVarIndex="1" rightExprIndex="13" srcEquation="!ed/e9ed2/6EFA/1E80/5619291817c8" dstEquation="!ed/5fa75/2DC5/1BB0/555997131111">
23861+
<positions>
23862+
<Point x="5652" y="21759"/>
23863+
<Point x="7895" y="21759"/>
23864+
<Point x="7895" y="21505"/>
23865+
<Point x="10160" y="21505"/>
23866+
</positions>
23867+
</Edge>
23868+
<EquationGE presentable="!ed/e9ed8/3E28/25C4/56192f922d5d">
23869+
<position>
23870+
<Point x="6879" y="23728"/>
23871+
</position>
23872+
<size>
23873+
<Size width="508" height="508"/>
23874+
</size>
23875+
</EquationGE>
23876+
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/e93b8/3D4/1070/56165df83a5e" dstEquation="!ed/e9ed8/3E28/25C4/56192f922d5d">
23877+
<positions>
23878+
<Point x="6244" y="23940"/>
23879+
<Point x="6689" y="23940"/>
23880+
<Point x="6689" y="23982"/>
23881+
<Point x="7133" y="23982"/>
23882+
</positions>
23883+
</Edge>
2376423884
</presentationElements>
2376523885
</NetDiagram>
2376623886
<NetDiagram name="diagram_EVC_MSG_Input_Clariications" landscape="true" format="A4 (210 297)" oid="!ed/6acaa/40E/1338/5567369b122a">
@@ -23937,7 +24057,7 @@
2393724057
<Size width="24580" height="2329"/>
2393824058
</size>
2393924059
</ActionGE>
23940-
<IfNodeGE labelWidth="1143" presentable="!ed/101f85/1208/19D0/55a8b22d5b8a">
24060+
<IfNodeGE labelWidth="1080" presentable="!ed/101f85/1208/19D0/55a8b22d5b8a">
2394124061
<position>
2394224062
<Point x="2752" y="6006"/>
2394324063
</position>
@@ -164972,7 +165092,7 @@
164972165092
</NamedType>
164973165093
</type>
164974165094
<value>
164975-
<!-- {compatibleModeAndLevel : false, level : M_LEVEL_Level_0, newLevel : false, Mode ... -->
165095+
<!-- {compatibleModeAndLevel : false, level : M_LEVEL_Level_NTC_specified_by_NID_NTC, ... -->
164976165096
<DataStructOp>
164977165097
<data>
164978165098
<LabelledExpression label="compatibleModeAndLevel">
@@ -164984,7 +165104,7 @@
164984165104
<flow>
164985165105
<IdExpression>
164986165106
<path>
164987-
<ConstVarRef name="M_LEVEL_Level_0"/>
165107+
<ConstVarRef name="M_LEVEL_Level_NTC_specified_by_NID_NTC"/>
164988165108
</path>
164989165109
</IdExpression>
164990165110
</flow>

0 commit comments

Comments
 (0)