armodel 1.6.1__py3-none-any.whl → 1.6.3__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- armodel/cli/arxml_dump_cli.py +31 -25
- armodel/cli/arxml_format_cli.py +1 -4
- armodel/cli/connector_update_cli.py +1 -1
- armodel/cli/swc_list_cli.py +1 -1
- armodel/lib/sw_component.py +3 -1
- armodel/lib/system_signal.py +3 -1
- armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py +123 -0
- armodel/models/{bsw_module_template.py → M2/AUTOSARTemplates/BswModuleTemplate/BswBehavior.py} +115 -140
- armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswImplementation.py +21 -0
- armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswInterfaces.py +52 -0
- armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswOverview.py +78 -0
- armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/__init__.py +1 -0
- armodel/models/M2/AUTOSARTemplates/CommonStructure/Implementation.py +81 -0
- armodel/models/{m2/autosar_templates/common_structure/implementation_data_types.py → M2/AUTOSARTemplates/CommonStructure/ImplementationDataTypes.py} +20 -10
- armodel/models/M2/AUTOSARTemplates/CommonStructure/InternalBehavior.py +108 -0
- armodel/models/M2/AUTOSARTemplates/CommonStructure/ModeDeclaration.py +96 -0
- armodel/models/M2/AUTOSARTemplates/CommonStructure/ResourceConsumption/MemorySectionUsage.py +72 -0
- armodel/models/M2/AUTOSARTemplates/CommonStructure/ResourceConsumption/__init__.py +22 -0
- armodel/models/{service_needs.py → M2/AUTOSARTemplates/CommonStructure/ServiceNeeds.py} +7 -7
- armodel/models/M2/AUTOSARTemplates/CommonStructure/SwcBswMapping.py +36 -0
- armodel/models/M2/AUTOSARTemplates/CommonStructure/SwcInternalBehavior/ModeDeclarationGroup.py +27 -0
- armodel/models/M2/AUTOSARTemplates/CommonStructure/SwcInternalBehavior/__init__.py +1 -0
- armodel/models/M2/AUTOSARTemplates/CommonStructure/TriggerDeclaration.py +9 -0
- armodel/models/{m2/autosar_templates/common_structure → M2/AUTOSARTemplates/CommonStructure}/__init__.py +5 -2
- armodel/models/{m2/autosar_templates/generic_structure/abstract_structure.py → M2/AUTOSARTemplates/GenericStructure/AbstractStructure.py} +25 -2
- armodel/models/{ar_package.py → M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ARPackage.py} +113 -218
- armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ArObject.py +16 -0
- armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ElementCollection.py +1 -0
- armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/EngineeringObject.py +55 -0
- armodel/models/{general_structure.py → M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/Identifiable.py} +37 -149
- armodel/models/{ar_object.py → M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/PrimitiveTypes.py} +163 -70
- armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/__init__.py +1 -0
- armodel/models/M2/AUTOSARTemplates/GenericStructure/__init__.py +1 -0
- armodel/models/{m2/autosar_templates/sw_component_template/communication.py → M2/AUTOSARTemplates/SWComponentTemplate/Communication.py} +22 -5
- armodel/models/{m2/autosar_templates/sw_component_template/components/instance_refs.py → M2/AUTOSARTemplates/SWComponentTemplate/Components/InstanceRefs.py} +2 -2
- armodel/models/{m2/autosar_templates/sw_component_template/components → M2/AUTOSARTemplates/SWComponentTemplate/Components}/__init__.py +10 -8
- armodel/models/{m2/autosar_templates/sw_component_template/composition/instance_refs.py → M2/AUTOSARTemplates/SWComponentTemplate/Composition/InstanceRefs.py} +2 -2
- armodel/models/{m2/autosar_templates/sw_component_template/composition → M2/AUTOSARTemplates/SWComponentTemplate/Composition}/__init__.py +5 -5
- armodel/models/{m2/autosar_templates/sw_component_template/data_type/data_prototypes.py → M2/AUTOSARTemplates/SWComponentTemplate/Datatype/DataPrototypes.py} +25 -7
- armodel/models/{datatype.py → M2/AUTOSARTemplates/SWComponentTemplate/Datatype/Datatypes.py} +16 -74
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Datatype/__init__.py +1 -0
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/EndToEndProtection.py +177 -0
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcImplementation.py +11 -0
- armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/access_count.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/AccessCount.py} +2 -2
- armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/data_elements.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/DataElements.py} +7 -5
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/IncludedDataTypes.py +24 -0
- armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/instance_refs_usage.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/InstanceRefsUsage.py} +3 -3
- armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/mode_declaration_group.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ModeDeclarationGroup.py} +3 -3
- armodel/models/{per_instance_memory.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/PerInstanceMemory.py} +5 -6
- armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/server_call.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ServerCall.py} +3 -3
- armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ServiceMapping.py +23 -0
- armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior/trigger.py → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/Trigger.py} +2 -2
- armodel/models/{m2/autosar_templates/sw_component_template/swc_internal_behavior → M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior}/__init__.py +9 -10
- armodel/models/{m2/autosar_templates/sw_component_template → M2/AUTOSARTemplates/SWComponentTemplate}/port_interface/__init__.py +12 -8
- armodel/models/{m2/autosar_templates/sw_component_template → M2/AUTOSARTemplates/SWComponentTemplate}/port_interface/instance_refs.py +2 -2
- armodel/models/{m2/autosar_templates/system_template/instance_refs.py → M2/AUTOSARTemplates/SystemTemplate/InstanceRefs.py} +2 -2
- armodel/models/{m2/autosar_templates/system_template → M2/AUTOSARTemplates/SystemTemplate}/__init__.py +4 -2
- armodel/models/{m2/autosar_templates/system_template → M2/AUTOSARTemplates/SystemTemplate}/data_mapping.py +2 -2
- armodel/models/{m2/autosar_templates/system_template → M2/AUTOSARTemplates/SystemTemplate}/network_management.py +7 -3
- armodel/models/{m2/autosar_templates/system_template → M2/AUTOSARTemplates/SystemTemplate}/transport_protocols.py +1 -1
- armodel/models/{m2/autosar_templates → M2/AUTOSARTemplates}/ecuc_description_template.py +10 -6
- armodel/models/M2/MSR/AsamHdo/AdminData.py +21 -0
- armodel/models/M2/MSR/AsamHdo/BaseTypes.py +77 -0
- armodel/models/{m2_msr.py → M2/MSR/AsamHdo/ComputationMethod.py} +44 -28
- armodel/models/{global_constraints.py → M2/MSR/AsamHdo/Constraints/GlobalConstraints.py} +7 -4
- armodel/models/M2/MSR/AsamHdo/Constraints/__init__.py +1 -0
- armodel/models/M2/MSR/AsamHdo/SpecialData.py +63 -0
- armodel/models/{m2/msr/asam_hdo/units.py → M2/MSR/AsamHdo/Units.py} +6 -3
- armodel/models/M2/MSR/AsamHdo/__init__.py +1 -0
- armodel/models/M2/MSR/CalibrationData/CalibrationValue.py +30 -0
- armodel/models/M2/MSR/CalibrationData/__init__.py +1 -0
- armodel/models/{m2/msr/data_dictionary/auxillary_objects.py → M2/MSR/DataDictionary/AuxillaryObjects.py} +4 -2
- armodel/models/M2/MSR/DataDictionary/Axis.py +145 -0
- armodel/models/M2/MSR/DataDictionary/CalibrationParameter.py +37 -0
- armodel/models/{m2/msr/data_dictionary/data_def_properties.py → M2/MSR/DataDictionary/DataDefProperties.py} +19 -9
- armodel/models/{record_layout.py → M2/MSR/DataDictionary/RecordLayout.py} +26 -25
- armodel/models/M2/MSR/DataDictionary/__init__.py +1 -0
- armodel/models/{annotation.py → M2/MSR/Documentation/Annotation.py} +8 -8
- armodel/models/{m2/msr/documentation/block_elements.py → M2/MSR/Documentation/BlockElements.py} +2 -2
- armodel/models/M2/MSR/Documentation/TextModel/LanguageDataModel.py +17 -0
- armodel/models/{multilanguage_data.py → M2/MSR/Documentation/TextModel/MultilanguageData.py} +21 -30
- armodel/models/M2/MSR/Documentation/TextModel/__init__.py +2 -0
- armodel/models/M2/MSR/Documentation/__init__.py +3 -0
- armodel/models/M2/MSR/__init__.py +1 -0
- armodel/models/M2/__init__.py +1 -0
- armodel/models/__init__.py +6 -23
- armodel/models/fibex/can_communication.py +3 -2
- armodel/models/fibex/fibex_4_multiplatform.py +5 -3
- armodel/models/fibex/fibex_core/core_communication.py +9 -3
- armodel/models/fibex/fibex_core/core_topology.py +7 -3
- armodel/models/fibex/lin_communication.py +5 -1
- armodel/models/rpt_scenario.py +2 -2
- armodel/models/sw_component.py +19 -14
- armodel/models/timing.py +3 -3
- armodel/parser/abstract_arxml_parser.py +8 -4
- armodel/parser/arxml_parser.py +120 -86
- armodel/parser/connector_xlsx_parser.py +6 -2
- armodel/report/connector_xls_report.py +2 -1
- armodel/tests/test_armodel/models/test_ar_object.py +2 -1
- armodel/tests/test_armodel/models/test_ar_package.py +20 -8
- armodel/tests/test_armodel/models/test_ar_ref.py +7 -5
- armodel/tests/test_armodel/models/test_bsw_module_template.py +5 -1
- armodel/tests/test_armodel/models/test_common_structure.py +11 -5
- armodel/tests/test_armodel/models/test_data_dictionary.py +2 -2
- armodel/tests/test_armodel/models/test_data_prototype.py +7 -3
- armodel/tests/test_armodel/models/test_datatype.py +22 -8
- armodel/tests/test_armodel/models/test_general_structure.py +12 -2
- armodel/tests/test_armodel/models/test_implementation.py +3 -2
- armodel/tests/test_armodel/models/test_m2_msr.py +4 -2
- armodel/tests/test_armodel/models/test_port_interface.py +16 -6
- armodel/tests/test_armodel/models/test_port_prototype.py +1 -1
- armodel/tests/test_armodel/parser/test_parse_bswmd.py +3 -1
- armodel/tests/test_armodel/parser/test_sw_components.py +2 -2
- armodel/tests/test_armodel/parser/test_system.py +30 -0
- armodel/writer/abstract_arxml_writer.py +5 -2
- armodel/writer/arxml_writer.py +100 -67
- {armodel-1.6.1.dist-info → armodel-1.6.3.dist-info}/METADATA +366 -356
- armodel-1.6.3.dist-info/RECORD +148 -0
- {armodel-1.6.1.dist-info → armodel-1.6.3.dist-info}/WHEEL +1 -1
- armodel/lib/data_analyzer.py +0 -34
- armodel/models/ar_ref.py +0 -25
- armodel/models/calibration.py +0 -119
- armodel/models/common_structure.py +0 -272
- armodel/models/communication.py +0 -17
- armodel/models/data_def_properties.py +0 -16
- armodel/models/data_dictionary.py +0 -59
- armodel/models/data_prototype.py +0 -103
- armodel/models/ecuc_parameter_def_template.py +0 -0
- armodel/models/end_to_end_protection.py +0 -67
- armodel/models/fibex/fibex_core.py +0 -341
- armodel/models/fibex/lin_topology.py +0 -7
- armodel/models/implementation.py +0 -135
- armodel/models/internal_behavior.py +0 -63
- armodel/models/m2/autosar_templates/common_structure/constants.py +0 -0
- armodel/models/m2/autosar_templates/common_structure/implementation.py +0 -21
- armodel/models/m2/autosar_templates/generic_structure/__init__.py +0 -0
- armodel/models/m2/autosar_templates/sw_component_template/__init__.py +0 -0
- armodel/models/m2/autosar_templates/sw_component_template/data_type/__init__.py +0 -0
- armodel/models/m2/autosar_templates/sw_component_template/port_interface.py +0 -236
- armodel/models/m2/msr/__init__.py +0 -0
- armodel/models/m2/msr/asam_hdo/__init__.py +0 -0
- armodel/models/m2/msr/data_dictionary/__init__.py +0 -0
- armodel/models/m2/msr/documentation/__init__.py +0 -0
- armodel/models/mode_declaration.py +0 -8
- armodel/models/port_interface.py +0 -165
- armodel/models/port_prototype.py +0 -6
- armodel/models/service_mapping.py +0 -11
- armodel/models/system_template/__init__.py +0 -0
- armodel/models/system_template/network_management.py +0 -7
- armodel/models/system_template/transport_protocols.py +0 -7
- armodel/models/unit.py +0 -14
- armodel-1.6.1.dist-info/RECORD +0 -140
- /armodel/models/{m2 → M2/AUTOSARTemplates/SWComponentTemplate}/__init__.py +0 -0
- /armodel/models/{m2/autosar_templates → M2/AUTOSARTemplates}/__init__.py +0 -0
- {armodel-1.6.1.dist-info → armodel-1.6.3.dist-info}/LICENSE +0 -0
- {armodel-1.6.1.dist-info → armodel-1.6.3.dist-info}/entry_points.txt +0 -0
- {armodel-1.6.1.dist-info → armodel-1.6.3.dist-info}/top_level.txt +0 -0
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
from typing import List
|
|
2
|
+
from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
3
|
+
from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat
|
|
4
|
+
|
|
5
|
+
from abc import ABCMeta
|
|
6
|
+
class SwCalprmAxisTypeProps(ARObject, metaclass = ABCMeta):
|
|
7
|
+
def __init__(self):
|
|
8
|
+
if type(self) == SwCalprmAxisTypeProps:
|
|
9
|
+
raise NotImplementedError("SwCalprmAxisTypeProps is an abstract class.")
|
|
10
|
+
|
|
11
|
+
super().__init__()
|
|
12
|
+
|
|
13
|
+
self.maxGradient = None # type: ARFloat
|
|
14
|
+
self.monotony = None # type: MonotonyEnum
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
class SwCalprmAxis(ARObject):
|
|
18
|
+
def __init__(self):
|
|
19
|
+
super().__init__()
|
|
20
|
+
|
|
21
|
+
self.category = None # type: CalprmAxisCategoryEnum
|
|
22
|
+
self.displayFormat = None # type: DisplayFormatString
|
|
23
|
+
self.sw_axis_index = None # type: AxisIndexType
|
|
24
|
+
self.swCalibrationAccess = None # type: SwCalibrationAccessEnum
|
|
25
|
+
self.sw_calprm_axis_type_props = None # type: SwCalprmAxisTypeProps
|
|
26
|
+
|
|
27
|
+
class SwCalprmAxisSet(ARObject):
|
|
28
|
+
def __init__(self):
|
|
29
|
+
super().__init__()
|
|
30
|
+
|
|
31
|
+
self._swCalprmAxis = [] # type: List[SwCalprmAxis]
|
|
32
|
+
|
|
33
|
+
def addSwCalprmAxis(self, axis: SwCalprmAxis):
|
|
34
|
+
self._swCalprmAxis.append(axis)
|
|
35
|
+
|
|
36
|
+
def getSwCalprmAxises(self) -> List[SwCalprmAxis]:
|
|
37
|
+
return self._swCalprmAxis
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
from typing import List
|
|
2
2
|
|
|
3
|
-
from ...
|
|
4
|
-
from
|
|
5
|
-
from
|
|
6
|
-
from
|
|
7
|
-
from
|
|
8
|
-
|
|
3
|
+
from ...MSR.Documentation import Annotation
|
|
4
|
+
from ...MSR.DataDictionary.CalibrationParameter import SwCalprmAxisSet
|
|
5
|
+
from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
6
|
+
from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, RefType, ARLiteral
|
|
7
|
+
from ...AUTOSARTemplates.CommonStructure import ValueSpecification
|
|
9
8
|
|
|
10
9
|
class SwDataDefPropsConditional(ARObject):
|
|
11
10
|
'''
|
|
@@ -261,9 +260,6 @@ class SwDataDefProps(ARObject):
|
|
|
261
260
|
self.valueAxisDataTypeRef = value
|
|
262
261
|
return self
|
|
263
262
|
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
263
|
class SwPointerTargetProps(ARObject):
|
|
268
264
|
def __init__(self):
|
|
269
265
|
super().__init__()
|
|
@@ -293,3 +289,17 @@ class SwPointerTargetProps(ARObject):
|
|
|
293
289
|
self.targetCategory = value
|
|
294
290
|
return self
|
|
295
291
|
|
|
292
|
+
|
|
293
|
+
class ValueList(ARObject):
|
|
294
|
+
def __init__(self):
|
|
295
|
+
super().__init__()
|
|
296
|
+
|
|
297
|
+
self.v = None # type: ARFloat
|
|
298
|
+
self._vf = [] # type: List[ARLiteral]
|
|
299
|
+
|
|
300
|
+
def addVf(self, vf: ARLiteral):
|
|
301
|
+
self._vf.append(vf)
|
|
302
|
+
|
|
303
|
+
def getVfs(self) -> List[ARLiteral]:
|
|
304
|
+
return sorted(self._vf)
|
|
305
|
+
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
from .
|
|
3
|
-
from .
|
|
4
|
-
from .
|
|
5
|
-
from .general_structure import ARElement
|
|
1
|
+
from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
2
|
+
from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
|
|
3
|
+
from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, RefType
|
|
4
|
+
from ...MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph
|
|
6
5
|
|
|
7
6
|
class SwRecordLayoutV(ARObject):
|
|
8
7
|
def __init__(self):
|
|
@@ -20,27 +19,27 @@ class SwRecordLayoutV(ARObject):
|
|
|
20
19
|
def setShortLabel(self, short_label: ARLiteral):
|
|
21
20
|
self.shortLabel = short_label
|
|
22
21
|
return self
|
|
23
|
-
|
|
22
|
+
|
|
24
23
|
def setBaseTypeRef(self, ref: RefType):
|
|
25
24
|
self.baseTypeRef = ref
|
|
26
25
|
return self
|
|
27
|
-
|
|
26
|
+
|
|
28
27
|
def setSwRecordLayoutVAxis(self, axis: ARNumerical):
|
|
29
28
|
self.swRecordLayoutVAxis = axis
|
|
30
29
|
return self
|
|
31
|
-
|
|
30
|
+
|
|
32
31
|
def setSwRecordLayoutVFixValue(self, value: ARNumerical):
|
|
33
32
|
self.swRecordLayoutVFixValue = value
|
|
34
33
|
return self
|
|
35
|
-
|
|
34
|
+
|
|
36
35
|
def setSwRecordLayoutVIndex(self, index: ARLiteral):
|
|
37
36
|
self.swRecordLayoutVIndex = index
|
|
38
37
|
return self
|
|
39
|
-
|
|
38
|
+
|
|
40
39
|
def setSwRecordLayoutVProp(self, prop: ARLiteral):
|
|
41
40
|
self.swRecordLayoutVProp = prop
|
|
42
41
|
return self
|
|
43
|
-
|
|
42
|
+
|
|
44
43
|
class SwRecordLayoutGroupContent(ARObject):
|
|
45
44
|
def __init__(self):
|
|
46
45
|
super().__init__()
|
|
@@ -49,6 +48,7 @@ class SwRecordLayoutGroupContent(ARObject):
|
|
|
49
48
|
self.swRecordLayoutGroup = None # type: SwRecordLayoutGroup
|
|
50
49
|
self.swRecordLayoutV = None # type: SwRecordLayoutV
|
|
51
50
|
|
|
51
|
+
|
|
52
52
|
class SwRecordLayoutGroup(ARObject):
|
|
53
53
|
def __init__(self):
|
|
54
54
|
super().__init__()
|
|
@@ -63,49 +63,51 @@ class SwRecordLayoutGroup(ARObject):
|
|
|
63
63
|
self.swRecordLayoutGroupIndex = None # type: ARLiteral
|
|
64
64
|
self.swRecordLayoutGroupFrom = None # type: ARLiteral
|
|
65
65
|
self.swRecordLayoutGroupTo = None # type: ARLiteral
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
|
|
67
|
+
|
|
68
68
|
def setCategory(self, category: ARLiteral):
|
|
69
69
|
self.category = category
|
|
70
70
|
return self
|
|
71
|
-
|
|
71
|
+
|
|
72
72
|
def setDesc(self, desc):
|
|
73
73
|
self.desc = desc
|
|
74
74
|
return self
|
|
75
|
-
|
|
75
|
+
|
|
76
76
|
def setShortLabel(self, label: ARLiteral):
|
|
77
77
|
self.shortLabel = label
|
|
78
78
|
return self
|
|
79
|
-
|
|
79
|
+
|
|
80
80
|
def setSwGenericAxisParamTypeRef(self, ref: RefType):
|
|
81
81
|
self.swGenericAxisParamTypeRef = ref
|
|
82
82
|
return self
|
|
83
|
-
|
|
83
|
+
|
|
84
84
|
def setSwRecordLayoutComponent(self, component: ARLiteral):
|
|
85
85
|
self.swRecordLayoutComponent = component
|
|
86
86
|
return self
|
|
87
|
-
|
|
87
|
+
|
|
88
88
|
def setSwRecordLayoutGroupAxis(self, axis: ARNumerical):
|
|
89
89
|
self.swRecordLayoutGroupAxis = axis
|
|
90
90
|
return self
|
|
91
|
-
|
|
91
|
+
|
|
92
92
|
def setSwRecordLayoutGroupIndex(self, index: ARLiteral):
|
|
93
93
|
self.swRecordLayoutGroupIndex = index
|
|
94
94
|
return self
|
|
95
|
-
|
|
95
|
+
|
|
96
96
|
def setSwRecordLayoutGroupFrom(self, from_value: ARLiteral):
|
|
97
97
|
self.swRecordLayoutGroupFrom = from_value
|
|
98
98
|
return self
|
|
99
|
-
|
|
99
|
+
|
|
100
100
|
def setSwRecordLayoutGroupTo(self, to_value: ARLiteral):
|
|
101
101
|
self.swRecordLayoutGroupTo = to_value
|
|
102
102
|
return self
|
|
103
|
-
|
|
103
|
+
|
|
104
104
|
def setSwRecordLayoutGroupContentType(self, content_type: SwRecordLayoutGroupContent):
|
|
105
105
|
self.swRecordLayoutGroupContentType = content_type
|
|
106
106
|
return self
|
|
107
107
|
|
|
108
|
-
|
|
108
|
+
|
|
109
|
+
|
|
110
|
+
|
|
109
111
|
class SwRecordLayout(ARElement):
|
|
110
112
|
def __init__(self, parent: ARObject, short_name: str):
|
|
111
113
|
super().__init__(parent, short_name)
|
|
@@ -114,5 +116,4 @@ class SwRecordLayout(ARElement):
|
|
|
114
116
|
|
|
115
117
|
def setSwRecordLayoutGroup(self, group: SwRecordLayoutGroup):
|
|
116
118
|
self.swRecordLayoutGroup = group
|
|
117
|
-
return self
|
|
118
|
-
|
|
119
|
+
return self
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
from . import *
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
+
from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
2
|
+
from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
|
|
3
|
+
from .BlockElements import DocumentationBlock
|
|
4
|
+
from armodel.models.M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
|
|
1
5
|
|
|
2
6
|
from abc import ABCMeta
|
|
3
7
|
|
|
4
|
-
from .m2.msr.documentation.block_elements import DocumentationBlock
|
|
5
|
-
from .multilanguage_data import MultilanguageLongName
|
|
6
|
-
from .ar_object import ARLiteral, ARObject
|
|
7
|
-
|
|
8
8
|
|
|
9
9
|
class GeneralAnnotation(ARObject, metaclass=ABCMeta):
|
|
10
10
|
def __init__(self):
|
|
11
11
|
if type(self) == ARObject:
|
|
12
12
|
raise NotImplementedError("GeneralAnnotation is an abstract class.")
|
|
13
|
-
|
|
13
|
+
|
|
14
14
|
super().__init__()
|
|
15
15
|
|
|
16
16
|
self.annotationOrigin = None # type: ARLiteral
|
|
@@ -23,7 +23,7 @@ class GeneralAnnotation(ARObject, metaclass=ABCMeta):
|
|
|
23
23
|
def setAnnotationOrigin(self, value: ARLiteral):
|
|
24
24
|
self.annotationOrigin = value
|
|
25
25
|
return self
|
|
26
|
-
|
|
26
|
+
|
|
27
27
|
def getAnnotationText(self) -> DocumentationBlock:
|
|
28
28
|
return self.annotationText
|
|
29
29
|
|
|
@@ -38,7 +38,7 @@ class GeneralAnnotation(ARObject, metaclass=ABCMeta):
|
|
|
38
38
|
self.label = value
|
|
39
39
|
return self
|
|
40
40
|
|
|
41
|
+
|
|
41
42
|
class Annotation(GeneralAnnotation):
|
|
42
43
|
def __init__(self):
|
|
43
|
-
super().__init__()
|
|
44
|
-
|
|
44
|
+
super().__init__()
|
armodel/models/{m2/msr/documentation/block_elements.py → M2/MSR/Documentation/BlockElements.py}
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
from typing import List
|
|
2
|
-
from
|
|
3
|
-
from
|
|
2
|
+
from .TextModel.MultilanguageData import MultiLanguageParagraph
|
|
3
|
+
from ...AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
4
4
|
|
|
5
5
|
class DocumentationBlock(ARObject):
|
|
6
6
|
def __init__(self):
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
class LOverviewParagraph(ARObject):
|
|
5
|
+
def __init__(self):
|
|
6
|
+
super().__init__()
|
|
7
|
+
|
|
8
|
+
self.l = ""
|
|
9
|
+
self.value = ""
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
class LLongName(ARObject):
|
|
13
|
+
def __init__(self):
|
|
14
|
+
super().__init__()
|
|
15
|
+
|
|
16
|
+
self.l = ""
|
|
17
|
+
self.value = ""
|
armodel/models/{multilanguage_data.py → M2/MSR/Documentation/TextModel/MultilanguageData.py}
RENAMED
|
@@ -1,35 +1,11 @@
|
|
|
1
|
+
from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
2
|
+
from armodel.models.M2.MSR.Documentation.TextModel.LanguageDataModel import LOverviewParagraph
|
|
3
|
+
from armodel.models.M2.MSR.Documentation.TextModel.LanguageDataModel import LLongName
|
|
1
4
|
|
|
2
|
-
from typing import List
|
|
3
|
-
from .ar_object import ARObject
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
class LLongName(ARObject):
|
|
7
|
-
def __init__(self):
|
|
8
|
-
super().__init__()
|
|
9
|
-
|
|
10
|
-
self.l = ""
|
|
11
|
-
self.value = ""
|
|
12
|
-
|
|
13
|
-
class LOverviewParagraph(ARObject):
|
|
14
|
-
def __init__(self):
|
|
15
|
-
super().__init__()
|
|
16
5
|
|
|
17
|
-
|
|
18
|
-
self.value = ""
|
|
6
|
+
from typing import List
|
|
19
7
|
|
|
20
|
-
class MultilanguageLongName(ARObject):
|
|
21
|
-
def __init__(self):
|
|
22
|
-
super().__init__()
|
|
23
8
|
|
|
24
|
-
self.l4 = [] # type:List[LLongName]
|
|
25
|
-
|
|
26
|
-
def addL4(self, l4: LLongName):
|
|
27
|
-
self.l4.append(l4)
|
|
28
|
-
return self
|
|
29
|
-
|
|
30
|
-
def getL4s(self) -> List[LLongName]:
|
|
31
|
-
return self.l4
|
|
32
|
-
|
|
33
9
|
class MultiLanguageParagraph(ARObject):
|
|
34
10
|
def __init__(self):
|
|
35
11
|
super().__init__()
|
|
@@ -39,10 +15,11 @@ class MultiLanguageParagraph(ARObject):
|
|
|
39
15
|
def addL1(self, l1: LLongName):
|
|
40
16
|
self.l1.append(l1)
|
|
41
17
|
return self
|
|
42
|
-
|
|
18
|
+
|
|
43
19
|
def getL1s(self) -> List[LLongName]:
|
|
44
20
|
return self.l1
|
|
45
21
|
|
|
22
|
+
|
|
46
23
|
class MultiLanguageOverviewParagraph(ARObject):
|
|
47
24
|
def __init__(self):
|
|
48
25
|
super().__init__()
|
|
@@ -54,4 +31,18 @@ class MultiLanguageOverviewParagraph(ARObject):
|
|
|
54
31
|
return self
|
|
55
32
|
|
|
56
33
|
def getL2s(self) -> List[LOverviewParagraph]:
|
|
57
|
-
return self.l2
|
|
34
|
+
return self.l2
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
class MultilanguageLongName(ARObject):
|
|
38
|
+
def __init__(self):
|
|
39
|
+
super().__init__()
|
|
40
|
+
|
|
41
|
+
self.l4 = [] # type:List[LLongName]
|
|
42
|
+
|
|
43
|
+
def addL4(self, l4: LLongName):
|
|
44
|
+
self.l4.append(l4)
|
|
45
|
+
return self
|
|
46
|
+
|
|
47
|
+
def getL4s(self) -> List[LLongName]:
|
|
48
|
+
return self.l4
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
from . import *
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
from . import *
|
armodel/models/__init__.py
CHANGED
|
@@ -1,24 +1,7 @@
|
|
|
1
|
-
from .annotation import *
|
|
2
|
-
from .ar_object import *
|
|
3
|
-
from .general_structure import *
|
|
4
|
-
from .common_structure import *
|
|
5
1
|
from .sw_component import *
|
|
6
|
-
from .
|
|
7
|
-
from .
|
|
8
|
-
from .
|
|
9
|
-
from .
|
|
10
|
-
from .
|
|
11
|
-
from .
|
|
12
|
-
from .m2.msr.data_dictionary.data_def_properties import *
|
|
13
|
-
from .m2.msr.data_dictionary.auxillary_objects import *
|
|
14
|
-
from .m2.autosar_templates.sw_component_template.port_interface import *
|
|
15
|
-
from .m2_msr import *
|
|
16
|
-
from .implementation import *
|
|
17
|
-
from .bsw_module_template import *
|
|
18
|
-
from .communication import *
|
|
19
|
-
from .calibration import *
|
|
20
|
-
from .global_constraints import *
|
|
21
|
-
from .m2.msr.asam_hdo.units import *
|
|
22
|
-
from .m2.autosar_templates.sw_component_template import *
|
|
23
|
-
from .m2.autosar_templates.sw_component_template.components import *
|
|
24
|
-
from .m2.autosar_templates.sw_component_template.composition import *
|
|
2
|
+
from .M2.MSR.DataDictionary import *
|
|
3
|
+
from .M2.MSR.Documentation import *
|
|
4
|
+
from .M2.MSR.AsamHdo import *
|
|
5
|
+
from .M2.AUTOSARTemplates.AutosarTopLevelStructure import *
|
|
6
|
+
from .M2.AUTOSARTemplates.CommonStructure import *
|
|
7
|
+
from .M2.AUTOSARTemplates.SWComponentTemplate import *
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
from ..
|
|
2
|
-
from ..
|
|
1
|
+
from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
2
|
+
from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
|
|
3
|
+
from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARPositiveInteger
|
|
3
4
|
from .fibex_core.core_communication import Frame, FrameTriggering
|
|
4
5
|
|
|
5
6
|
class RxIdentifierRange(ARObject):
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
from typing import List
|
|
2
2
|
|
|
3
|
-
from ..
|
|
4
|
-
|
|
5
|
-
from ..
|
|
3
|
+
from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
4
|
+
|
|
5
|
+
from ..M2.MSR.Documentation.BlockElements import DocumentationBlock
|
|
6
|
+
from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
|
|
7
|
+
from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARPositiveInteger
|
|
6
8
|
from .fibex_core.core_communication import FibexElement
|
|
7
9
|
|
|
8
10
|
class FrameMapping(ARObject):
|
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
from abc import ABCMeta
|
|
2
2
|
from typing import List
|
|
3
3
|
|
|
4
|
-
from ...
|
|
5
|
-
|
|
6
|
-
from ...
|
|
4
|
+
from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable
|
|
5
|
+
|
|
6
|
+
from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
7
|
+
|
|
8
|
+
from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical, ARPositiveInteger
|
|
9
|
+
|
|
10
|
+
from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
|
|
11
|
+
from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
|
|
12
|
+
from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Describable
|
|
7
13
|
|
|
8
14
|
class FibexElement(Identifiable, metaclass = ABCMeta):
|
|
9
15
|
def __init__(self, parent: ARObject, short_name: str):
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
from abc import ABCMeta
|
|
2
2
|
from typing import List
|
|
3
3
|
|
|
4
|
+
from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
5
|
+
|
|
6
|
+
from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat
|
|
7
|
+
|
|
4
8
|
from ...fibex.lin_communication import LinFrameTriggering
|
|
5
9
|
from ...fibex.can_communication import CanFrameTriggering
|
|
6
|
-
from ...
|
|
7
|
-
from ...
|
|
8
|
-
from ...
|
|
10
|
+
from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
|
|
11
|
+
from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
|
|
12
|
+
from ...M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
|
|
9
13
|
from ...fibex.fibex_core.core_communication import FibexElement, FrameTriggering, ISignalTriggering, PduTriggering
|
|
10
14
|
|
|
11
15
|
class PhysicalChannel (Identifiable, metaclass = ABCMeta):
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
|
|
2
2
|
from abc import ABCMeta
|
|
3
|
-
|
|
3
|
+
|
|
4
|
+
from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
5
|
+
|
|
6
|
+
from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARNumerical
|
|
7
|
+
from ..M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
|
|
4
8
|
from .fibex_core.core_communication import Frame, FrameTriggering
|
|
5
9
|
|
|
6
10
|
class LinFrame(Frame):
|
armodel/models/rpt_scenario.py
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
|
|
2
2
|
from abc import ABCMeta
|
|
3
|
-
from .
|
|
4
|
-
from .
|
|
3
|
+
from .M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
4
|
+
from .M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
class IdentCaption(Identifiable):
|
armodel/models/sw_component.py
CHANGED
|
@@ -1,20 +1,25 @@
|
|
|
1
1
|
from typing import List
|
|
2
2
|
from abc import ABCMeta
|
|
3
3
|
|
|
4
|
-
from .
|
|
5
|
-
|
|
6
|
-
from .
|
|
7
|
-
from .
|
|
8
|
-
from .
|
|
9
|
-
from .
|
|
10
|
-
from .
|
|
11
|
-
from .
|
|
12
|
-
from .
|
|
13
|
-
from .
|
|
14
|
-
from .
|
|
15
|
-
from .
|
|
16
|
-
from .
|
|
17
|
-
from .
|
|
4
|
+
from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
|
|
5
|
+
|
|
6
|
+
from .M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import RoleBasedDataAssignment, ServiceNeeds
|
|
7
|
+
from .M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
|
|
8
|
+
from .M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
9
|
+
from .M2.AUTOSARTemplates.SWComponentTemplate.Components import SwComponentType
|
|
10
|
+
from .M2.AUTOSARTemplates.SWComponentTemplate.Composition.InstanceRefs import POperationInAtomicSwcInstanceRef
|
|
11
|
+
from .M2.AUTOSARTemplates.SWComponentTemplate.Components.InstanceRefs import RModeInAtomicSwcInstanceRef, RVariableInAtomicSwcInstanceRef
|
|
12
|
+
from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import RunnableEntity
|
|
13
|
+
from .M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
|
|
14
|
+
from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import RoleBasedPortAssignment
|
|
15
|
+
from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PerInstanceMemory import PerInstanceMemory
|
|
16
|
+
from .M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import NvBlockNeeds
|
|
17
|
+
from .M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
|
|
18
|
+
from .M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
|
|
19
|
+
from .M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import TRefType
|
|
20
|
+
from .M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
|
|
21
|
+
from .M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ParameterDataPrototype, VariableDataPrototype
|
|
22
|
+
from .M2.AUTOSARTemplates.CommonStructure import ValueSpecification
|
|
18
23
|
|
|
19
24
|
class AbstractEvent(Identifiable):
|
|
20
25
|
def __init__(self, parent: ARObject, short_name: str):
|
armodel/models/timing.py
CHANGED
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
from abc import ABCMeta
|
|
3
3
|
from typing import List
|
|
4
4
|
|
|
5
|
-
from armodel.models.
|
|
5
|
+
from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
|
|
6
6
|
|
|
7
|
-
from
|
|
8
|
-
from
|
|
7
|
+
from .M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
|
|
8
|
+
from .M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
9
9
|
|
|
10
10
|
class EOCExecutableEntityRefAbstract(Identifiable):
|
|
11
11
|
__metaclass__ = ABCMeta
|
|
@@ -7,10 +7,14 @@ import re
|
|
|
7
7
|
import logging
|
|
8
8
|
import xml.etree.ElementTree as ET
|
|
9
9
|
|
|
10
|
-
from ..models.
|
|
11
|
-
|
|
12
|
-
from ..models.
|
|
13
|
-
|
|
10
|
+
from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
|
|
11
|
+
|
|
12
|
+
from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, ARLiteral, ARNumerical
|
|
13
|
+
|
|
14
|
+
from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
|
|
15
|
+
from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
|
|
16
|
+
from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
|
|
17
|
+
from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
|
|
14
18
|
|
|
15
19
|
|
|
16
20
|
class AbstractARXMLParser:
|