Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add initial FlexRay section for fmi-ls-bus #161

Draft
wants to merge 38 commits into
base: main
Choose a base branch
from
Draft

Add initial FlexRay section for fmi-ls-bus #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
2b64c64
Add initial content, operations and header files for FlexRay section
May 13, 2024
5623556
Fix figure-fmu-flexray-delivery-on-boundary-parameter text
May 13, 2024
c5f9d0a
Fixed valid interval definition for dynamic segment
May 14, 2024
97e5117
Remove Iteration argument from FlexRay operations
May 16, 2024
02d041a
Remove iteration argument from FlexRay headers
May 17, 2024
7715a80
Add FlexRay tests
May 24, 2024
62bddd6
Update FlexRay headers
May 24, 2024
4184e58
Fixed FlexRay tests
May 24, 2024
7ef854b
Remove pch.h
May 24, 2024
a59ea93
Update tests and headers for FlexRay
May 24, 2024
a0adadf
Integrate nullptr check
May 24, 2024
999faf4
Refactor tests/headers
May 24, 2024
15fb274
Update tests
May 24, 2024
a7b6b8f
Remove pch.h include
May 24, 2024
0c6ca02
Fixed tests
May 24, 2024
9316760
Fixed tests
May 24, 2024
04717ad
Fixed tests
May 24, 2024
894410b
Fixed tests
May 24, 2024
e57b8ee
Finalize FlexRay tests
May 27, 2024
007baad
Merge branch 'main' into flexray-development
May 27, 2024
890ceff
Add FlexRay files to "Provided C-API" chapter
May 27, 2024
af12b93
Fixing MimeType for FlexRay and FlexRay Configuration operation table
May 27, 2024
f258cbf
Fixing Bus Error operation for FlexRay
May 27, 2024
fbdef84
Add NM Vector Length within Configuration operation
Jun 12, 2024
8092120
Fixed tests
Jun 12, 2024
d395697
Fixed tests again
Jun 12, 2024
a073451
Fixed FlexRay test
Jun 12, 2024
a0dd517
Fixed tests
Jun 12, 2024
3f1a676
Fixed tests
Jun 12, 2024
5f6f40b
Merge branch 'main' into flexray-development
Jun 12, 2024
3ea8f4f
Update branch from master
Jun 12, 2024
d4c7f6e
Merge branch 'main' into flexray-development
Jun 12, 2024
1447aca
Fixed operation length
Jun 12, 2024
6d9b599
Fixed TxDynamicFirst formula
Jun 13, 2024
c8cbfe9
Fixed Dynamic_First formula
Jun 14, 2024
8d8f220
Add more precise specification of cancel operations description
Aug 12, 2024
2d37351
Fix startup seq. diagrams
Aug 30, 2024
b544be3
Add FMI3_LS_BUS_FLEXRAY_GET_GLOBAL_TIME to FlexRay util header
Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion docs/2____common_concepts.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ The following header files are provided:
These header file applies to all supported bus types of the layered standard.
* https://github.com/modelica/fmi-ls-bus/blob/main/headers/fmi3LsBusCan.h[fmi3LsBusCan.h] provides macros, types and structures of Bus Operations explicit for CAN, CAN FD and CAN XL.
Primarily, structures are included here that allow the Bus Operations specified by the layered standard to be easily created and used.
* https://github.com/modelica/fmi-ls-bus/blob/main/headers/fmi3LsBusFlexRay.h[fmi3LsBusFlexRay.h] provides macros, types and structures of Bus Operations explicit for FlexRay.
Primarily, structures are included here that allow the Bus Operations specified by the layered standard to be easily created and used.
* https://github.com/modelica/fmi-ls-bus/blob/main/headers/fmi3LsBusUtil.h[fmi3LsBusUtil.h] provides common utility macros and structures for all supported bus types.
* https://github.com/modelica/fmi-ls-bus/blob/main/headers/fmi3LsBusUtilCan.h[fmi3LsBusUtilCan.h] provides CAN, CAN FD and CAN XL explicit utility macros.

