Skip to content

Commit 2a6cdc3

Browse files
T12zT12z
committed
OBU/SDM: Odometry promotion v_int -> v_odo_int
(and adaptions to internal testbench due to external changes)
1 parent 10991f6 commit 2a6cdc3

File tree

6 files changed

+3293
-905
lines changed

6 files changed

+3293
-905
lines changed

‎model/Scade/System/ObuFunctions/SpeedSupervison/SDM_TargetLimits/TargetLimits.xscade‎

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -12687,16 +12687,16 @@
1268712687
<positions>
1268812688
<Point x="15505" y="7329"/>
1268912689
<Point x="16007" y="7329"/>
12690-
<Point x="16007" y="7355"/>
12691-
<Point x="16536" y="7355"/>
12690+
<Point x="16007" y="7329"/>
12691+
<Point x="16536" y="7329"/>
1269212692
</positions>
1269312693
</Edge>
1269412694
<Edge leftVarIndex="1" rightExprIndex="6" srcEquation="!ed/1bc0d/740/C48/54f7701f3e5d" dstEquation="!ed/d81c5/67C0/1590/54ee0acb6c52">
1269512695
<positions>
1269612696
<Point x="15505" y="7858"/>
1269712697
<Point x="16007" y="7858"/>
12698-
<Point x="16007" y="7832"/>
12699-
<Point x="16536" y="7832"/>
12698+
<Point x="16007" y="7858"/>
12699+
<Point x="16536" y="7858"/>
1270012700
</positions>
1270112701
</Edge>
1270212702
<EquationGE presentable="!ed/1bc13/740/C48/54f77042210f">
@@ -26069,7 +26069,7 @@
2606926069
<type>
2607026070
<NamedType>
2607126071
<type>
26072-
<TypeRef name="Obu_BasicTypes_Pkg::V_internal_Type"/>
26072+
<TypeRef name="Obu_BasicTypes_Pkg::V_odometry_Type"/>
2607326073
</type>
2607426074
</NamedType>
2607526075
</type>
@@ -26105,7 +26105,7 @@
2610526105
<type>
2610626106
<NamedType>
2610726107
<type>
26108-
<TypeRef name="Obu_BasicTypes_Pkg::V_internal_Type"/>
26108+
<TypeRef name="Obu_BasicTypes_Pkg::V_odometry_Type"/>
2610926109
</type>
2611026110
</NamedType>
2611126111
</type>
@@ -26117,7 +26117,7 @@
2611726117
<type>
2611826118
<NamedType>
2611926119
<type>
26120-
<TypeRef name="Obu_BasicTypes_Pkg::V_internal_Type"/>
26120+
<TypeRef name="Obu_BasicTypes_Pkg::V_odometry_Type"/>
2612126121
</type>
2612226122
</NamedType>
2612326123
</type>
@@ -27966,18 +27966,18 @@
2796627966
<ed:Equation oid="!ed/73357/26E6/1E1C/55e736205177"/>
2796727967
</pragmas>
2796827968
</Equation>
27969-
<!-- _L147 = SDM_Types_Pkg::TransformV_intToV_real(_L93); -->
27969+
<!-- _L147 = SDM_Types_Pkg::TransformV_odoToV_real(_L93); -->
2797027970
<Equation>
2797127971
<lefts>
2797227972
<VariableRef name="_L147"/>
2797327973
</lefts>
2797427974
<right>
27975-
<!-- SDM_Types_Pkg::TransformV_intToV_real(_L93) -->
27975+
<!-- SDM_Types_Pkg::TransformV_odoToV_real(_L93) -->
2797627976
<CallExpression>
2797727977
<operator>
27978-
<OpCall name="2">
27978+
<OpCall name="3">
2797927979
<operator>
27980-
<OperatorRef name="SDM_Types_Pkg::TransformV_intToV_real"/>
27980+
<OperatorRef name="SDM_Types_Pkg::TransformV_odoToV_real"/>
2798127981
</operator>
2798227982
</OpCall>
2798327983
</operator>
@@ -27994,18 +27994,18 @@
2799427994
<ed:Equation oid="!ed/73369/26E6/1E1C/55e7368a5055"/>
2799527995
</pragmas>
2799627996
</Equation>
27997-
<!-- _L148 = SDM_Types_Pkg::TransformV_intToV_real(_L97); -->
27997+
<!-- _L148 = SDM_Types_Pkg::TransformV_odoToV_real(_L97); -->
2799827998
<Equation>
2799927999
<lefts>
2800028000
<VariableRef name="_L148"/>
2800128001
</lefts>
2800228002
<right>
28003-
<!-- SDM_Types_Pkg::TransformV_intToV_real(_L97) -->
28003+
<!-- SDM_Types_Pkg::TransformV_odoToV_real(_L97) -->
2800428004
<CallExpression>
2800528005
<operator>
28006-
<OpCall name="3">
28006+
<OpCall name="2">
2800728007
<operator>
28008-
<OperatorRef name="SDM_Types_Pkg::TransformV_intToV_real"/>
28008+
<OperatorRef name="SDM_Types_Pkg::TransformV_odoToV_real"/>
2800928009
</operator>
2801028010
</OpCall>
2801128011
</operator>
@@ -28022,18 +28022,18 @@
2802228022
<ed:Equation oid="!ed/73371/26E6/1E1C/55e7369029ff"/>
2802328023
</pragmas>
2802428024
</Equation>
28025-
<!-- _L149 = SDM_Types_Pkg::TransformV_intToV_real(_L92); -->
28025+
<!-- _L149 = SDM_Types_Pkg::TransformV_odoToV_real(_L92); -->
2802628026
<Equation>
2802728027
<lefts>
2802828028
<VariableRef name="_L149"/>
2802928029
</lefts>
2803028030
<right>
28031-
<!-- SDM_Types_Pkg::TransformV_intToV_real(_L92) -->
28031+
<!-- SDM_Types_Pkg::TransformV_odoToV_real(_L92) -->
2803228032
<CallExpression>
2803328033
<operator>
28034-
<OpCall name="4">
28034+
<OpCall name="1">
2803528035
<operator>
28036-
<OperatorRef name="SDM_Types_Pkg::TransformV_intToV_real"/>
28036+
<OperatorRef name="SDM_Types_Pkg::TransformV_odoToV_real"/>
2803728037
</operator>
2803828038
</OpCall>
2803928039
</operator>
@@ -29172,30 +29172,6 @@
2917229172
<Size width="1773" height="661"/>
2917329173
</size>
2917429174
</EquationGE>
29175-
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/c9241/2F67/340/55b09ee3747" dstEquation="!ed/73369/26E6/1E1C/55e7368a5055">
29176-
<positions>
29177-
<Point x="4868" y="7699"/>
29178-
<Point x="5239" y="7699"/>
29179-
<Point x="5239" y="7699"/>
29180-
<Point x="5371" y="7699"/>
29181-
</positions>
29182-
</Edge>
29183-
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/73369/26E6/1E1C/55e7368a5055" dstEquation="!ed/c923c/2F67/340/55b09ee323ca">
29184-
<positions>
29185-
<Point x="7144" y="7699"/>
29186-
<Point x="18362" y="7699"/>
29187-
<Point x="18362" y="7699"/>
29188-
<Point x="29713" y="7699"/>
29189-
</positions>
29190-
</Edge>
29191-
<Edge leftVarIndex="1" rightExprIndex="3" srcEquation="!ed/73369/26E6/1E1C/55e7368a5055" dstEquation="!ed/c9e96/2F67/340/55b0f7a639e9">
29192-
<positions>
29193-
<Point x="7144" y="7699"/>
29194-
<Point x="27649" y="7699"/>
29195-
<Point x="27649" y="4948"/>
29196-
<Point x="28072" y="4948"/>
29197-
</positions>
29198-
</Edge>
2919929175
<EquationGE presentable="!ed/73371/26E6/1E1C/55e7369029ff">
2920029176
<position>
2920129177
<Point x="5371" y="6535"/>
@@ -29204,22 +29180,6 @@
2920429180
<Size width="1773" height="661"/>
2920529181
</size>
2920629182
</EquationGE>
29207-
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/c9249/2F67/340/55b09ee31c27" dstEquation="!ed/73371/26E6/1E1C/55e7369029ff">
29208-
<positions>
29209-
<Point x="4868" y="6879"/>
29210-
<Point x="5292" y="6879"/>
29211-
<Point x="5292" y="6879"/>
29212-
<Point x="5371" y="6879"/>
29213-
</positions>
29214-
</Edge>
29215-
<Edge leftVarIndex="1" rightExprIndex="2" srcEquation="!ed/73371/26E6/1E1C/55e7369029ff" dstEquation="!ed/c9247/2F67/340/55b09ee35bf0">
29216-
<positions>
29217-
<Point x="7144" y="6879"/>
29218-
<Point x="8546" y="6879"/>
29219-
<Point x="8546" y="6588"/>
29220-
<Point x="10319" y="6588"/>
29221-
</positions>
29222-
</Edge>
2922329183
<EquationGE presentable="!ed/73379/26E6/1E1C/55e7369231c3">
2922429184
<position>
2922529185
<Point x="5371" y="5715"/>
@@ -29228,22 +29188,6 @@
2922829188
<Size width="1773" height="662"/>
2922929189
</size>
2923029190
</EquationGE>
29231-
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/c923d/2F67/340/55b09ee32d6b" dstEquation="!ed/73379/26E6/1E1C/55e7369231c3">
29232-
<positions>
29233-
<Point x="4868" y="6059"/>
29234-
<Point x="5345" y="6059"/>
29235-
<Point x="5345" y="6059"/>
29236-
<Point x="5371" y="6059"/>
29237-
</positions>
29238-
</Edge>
29239-
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/73379/26E6/1E1C/55e7369231c3" dstEquation="!ed/c9247/2F67/340/55b09ee35bf0">
29240-
<positions>
29241-
<Point x="7144" y="6059"/>
29242-
<Point x="8546" y="6059"/>
29243-
<Point x="8546" y="6350"/>
29244-
<Point x="10319" y="6350"/>
29245-
</positions>
29246-
</Edge>
2924729191
<EquationGE kind="OBJ_LIT" presentable="!ed/73dca/14F0/2224/55e85a3564a3">
2924829192
<position>
2924929193
<Point x="16801" y="14843"/>
@@ -29347,6 +29291,62 @@
2934729291
<Point x="21220" y="14129"/>
2934829292
</positions>
2934929293
</Edge>
29294+
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/73379/26E6/1E1C/55e7369231c3" dstEquation="!ed/c9247/2F67/340/55b09ee35bf0">
29295+
<positions>
29296+
<Point x="7144" y="6059"/>
29297+
<Point x="8546" y="6059"/>
29298+
<Point x="8546" y="6350"/>
29299+
<Point x="10319" y="6350"/>
29300+
</positions>
29301+
</Edge>
29302+
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/c923d/2F67/340/55b09ee32d6b" dstEquation="!ed/73379/26E6/1E1C/55e7369231c3">
29303+
<positions>
29304+
<Point x="4868" y="6059"/>
29305+
<Point x="5345" y="6059"/>
29306+
<Point x="5345" y="6059"/>
29307+
<Point x="5371" y="6059"/>
29308+
</positions>
29309+
</Edge>
29310+
<Edge leftVarIndex="1" rightExprIndex="2" srcEquation="!ed/73371/26E6/1E1C/55e7369029ff" dstEquation="!ed/c9247/2F67/340/55b09ee35bf0">
29311+
<positions>
29312+
<Point x="7144" y="6879"/>
29313+
<Point x="8546" y="6879"/>
29314+
<Point x="8546" y="6588"/>
29315+
<Point x="10319" y="6588"/>
29316+
</positions>
29317+
</Edge>
29318+
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/c9249/2F67/340/55b09ee31c27" dstEquation="!ed/73371/26E6/1E1C/55e7369029ff">
29319+
<positions>
29320+
<Point x="4868" y="6879"/>
29321+
<Point x="5292" y="6879"/>
29322+
<Point x="5292" y="6879"/>
29323+
<Point x="5371" y="6879"/>
29324+
</positions>
29325+
</Edge>
29326+
<Edge leftVarIndex="1" rightExprIndex="3" srcEquation="!ed/73369/26E6/1E1C/55e7368a5055" dstEquation="!ed/c9e96/2F67/340/55b0f7a639e9">
29327+
<positions>
29328+
<Point x="7144" y="7699"/>
29329+
<Point x="27649" y="7699"/>
29330+
<Point x="27649" y="4948"/>
29331+
<Point x="28072" y="4948"/>
29332+
</positions>
29333+
</Edge>
29334+
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/73369/26E6/1E1C/55e7368a5055" dstEquation="!ed/c923c/2F67/340/55b09ee323ca">
29335+
<positions>
29336+
<Point x="7144" y="7699"/>
29337+
<Point x="18362" y="7699"/>
29338+
<Point x="18362" y="7699"/>
29339+
<Point x="29713" y="7699"/>
29340+
</positions>
29341+
</Edge>
29342+
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/c9241/2F67/340/55b09ee3747" dstEquation="!ed/73369/26E6/1E1C/55e7368a5055">
29343+
<positions>
29344+
<Point x="4868" y="7699"/>
29345+
<Point x="5239" y="7699"/>
29346+
<Point x="5239" y="7699"/>
29347+
<Point x="5371" y="7699"/>
29348+
</positions>
29349+
</Edge>
2935029350
</presentationElements>
2935129351
</NetDiagram>
2935229352
</diagrams>
@@ -34040,8 +34040,8 @@
3404034040
</Edge>
3404134041
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/73de0/14F0/2224/55e85f197649" dstEquation="!ed/b04d7/7F65/C24/55ca2eae100a">
3404234042
<positions>
34043-
<Point x="25744" y="12012"/>
34044-
<Point x="27887" y="12012"/>
34043+
<Point x="25770" y="12039"/>
34044+
<Point x="27887" y="12039"/>
3404534045
<Point x="27887" y="12118"/>
3404634046
</positions>
3404734047
</Edge>
@@ -34065,8 +34065,8 @@
3406534065
<positions>
3406634066
<Point x="24289" y="12674"/>
3406734067
<Point x="24633" y="12674"/>
34068-
<Point x="24633" y="12224"/>
34069-
<Point x="24977" y="12224"/>
34068+
<Point x="24633" y="12250"/>
34069+
<Point x="24977" y="12250"/>
3407034070
</positions>
3407134071
</Edge>
3407234072
</presentationElements>
@@ -40052,8 +40052,8 @@
4005240052
<positions>
4005340053
<Point x="11853" y="8096"/>
4005440054
<Point x="12144" y="8096"/>
40055-
<Point x="12144" y="8070"/>
40056-
<Point x="12435" y="8070"/>
40055+
<Point x="12144" y="8096"/>
40056+
<Point x="12435" y="8096"/>
4005740057
</positions>
4005840058
</Edge>
4005940059
<Edge leftVarIndex="1" rightExprIndex="5" srcEquation="!ed/1c1b0/370E/1BC8/54f5c9151da0" dstEquation="!ed/1c194/370E/1BC8/54f5c91510c3">
@@ -40741,8 +40741,8 @@
4074140741
<positions>
4074240742
<Point x="27623" y="9763"/>
4074340743
<Point x="27887" y="9763"/>
40744-
<Point x="27887" y="9737"/>
40745-
<Point x="28205" y="9737"/>
40744+
<Point x="27887" y="9763"/>
40745+
<Point x="28205" y="9763"/>
4074640746
</positions>
4074740747
</Edge>
4074840748
<Edge leftVarIndex="1" rightExprIndex="9" srcEquation="!ed/c9aa7/2F67/340/55b0dd6b373b" dstEquation="!ed/b05db/7F65/C24/55cb40d12f51">

‎model/Scade/System/ObuFunctions/SpeedSupervison/SDM_Types/SDM_TYpes_Pkg.xscade‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14055,6 +14055,7 @@
1405514055
</Operator>
1405614056
<Operator name="getMRSFromMRSP" href="getMRSFromMRSP.xscade"/>
1405714057
<Operator name="searchMRSP" href="searchMRSP.xscade"/>
14058+
<Operator name="TransformV_odoToV_real" href="TransformV_odoToV_real.xscade"/>
1405814059
</declarations>
1405914060
<pragmas>
1406014061
<ed:Package oid="!ed/41f70/355F/F90/54bd04f930d3" xmlns="http://www.esterel-technologies.com/ns/scade/pragmas/editor/5">

‎model/Scade/System/ObuFunctions/SpeedSupervison/SDM_Types/SDM_Types.etp‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Project id="1" oid_count="153" defaultConfiguration="21">
2+
<Project id="1" oid_count="157" defaultConfiguration="21">
33
<props>
44
<Prop id="10" name="@STUDIO:PRODUCT">
55
<value>SC</value>
@@ -355,6 +355,13 @@
355355
</Prop>
356356
</props>
357357
</FileRef>
358+
<FileRef id="157" persistAs="TransformV_odoToV_real.xscade">
359+
<props>
360+
<Prop id="156" name="@SCADE:NONROOT">
361+
<value>true</value>
362+
</Prop>
363+
</props>
364+
</FileRef>
358365
</elements>
359366
</Folder>
360367
<FileRef id="106" persistAs="SDM_TYpes_Pkg.xscade"/>

0 commit comments

Comments
 (0)