Skip to content

Commit

Permalink
small updates for system-4.2.arxml
Browse files Browse the repository at this point in the history 
- use the XSD for AUTOSAR 20.11
- some formatting fixes

Signed-off-by: Andreas Lauser <andreas.lauser@mbition.io>
Signed-off-by: Oliver Kopp <oliver.kopp@mbition.io>
  • Loading branch information
@andlaus
andlaus committed Aug 1, 2022
1 parent 6c5073f commit 5a6e3ae
Showing 1 changed file with 61 additions and 25 deletions.
86 changes: 61 additions & 25 deletions tests/files/arxml/system-4.2.arxml
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<AUTOSAR xsi:schemaLocation="http://autosar.org/schema/r4.0 AUTOSAR_00046.xsd" xmlns="http://autosar.org/schema/r4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<?xml version="1.0" encoding="UTF-8"?>
<AUTOSAR xmlns="http://autosar.org/schema/r4.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://autosar.org/schema/r4.0 AUTOSAR_00046.xsd">
<AR-PACKAGES>
<!-- /ECU -->
<AR-PACKAGE UUID="b6ca6b6954244c4daac08a71f13b290f">
Expand All @@ -9,8 +9,8 @@
<ECU-INSTANCE UUID="9a95054947d84c81b38a57300fd97b02">
<SHORT-NAME>DJ</SHORT-NAME>
<ASSOCIATED-COM-I-PDU-GROUP-REFS>
<ASSOCIATED-COM-I-PDU-GROUP-REF DEST="I-SIGNAL-I-PDU-GROUP">/PDU_GROUPS/RX/DJ</ASSOCIATED-COM-I-PDU-GROUP-REF>
<ASSOCIATED-COM-I-PDU-GROUP-REF DEST="I-SIGNAL-I-PDU-GROUP">/PDU_GROUPS/TX/DJ</ASSOCIATED-COM-I-PDU-GROUP-REF>
<ASSOCIATED-COM-I-PDU-GROUP-REF DEST="I-SIGNAL-I-PDU-GROUP">/PDU_GROUPS/RX/DJ</ASSOCIATED-COM-I-PDU-GROUP-REF>
<ASSOCIATED-COM-I-PDU-GROUP-REF DEST="I-SIGNAL-I-PDU-GROUP">/PDU_GROUPS/TX/DJ</ASSOCIATED-COM-I-PDU-GROUP-REF>
</ASSOCIATED-COM-I-PDU-GROUP-REFS>
<COMM-CONTROLLERS>
<!-- /ECU/DJ/Observe -->
Expand All @@ -26,8 +26,8 @@
<L-2 L="FOR-ALL">Rhythm is a Dancer!</L-2>
</DESC>
<ASSOCIATED-COM-I-PDU-GROUP-REFS>
<ASSOCIATED-COM-I-PDU-GROUP-REF DEST="I-SIGNAL-I-PDU-GROUP">/PDU_GROUPS/RX/Dancer</ASSOCIATED-COM-I-PDU-GROUP-REF>
<ASSOCIATED-COM-I-PDU-GROUP-REF DEST="I-SIGNAL-I-PDU-GROUP">/PDU_GROUPS/TX/Dancer</ASSOCIATED-COM-I-PDU-GROUP-REF>
<ASSOCIATED-COM-I-PDU-GROUP-REF DEST="I-SIGNAL-I-PDU-GROUP">/PDU_GROUPS/RX/Dancer</ASSOCIATED-COM-I-PDU-GROUP-REF>
<ASSOCIATED-COM-I-PDU-GROUP-REF DEST="I-SIGNAL-I-PDU-GROUP">/PDU_GROUPS/TX/Dancer</ASSOCIATED-COM-I-PDU-GROUP-REF>
</ASSOCIATED-COM-I-PDU-GROUP-REFS>
<COMM-CONTROLLERS>
<!-- /ECU/Dancer/Observe -->
Expand Down Expand Up @@ -676,7 +676,7 @@
<SHORT-NAME>Decepticons</SHORT-NAME>
<TRANSFORMATION-TECHNOLOGYS>
<!-- /Transformers/Decepticons/Starscream -->
<TRANSFORMATION-TECHNOLOGY UUID="d53f0988652c4f49b57cf84d1299da9d">
<TRANSFORMATION-TECHNOLOGY UUID="d53f0988652c4f49b57cf84d1299da9d">
<SHORT-NAME>Starscream</SHORT-NAME>
<PROTOCOL>E2E</PROTOCOL>
<TRANSFORMATION-DESCRIPTIONS>
Expand All @@ -686,7 +686,7 @@
</TRANSFORMATION-DESCRIPTIONS>
</TRANSFORMATION-TECHNOLOGY>
<!-- /Transformers/Decepticons/Galvatron -->
<TRANSFORMATION-TECHNOLOGY UUID="daf1a29f227943e2bf733d6eabff5da6">
<TRANSFORMATION-TECHNOLOGY UUID="daf1a29f227943e2bf733d6eabff5da6">
<SHORT-NAME>Galvatron</SHORT-NAME>
<PROTOCOL>E2E</PROTOCOL>
<TRANSFORMATION-DESCRIPTIONS>
Expand Down Expand Up @@ -920,14 +920,22 @@
<TRANSMISSION-MODE-DECLARATION>
<TRANSMISSION-MODE-FALSE-TIMING>
<CYCLIC-TIMING>
<TIME-OFFSET><VALUE>0</VALUE></TIME-OFFSET>
<TIME-PERIOD><VALUE>0.1</VALUE></TIME-PERIOD>
<TIME-OFFSET>
<VALUE>0</VALUE>
</TIME-OFFSET>
<TIME-PERIOD>
<VALUE>0.1</VALUE>
</TIME-PERIOD>
</CYCLIC-TIMING>
</TRANSMISSION-MODE-FALSE-TIMING>
<TRANSMISSION-MODE-TRUE-TIMING>
<CYCLIC-TIMING>
<TIME-OFFSET><VALUE>0</VALUE></TIME-OFFSET>
<TIME-PERIOD><VALUE>0.2</VALUE></TIME-PERIOD>
<TIME-OFFSET>
<VALUE>0</VALUE>
</TIME-OFFSET>
<TIME-PERIOD>
<VALUE>0.2</VALUE>
</TIME-PERIOD>
</CYCLIC-TIMING>
</TRANSMISSION-MODE-TRUE-TIMING>
</TRANSMISSION-MODE-DECLARATION>
Expand Down Expand Up @@ -1120,17 +1128,23 @@
<COMPU-SCALE>
<LOWER-LIMIT>0</LOWER-LIMIT>
<UPPER-LIMIT>0</UPPER-LIMIT>
<COMPU-CONST><VT>SELECT_HELLO</VT></COMPU-CONST>
<COMPU-CONST>
<VT>SELECT_HELLO</VT>
</COMPU-CONST>
</COMPU-SCALE>
<COMPU-SCALE>
<LOWER-LIMIT>1</LOWER-LIMIT>
<UPPER-LIMIT>1</UPPER-LIMIT>
<COMPU-CONST><VT>SELECT_WORLD</VT></COMPU-CONST>
<COMPU-CONST>
<VT>SELECT_WORLD</VT>
</COMPU-CONST>
</COMPU-SCALE>
<COMPU-SCALE>
<LOWER-LIMIT>7</LOWER-LIMIT>
<UPPER-LIMIT>7</UPPER-LIMIT>
<COMPU-CONST><VT>INVALID_SELECTION</VT></COMPU-CONST>
<COMPU-CONST>
<VT>INVALID_SELECTION</VT>
</COMPU-CONST>
</COMPU-SCALE>
</COMPU-SCALES>
</COMPU-INTERNAL-TO-PHYS>
Expand All @@ -1145,8 +1159,13 @@
<LOWER-LIMIT>0</LOWER-LIMIT>
<UPPER-LIMIT>4</UPPER-LIMIT>
<COMPU-RATIONAL-COEFFS>
<COMPU-NUMERATOR><V>0</V><V>10</V></COMPU-NUMERATOR>
<COMPU-DENOMINATOR><V>2</V></COMPU-DENOMINATOR>
<COMPU-NUMERATOR>
<V>0</V>
<V>10</V>
</COMPU-NUMERATOR>
<COMPU-DENOMINATOR>
<V>2</V>
</COMPU-DENOMINATOR>
</COMPU-RATIONAL-COEFFS>
</COMPU-SCALE>
</COMPU-SCALES>
Expand All @@ -1166,12 +1185,16 @@
</DESC>
<LOWER-LIMIT>1</LOWER-LIMIT>
<UPPER-LIMIT>1</UPPER-LIMIT>
<COMPU-CONST><VT>one</VT></COMPU-CONST>
<COMPU-CONST>
<VT>one</VT>
</COMPU-CONST>
</COMPU-SCALE>
<COMPU-SCALE>
<LOWER-LIMIT>2</LOWER-LIMIT>
<UPPER-LIMIT>2</UPPER-LIMIT>
<COMPU-CONST><VT>two</VT></COMPU-CONST>
<COMPU-CONST>
<VT>two</VT>
</COMPU-CONST>
</COMPU-SCALE>
</COMPU-SCALES>
</COMPU-INTERNAL-TO-PHYS>
Expand All @@ -1190,14 +1213,21 @@
</DESC>
<LOWER-LIMIT>0</LOWER-LIMIT>
<UPPER-LIMIT>0</UPPER-LIMIT>
<COMPU-CONST><VT>zero</VT></COMPU-CONST>
<COMPU-CONST>
<VT>zero</VT>
</COMPU-CONST>
</COMPU-SCALE>
<COMPU-SCALE>
<LOWER-LIMIT>0</LOWER-LIMIT>
<UPPER-LIMIT>1</UPPER-LIMIT>
<COMPU-RATIONAL-COEFFS>
<COMPU-NUMERATOR><V>0</V><V>0.1</V></COMPU-NUMERATOR>
<COMPU-DENOMINATOR><V>1</V></COMPU-DENOMINATOR>
<COMPU-NUMERATOR>
<V>0</V>
<V>0.1</V>
</COMPU-NUMERATOR>
<COMPU-DENOMINATOR>
<V>1</V>
</COMPU-DENOMINATOR>
</COMPU-RATIONAL-COEFFS>
</COMPU-SCALE>
</COMPU-SCALES>
Expand Down Expand Up @@ -1333,17 +1363,23 @@
<!-- /SystemSignal/SystemSignalInner/Signal2 -->
<SYSTEM-SIGNAL UUID="090ec74285ec66986afd658e7735d84a">
<SHORT-NAME>Signal2</SHORT-NAME>
<DESC><L-2 L="FOR-ALL">Signal comment!</L-2></DESC>
<DESC>
<L-2 L="FOR-ALL">Signal comment!</L-2>
</DESC>
</SYSTEM-SIGNAL>
<!-- /SystemSignal/SystemSignalInner/Signal2_1C -->
<SYSTEM-SIGNAL UUID="16625563aabba9041984761308071610">
<SHORT-NAME>Signal2_1C</SHORT-NAME>
<DESC><L-2 L="FOR-ALL">Signal comment! (1-Complement)</L-2></DESC>
<DESC>
<L-2 L="FOR-ALL">Signal comment! (1-Complement)</L-2>
</DESC>
</SYSTEM-SIGNAL>
<!-- /SystemSignal/SystemSignalInner/Signal2_SM -->
<SYSTEM-SIGNAL UUID="842b775bb4f05d19a94baa8cac26cf4e">
<SHORT-NAME>Signal2_SM</SHORT-NAME>
<DESC><L-2 L="FOR-ALL">Signal comment! (Sign+Magnitude)</L-2></DESC>
<DESC>
<L-2 L="FOR-ALL">Signal comment! (Sign+Magnitude)</L-2>
</DESC>
</SYSTEM-SIGNAL>
</ELEMENTS>
</AR-PACKAGE>
Expand Down

0 comments on commit 5a6e3ae

Please sign in to comment.