* https://github.com/modelica/fmi-ls-bus/blob/main/headers/fmi3LsBusUtilFlexRay.h[fmi3LsBusUtilFlexRay.h] provides FlexRay explicit utility macros.
975 changes: 973 additions & 2 deletions docs/4_4_3_flexray.adoc
View file
Open in desktop

Large diffs are not rendered by default.

98 changes: 98 additions & 0 deletions docs/images/flexray_dynamic_segment_bus_communication_points.drawio
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<mxfile host="app.diagrams.net" modified="2024-05-13T14:49:08.709Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 Edg/124.0.0.0" etag="-It4LfkwGID5A145doOS" version="24.4.0" type="device">
<diagram name="Page-1" id="FQamRQtbCovPPlWkLl-8">
<mxGraphModel dx="1305" dy="262" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
<root>
<mxCell id="0" />
<mxCell id="1" parent="0" />
<mxCell id="Iu5T4A_Y-ULl8Hdi1_dx-2" value="&lt;br&gt;&lt;span style=&quot;color: rgb(0, 0, 0); font-family: Helvetica; font-size: 6px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: center; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; white-space: normal; background-color: rgb(251, 251, 251); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline !important;&quot;&gt;Minislot ActionPoint Offset&lt;/span&gt;&lt;div&gt;&lt;br/&gt;&lt;/div&gt;" style="endArrow=baseDash;startArrow=baseDash;html=1;rounded=0;fontSize=6;spacingTop=4;startFill=0;endFill=0;" parent="1" edge="1">
<mxGeometry x="0.0021" width="50" height="50" relative="1" as="geometry">
<mxPoint x="-10" y="512" as="sourcePoint" />
<mxPoint x="100" y="512" as="targetPoint" />
<mxPoint as="offset" />
</mxGeometry>
</mxCell>
<mxCell id="EbGOq2tml0lDP4HWyABb-1" value="Static segment" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
<mxGeometry x="79.17" y="460" width="240" height="20" as="geometry" />
</mxCell>
<mxCell id="EbGOq2tml0lDP4HWyABb-2" value="1" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
<mxGeometry x="79.17" y="480" width="80" height="20" as="geometry" />
</mxCell>
<mxCell id="EbGOq2tml0lDP4HWyABb-5" value="Cycle" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
<mxGeometry x="79.17" y="440" width="360.83" height="20" as="geometry" />
</mxCell>
<mxCell id="EbGOq2tml0lDP4HWyABb-11" value="Dynamic segment" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
<mxGeometry x="-10" y="460" width="400" height="20" as="geometry" />
</mxCell>
<mxCell id="EbGOq2tml0lDP4HWyABb-12" value="Minislot m" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
<mxGeometry x="-10" y="480" width="210" height="20" as="geometry" />
</mxCell>
<mxCell id="EbGOq2tml0lDP4HWyABb-13" value="Minislot m + 1" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
<mxGeometry x="198.34" y="480" width="161.66" height="20" as="geometry" />
</mxCell>
<mxCell id="EbGOq2tml0lDP4HWyABb-14" value="..." style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
<mxGeometry x="360" y="480" width="30" height="20" as="geometry" />
</mxCell>
<mxCell id="EbGOq2tml0lDP4HWyABb-15" value="Cycle" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
<mxGeometry x="-10" y="440" width="450" height="20" as="geometry" />
</mxCell>
<mxCell id="EbGOq2tml0lDP4HWyABb-16" value="Last valid point in time to provide Transmit operation" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=8;" parent="1" vertex="1">
<mxGeometry x="65" y="566" width="72.09" height="30" as="geometry" />
</mxCell>
<mxCell id="EbGOq2tml0lDP4HWyABb-17" value="" style="shape=flexArrow;endArrow=classic;html=1;rounded=0;fillColor=default;" parent="1" edge="1">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="100.65000000000003" y="563" as="sourcePoint" />
<mxPoint x="100.65000000000003" y="523" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="EbGOq2tml0lDP4HWyABb-18" value="" style="shape=flexArrow;endArrow=classic;html=1;rounded=0;fillColor=#ffe6cc;strokeColor=#d79b00;" parent="1" edge="1">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="290.61" y="563" as="sourcePoint" />
<mxPoint x="290.61" y="523" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="EbGOq2tml0lDP4HWyABb-19" value="Consume Transmit operation*" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=8;" parent="1" vertex="1">
<mxGeometry x="264.35" y="557" width="122.65" height="30" as="geometry" />
</mxCell>
<mxCell id="EbGOq2tml0lDP4HWyABb-20" value="..." style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#82b366;spacingLeft=0;" parent="1" vertex="1">
<mxGeometry x="391" y="461" width="49" height="39" as="geometry" />
</mxCell>
<mxCell id="Iu5T4A_Y-ULl8Hdi1_dx-4" value="Transmission&lt;br&gt;Time" style="endArrow=baseDash;startArrow=baseDash;html=1;rounded=0;fontSize=6;spacingTop=-2;startFill=0;endFill=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" edge="1">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="101.695" y="512" as="sourcePoint" />
<mxPoint x="291" y="512" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="Iu5T4A_Y-ULl8Hdi1_dx-5" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.x;fillColor=#ffe6cc;strokeColor=#d79b00;" parent="1" vertex="1">
<mxGeometry x="288" y="497" width="5" height="5" as="geometry" />
</mxCell>
<mxCell id="92ViWbQW8opbl-_su2DC-1" value="First valid point in time to provide Transmit operation" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=8;" parent="1" vertex="1">
<mxGeometry x="-45" y="566" width="72.09" height="30" as="geometry" />
</mxCell>
<mxCell id="92ViWbQW8opbl-_su2DC-2" value="" style="shape=flexArrow;endArrow=classic;html=1;rounded=0;fillColor=default;" parent="1" edge="1">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="-9.349999999999966" y="563" as="sourcePoint" />
<mxPoint x="-9.349999999999966" y="523" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="92ViWbQW8opbl-_su2DC-3" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.x;fillColor=#e51400;fontColor=#ffffff;strokeColor=#B20000;" parent="1" vertex="1">
<mxGeometry x="98" y="497" width="5" height="5" as="geometry" />
</mxCell>
<mxCell id="92ViWbQW8opbl-_su2DC-4" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.x;fillColor=#e51400;fontColor=#ffffff;strokeColor=#B20000;" parent="1" vertex="1">
<mxGeometry x="-12" y="497" width="5" height="5" as="geometry" />
</mxCell>
<mxCell id="4myw0FARVqcL0h5x4K7X-1" value="*) Depending on&amp;nbsp;&lt;i style=&quot;font-size: 6px;&quot;&gt;org.fmi_standard.fmi_ls_bus.FlexRay_DeliveryOnBoundary&lt;/i&gt; parameter" style="text;html=1;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=6;" vertex="1" parent="1">
<mxGeometry x="-41" y="601" width="321" height="10" as="geometry" />
</mxCell>
<mxCell id="4myw0FARVqcL0h5x4K7X-2" value="" style="verticalLabelPosition=bottom;verticalAlign=top;html=1;shape=mxgraph.basic.x;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
<mxGeometry x="357.4" y="497" width="5" height="5" as="geometry" />
</mxCell>
<mxCell id="4myw0FARVqcL0h5x4K7X-3" value="" style="shape=flexArrow;endArrow=classic;html=1;rounded=0;fillColor=#d5e8d4;strokeColor=#82b366;" edge="1" parent="1">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="360.03000000000003" y="563" as="sourcePoint" />
<mxPoint x="360.03000000000003" y="523" as="targetPoint" />
</mxGeometry>
</mxCell>
</root>
</mxGraphModel>
</diagram>
</mxfile>
3 changes: 3 additions & 0 deletions docs/images/flexray_dynamic_segment_bus_communication_points.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading