Skip to content

Commit

Permalink
Fix #238 (acceleration caluclation in odometry) / Move CoSummit demo …
Browse files Browse the repository at this point in the history 
…videos to folder
  • Loading branch information
@stefan-karg
stefan-karg committed Mar 23, 2015
1 parent 92de26d commit c5ba485
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 61 deletions.
0 demo/StartOfMission.mp4 → demo/CoSummit/StartOfMission.mp4
View file
File renamed without changes.
0 demo/StartOfMission_withLogo.mp4 → demo/CoSummit/StartOfMission_withLogo.mp4
View file
File renamed without changes.
216 changes: 155 additions & 61 deletions ...ade/System/OBU_for_ITEA-Review/PositionSimulation/Testbench_Suite/GeneratePosition.xscade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,30 @@
<ed:Variable oid="!ed/c7c96/65CC/36BC/54f860d73a60"/>
</pragmas>
</Variable>
<Variable name="_L65">
<type>
<NamedType>
<type>
<TypeRef name="real"/>
</type>
</NamedType>
</type>
<pragmas>
<ed:Variable oid="!ed/d0fd0/5D7B/216C/551038b67bb1"/>
</pragmas>
</Variable>
<Variable name="_L66">
<type>
<NamedType>
<type>
<TypeRef name="int"/>
</type>
</NamedType>
</type>
<pragmas>
<ed:Variable oid="!ed/d0fd6/5D7B/216C/551038e922f2"/>
</pragmas>
</Variable>
</locals>
<data>
<StateMachine name="SM1">
Expand Down Expand Up @@ -1497,18 +1521,18 @@
<ed:Equation oid="!ed/2083f/2EE8/4498/54e480346da8"/>
</pragmas>
</Equation>
<!-- _L25 = int _L15; -->
<!-- _L25 = int _L65; -->
<Equation>
<lefts>
<VariableRef name="_L25"/>
</lefts>
<right>
<!-- int _L15 -->
<!-- int _L65 -->
<UnaryOp name="5" operator="int">
<operand>
<IdExpression>
<path>
<ConstVarRef name="_L15"/>
<ConstVarRef name="_L65"/>
</path>
</IdExpression>
</operand>
Expand Down Expand Up @@ -1916,6 +1940,44 @@
<ed:Equation oid="!ed/c7c95/65CC/36BC/54f860d74dd9"/>
</pragmas>
</Equation>
<!-- _L65 = _L15 * _L66; -->
<Equation>
<lefts>
<VariableRef name="_L65"/>
</lefts>
<right>
<!-- _L15 * _L66 -->
<NAryOp name="5" operator="*">
<operands>
<IdExpression>
<path>
<ConstVarRef name="_L15"/>
</path>
</IdExpression>
<IdExpression>
<path>
<ConstVarRef name="_L66"/>
</path>
</IdExpression>
</operands>
</NAryOp>
</right>
<pragmas>
<ed:Equation oid="!ed/d0fcf/5D7B/216C/551038b6799c"/>
</pragmas>
</Equation>
<!-- _L66 = 100; -->
<Equation>
<lefts>
<VariableRef name="_L66"/>
</lefts>
<right>
<ConstValue value="100"/>
</right>
<pragmas>
<ed:Equation oid="!ed/d0fd5/5D7B/216C/551038e9323a"/>
</pragmas>
</Equation>
</data>
<pragmas>
<ed:Operator oid="!ed/3c4a/24FB/6D88/54d8d9c06f39" xmlns="http://www.esterel-technologies.com/ns/scade/pragmas/editor/4">
Expand Down Expand Up @@ -2222,112 +2284,112 @@
</EquationGE>
<EquationGE presentable="!ed/207f7/2EE8/4498/54e47fd261c1">
<position>
<Point x="6668" y="27623"/>
<Point x="6054" y="27665"/>
</position>
<size>
<Size width="1032" height="672"/>
</size>
</EquationGE>
<EquationGE presentable="!ed/207f9/2EE8/4498/54e47fd27ff3">
<position>
<Point x="2688" y="27093"/>
<Point x="2074" y="27136"/>
</position>
<size>
<Size width="1032" height="673"/>
</size>
</EquationGE>
<EquationGE kind="OBJ_LIT" presentable="!ed/207fb/2EE8/4498/54e47fd24f3e">
<position>
<Point x="4445" y="27792"/>
<Point x="3831" y="27834"/>
</position>
<size>
<Size width="169" height="296"/>
</size>
</EquationGE>
<EquationGE presentable="!ed/207fd/2EE8/4498/54e47fd21552">
<position>
<Point x="1693" y="27284"/>
<Point x="1080" y="27326"/>
</position>
<size>
<Size width="254" height="508"/>
</size>
</EquationGE>
<EquationGE kind="OBJ_LIT" presentable="!ed/207ff/2EE8/4498/54e47fd2306a">
<position>
<Point x="5884" y="28131"/>
<Point x="5271" y="28173"/>
</position>
<size>
<Size width="169" height="296"/>
</size>
</EquationGE>
<EquationGE presentable="!ed/20801/2EE8/4498/54e47fd25451">
<position>
<Point x="4974" y="26988"/>
<Point x="4360" y="27030"/>
</position>
<size>
<Size width="1032" height="672"/>
</size>
</EquationGE>
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/207fd/2EE8/4498/54e47fd21552" dstEquation="!ed/207f9/2EE8/4498/54e47fd27ff3">
<positions>
<Point x="1947" y="27538"/>
<Point x="2307" y="27538"/>
<Point x="2307" y="27432"/>
<Point x="2688" y="27432"/>
<Point x="1334" y="27580"/>
<Point x="1693" y="27580"/>
<Point x="1693" y="27474"/>
<Point x="2074" y="27474"/>
</positions>
</Edge>
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/207f9/2EE8/4498/54e47fd27ff3" dstEquation="!ed/20801/2EE8/4498/54e47fd25451">
<positions>
<Point x="3725" y="27432"/>
<Point x="4339" y="27432"/>
<Point x="4339" y="27220"/>
<Point x="4974" y="27220"/>
<Point x="3112" y="27474"/>
<Point x="3725" y="27474"/>
<Point x="3725" y="27263"/>
<Point x="4360" y="27263"/>
</positions>
</Edge>
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/20801/2EE8/4498/54e47fd25451" dstEquation="!ed/207f7/2EE8/4498/54e47fd261c1">
<positions>
<Point x="6011" y="27326"/>
<Point x="6329" y="27326"/>
<Point x="6329" y="27855"/>
<Point x="6668" y="27855"/>
<Point x="5398" y="27369"/>
<Point x="5715" y="27369"/>
<Point x="5715" y="27898"/>
<Point x="6054" y="27898"/>
</positions>
</Edge>
<Edge leftVarIndex="1" rightExprIndex="2" srcEquation="!ed/207fb/2EE8/4498/54e47fd24f3e" dstEquation="!ed/20801/2EE8/4498/54e47fd25451">
<positions>
<Point x="4614" y="27940"/>
<Point x="4784" y="27940"/>
<Point x="4784" y="27432"/>
<Point x="4974" y="27432"/>
<Point x="4001" y="27982"/>
<Point x="4170" y="27982"/>
<Point x="4170" y="27474"/>
<Point x="4360" y="27474"/>
</positions>
</Edge>
<Edge leftVarIndex="1" rightExprIndex="2" srcEquation="!ed/207ff/2EE8/4498/54e47fd2306a" dstEquation="!ed/207f7/2EE8/4498/54e47fd261c1">
<positions>
<Point x="6054" y="28279"/>
<Point x="6350" y="28279"/>
<Point x="6350" y="28067"/>
<Point x="6668" y="28067"/>
<Point x="5440" y="28321"/>
<Point x="5736" y="28321"/>
<Point x="5736" y="28109"/>
<Point x="6054" y="28109"/>
</positions>
</Edge>
<EquationGE presentable="!ed/20803/2EE8/4498/54e47fef2da5">
<position>
<Point x="7895" y="28681"/>
<Point x="7112" y="29316"/>
</position>
<size>
<Size width="254" height="508"/>
</size>
</EquationGE>
<EquationGE kind="OBJ_LIT" presentable="!ed/20827/2EE8/4498/54e480152150">
<position>
<Point x="11642" y="29422"/>
<Point x="11811" y="30586"/>
</position>
<size>
<Size width="169" height="296"/>
</size>
</EquationGE>
<Edge leftVarIndex="1" rightExprIndex="5" srcEquation="!ed/20827/2EE8/4498/54e480152150" dstEquation="!ed/20766/2EE8/4498/54e47e5c5a49">
<positions>
<Point x="11811" y="29570"/>
<Point x="13039" y="29570"/>
<Point x="11980" y="30734"/>
<Point x="13039" y="30734"/>
<Point x="13039" y="28893"/>
<Point x="14266" y="28893"/>
</positions>
Expand Down Expand Up @@ -2382,24 +2444,16 @@
</Edge>
<EquationGE presentable="!ed/a4b05/2EE8/4498/54e481002e36">
<position>
<Point x="8869" y="27623"/>
<Point x="8869" y="27792"/>
</position>
<size>
<Size width="1016" height="656"/>
</size>
</EquationGE>
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/207f7/2EE8/4498/54e47fd261c1" dstEquation="!ed/a4b05/2EE8/4498/54e481002e36">
<positions>
<Point x="7705" y="27961"/>
<Point x="8276" y="27961"/>
<Point x="8276" y="27961"/>
<Point x="8869" y="27961"/>
</positions>
</Edge>
<Edge leftVarIndex="1" rightExprIndex="3" srcEquation="!ed/a4b05/2EE8/4498/54e481002e36" dstEquation="!ed/20766/2EE8/4498/54e47e5c5a49">
<positions>
<Point x="9885" y="27961"/>
<Point x="12065" y="27961"/>
<Point x="9885" y="28131"/>
<Point x="12065" y="28131"/>
<Point x="12065" y="27792"/>
<Point x="14266" y="27792"/>
</positions>
Expand Down Expand Up @@ -2778,60 +2832,100 @@
</Edge>
<EquationGE presentable="!ed/c7c59/65CC/36BC/54f85a716a47">
<position>
<Point x="9165" y="28490"/>
<Point x="8382" y="29125"/>
</position>
<size>
<Size width="1016" height="656"/>
</size>
</EquationGE>
<EquationGE kind="OBJ_LIT" presentable="!ed/c7c69/65CC/36BC/54f85aee1699">
<position>
<Point x="5588" y="28554"/>
<Point x="4805" y="29189"/>
</position>
<size>
<Size width="170" height="296"/>
</size>
</EquationGE>
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/c7c69/65CC/36BC/54f85aee1699" dstEquation="!ed/c7c59/65CC/36BC/54f85a716a47">
<positions>
<Point x="5757" y="28702"/>
<Point x="7451" y="28702"/>
<Point x="7451" y="28702"/>
<Point x="9165" y="28702"/>
<Point x="4974" y="29337"/>
<Point x="6668" y="29337"/>
<Point x="6668" y="29337"/>
<Point x="8382" y="29337"/>
</positions>
</Edge>
<Edge leftVarIndex="1" rightExprIndex="2" srcEquation="!ed/20803/2EE8/4498/54e47fef2da5" dstEquation="!ed/c7c59/65CC/36BC/54f85a716a47">
<positions>
<Point x="8149" y="28935"/>
<Point x="8657" y="28935"/>
<Point x="8657" y="28935"/>
<Point x="9165" y="28935"/>
<Point x="7366" y="29570"/>
<Point x="7874" y="29570"/>
<Point x="7874" y="29570"/>
<Point x="8382" y="29570"/>
</positions>
</Edge>
<EquationGE presentable="!ed/c7c95/65CC/36BC/54f860d74dd9">
<position>
<Point x="10816" y="28490"/>
<Point x="10033" y="29125"/>
</position>
<size>
<Size width="1016" height="657"/>
</size>
</EquationGE>
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/c7c59/65CC/36BC/54f85a716a47" dstEquation="!ed/c7c95/65CC/36BC/54f860d74dd9">
<positions>
<Point x="10181" y="28829"/>
<Point x="10499" y="28829"/>
<Point x="10499" y="28829"/>
<Point x="10816" y="28829"/>
<Point x="9398" y="29464"/>
<Point x="9716" y="29464"/>
<Point x="9716" y="29464"/>
<Point x="10033" y="29464"/>
</positions>
</Edge>
<Edge leftVarIndex="1" rightExprIndex="4" srcEquation="!ed/c7c95/65CC/36BC/54f860d74dd9" dstEquation="!ed/20766/2EE8/4498/54e47e5c5a49">
<positions>
<Point x="11832" y="28829"/>
<Point x="13039" y="28829"/>
<Point x="11049" y="29464"/>
<Point x="13039" y="29464"/>
<Point x="13039" y="28342"/>
<Point x="14266" y="28342"/>
</positions>
</Edge>
<EquationGE presentable="!ed/d0fcf/5D7B/216C/551038b6799c">
<position>
<Point x="7514" y="27792"/>
</position>
<size>
<Size width="1016" height="657"/>
</size>
</EquationGE>
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/207f7/2EE8/4498/54e47fd261c1" dstEquation="!ed/d0fcf/5D7B/216C/551038b6799c">
<positions>
<Point x="7091" y="28004"/>
<Point x="7387" y="28004"/>
<Point x="7387" y="28004"/>
<Point x="7514" y="28004"/>
</positions>
</Edge>
<Edge leftVarIndex="1" rightExprIndex="1" srcEquation="!ed/d0fcf/5D7B/216C/551038b6799c" dstEquation="!ed/a4b05/2EE8/4498/54e481002e36">
<positions>
<Point x="8530" y="28131"/>
<Point x="8700" y="28131"/>
<Point x="8700" y="28131"/>
<Point x="8869" y="28131"/>
</positions>
</Edge>
<EquationGE kind="OBJ_LIT" presentable="!ed/d0fd5/5D7B/216C/551038e9323a">
<position>
<Point x="6625" y="28617"/>
</position>
<size>
<Size width="170" height="297"/>
</size>
</EquationGE>
<Edge leftVarIndex="1" rightExprIndex="2" srcEquation="!ed/d0fd5/5D7B/216C/551038e9323a" dstEquation="!ed/d0fcf/5D7B/216C/551038b6799c">
<positions>
<Point x="6795" y="28766"/>
<Point x="7154" y="28766"/>
<Point x="7154" y="28236"/>
<Point x="7514" y="28236"/>
</positions>
</Edge>
</presentationElements>
</NetDiagram>
</diagrams>
Expand Down

0 comments on commit c5ba485

Please sign in to comment.