armodel 1.6.4__py3-none-any.whl → 1.7.0__py3-none-any.whl

armodel/writer/arxml_writer.py

@@ -2,52 +2,58 @@ import xml.etree.cElementTree as ET
 
 from typing import List
 
-from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayoutGroup, SwRecordLayoutV
-from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import InternalConstrs, PhysConstrs
-from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxis
-from ..models.M2.MSR.DataDictionary.Axis import SwAxisGrouped, SwAxisIndividual
-from ..models.M2.MSR.CalibrationData.CalibrationValue import SwValueCont, SwValues
+
+
+
+
+from ..models.M2.MSR.AsamHdo.AdminData import AdminData
 from ..models.M2.MSR.AsamHdo.BaseTypes import BaseTypeDirectDefinition, SwBaseType
+from ..models.M2.MSR.AsamHdo.ComputationMethod import CompuConstTextContent, CompuMethod, CompuNominatorDenominator, CompuScale, CompuScaleConstantContents, CompuScaleRationalFormula, CompuScales
+from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstr, InternalConstrs, PhysConstrs
 from ..models.M2.MSR.AsamHdo.SpecialData import Sdg
-from ..models.M2.MSR.AsamHdo.AdminData import AdminData
-from ..models.M2.MSR.AsamHdo.ComputationMethod import CompuConstTextContent, CompuNominatorDenominator, CompuScale, CompuScaleConstantContents, CompuScaleRationalFormula, CompuScales
-from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph
+from ..models.M2.MSR.AsamHdo.Units import PhysicalDimension, Unit
+from ..models.M2.MSR.CalibrationData.CalibrationValue import SwValueCont, SwValues
+from ..models.M2.MSR.DataDictionary.Axis import SwAxisGrouped, SwAxisIndividual
 from ..models.M2.MSR.DataDictionary.AuxillaryObjects import SwAddrMethod
-from ..models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps
-from ..models.M2.MSR.AsamHdo.Units import PhysicalDimension
-from ..models.M2.MSR.Documentation.BlockElements import DocumentationBlock
-from ..models.M2.MSR.AsamHdo.ComputationMethod import CompuMethod
-from ..models.M2.MSR.DataDictionary.DataDefProperties import ValueList
-from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultilanguageLongName
-from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayout
-from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstr
-from ..models.M2.MSR.AsamHdo.Units import Unit
+from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxis, SwCalprmAxisSet
+from ..models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps, ValueList
+from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayout, SwRecordLayoutGroup, SwRecordLayoutV
 from ..models.M2.MSR.Documentation.Annotation import Annotation
+from ..models.M2.MSR.Documentation.BlockElements import DocumentationBlock
+from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph, MultilanguageLongName
 
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PortAPIOptions import PortAPIOption
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import DataReceivedEvent, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, RTEEvent, SwcModeSwitchEvent, TimingEvent
-from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingExtensions import TimingExtension
-from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.ExecutionOrderConstraint import EOCExecutableEntityRef, ExecutionOrderConstraint
-from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetFrame import GenericEthernetFrame
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
+from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AutosarDataType
-from ..models.M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping, SwcBswRunnableMapping
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import BswImplementation
+from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
+from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswCalledEntity, BswEvent, BswInternalBehavior, BswModeSenderPolicy, BswModuleEntity, BswSchedulableEntity, BswScheduleEvent, BswTimingEvent
+from ..models.M2.AUTOSARTemplates.CommonStructure import ApplicationValueSpecification, ArrayValueSpecification, ConstantReference, ConstantSpecification, NumericalValueSpecification, RecordValueSpecification, TextValueSpecification, ValueSpecification
+from ..models.M2.AUTOSARTemplates.CommonStructure.Filter import DataFilter
+from ..models.M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping, SwcBswRunnableMapping
 from ..models.M2.AUTOSARTemplates.CommonStructure.Implementation import Code, Implementation
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndDescription, EndToEndProtection, EndToEndProtectionVariablePrototype
-from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import RoleBasedDataAssignment, ServiceDependency
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject, EngineeringObject
+from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingExtensions import SwcTiming, TimingExtension
+from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.ExecutionOrderConstraint import EOCExecutableEntityRef, ExecutionOrderConstraint
+from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import NvBlockNeeds, RoleBasedDataAssignment, ServiceDependency
 from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import ExecutableEntity
-from ..models.M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclaration, ModeDeclarationGroup
-from ..models.M2.AUTOSARTemplates.CommonStructure.SwcInternalBehavior.ModeDeclarationGroup import IncludedModeDeclarationGroupSet
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import CompositeNetworkRepresentation, TransmissionAcknowledgementRequest
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable, MultilanguageReferrable, Referrable
-from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswCalledEntity, BswEvent, BswInternalBehavior, BswModeSenderPolicy, BswModuleEntity, BswSchedulableEntity, BswScheduleEvent, BswTimingEvent
 from ..models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType
-from ..models.M2.AUTOSARTemplates.CommonStructure import ApplicationValueSpecification, ArrayValueSpecification, ConstantReference, ConstantSpecification, NumericalValueSpecification, RecordValueSpecification, TextValueSpecification, ValueSpecification
+from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
+from ..models.M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclaration, ModeDeclarationGroup, ModeDeclarationGroupPrototype
+from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption import ResourceConsumption
+
 from ..models.M2.AUTOSARTemplates.ECUCDescriptionTemplate import EcucAbstractReferenceValue, EcucContainerValue, EcucInstanceReferenceValue, EcucModuleConfigurationValues, EcucNumericalParamValue, EcucParameterValue, EcucReferenceValue, EcucTextualParamValue, EcucValueCollection
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject, EngineeringObject
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable, MultilanguageReferrable, Referrable
 from ..models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AnyInstanceRef
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, ARLiteral, Limit
+
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PortAPIOptions import PortAPIOption
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import DataReceivedEvent, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, RTEEvent, SwcModeSwitchEvent, TimingEvent
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AutosarDataType
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndDescription, EndToEndProtection, EndToEndProtectionVariablePrototype
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import IncludedModeDeclarationGroupSet
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import CompositeNetworkRepresentation, TransmissionAcknowledgementRequest
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import ApplicationSwComponentType, AtomicSwComponentType, ComplexDeviceDriverSwComponentType, CompositionSwComponentType, EcuAbstractionSwComponentType, PortGroup, SwComponentType, PPortPrototype, PortPrototype, RPortPrototype
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components.InstanceRefs import InnerPortGroupInCompositionInstanceRef, PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef, RModeInAtomicSwcInstanceRef, RVariableInAtomicSwcInstanceRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import RunnableEntity, RunnableEntityArgument, SwcInternalBehavior, SynchronousServerCallPoint
@@ -59,36 +65,28 @@ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface.InstanceRefs
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.InstanceRefsUsage import AutosarParameterRef, AutosarVariableRef, VariableInAtomicSWCTypeInstanceRef
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import ClientComSpec, ModeSwitchReceiverComSpec, ModeSwitchSenderComSpec, NonqueuedReceiverComSpec, NonqueuedSenderComSpec, PPortComSpec, ParameterRequireComSpec,  QueuedReceiverComSpec, QueuedSenderComSpec, RPortComSpec, ReceiverComSpec, SenderComSpec, ServerComSpec
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components.InstanceRefs import PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef
-from ..models.M2.AUTOSARTemplates.SystemTemplate.DataMapping import SenderReceiverToSignalGroupMapping, SenderReceiverToSignalMapping
-from ..models.M2.AUTOSARTemplates.SystemTemplate import System, SystemMapping
-from ..models.M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import CanNmCluster, CanNmClusterCoupling, CanNmNode, NmCluster, NmConfig, NmNode
-from ..models.M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import CanTpConfig
-from ..models.M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import VariableDataPrototypeInSystemInstanceRef
-from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import Gateway, ISignalMapping
-from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrame, CanFrameTriggering, RxIdentifierRange
-from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FrameTriggering, IPdu, ISignalGroup, ISignalIPdu, ISignalIPduGroup, ISignalTriggering, PduTriggering, SecuredIPdu, SystemSignal, DcmIPdu, Frame, ISignal, NPdu, NmPdu, SystemSignalGroup
-from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import LinFrameTriggering, LinUnconditionalFrame
-from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import AbstractCanCluster, CanCluster, EcuInstance, CanPhysicalChannel, CommunicationCluster, LinCluster, LinPhysicalChannel, PhysicalChannel
-from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
-from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingExtensions import SwcTiming
-
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import RoleBasedPortAssignment, SwcServiceDependency
-from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import NvBlockNeeds
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ApplicationArrayElement, ApplicationCompositeElementDataPrototype, ApplicationRecordElement, AutosarDataPrototype, DataPrototype, ParameterDataPrototype, VariableDataPrototype
-from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
-from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import ServiceSwComponentType
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxisSet
-from ..models.M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclarationGroupPrototype
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import DataTypeMappingSet
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndProtectionSet
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ApplicationError, ClientServerInterface, ClientServerOperation, ModeSwitchInterface, ParameterInterface, PortInterface, SenderReceiverInterface, TriggerInterface
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import SwcImplementation
-from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption import ResourceConsumption
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
+
+from ..models.M2.AUTOSARTemplates.SystemTemplate import SwcToEcuMapping, System, SystemMapping
+from ..models.M2.AUTOSARTemplates.SystemTemplate.DataMapping import SenderReceiverToSignalGroupMapping, SenderReceiverToSignalMapping
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FrameTriggering, IPdu, IPduTiming, ISignalGroup, ISignalIPdu, ISignalIPduGroup, ISignalTriggering, PduTriggering, SecuredIPdu, SystemSignal, DcmIPdu, Frame, ISignal, NPdu, NmPdu, SystemSignalGroup
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.EcuInstance import EcuInstance
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.Timing import EventControlledTiming, TimeRangeType, TransmissionModeCondition, TransmissionModeDeclaration, TransmissionModeTiming
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetFrame import GenericEthernetFrame
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import Gateway, ISignalMapping
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrame, CanFrameTriggering, RxIdentifierRange
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanTopology import CanCommunicationConnector, CanCommunicationController
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import LinFrameTriggering, LinUnconditionalFrame
+from ..models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import AbstractCanCluster, CanCluster, CanPhysicalChannel, CommConnectorPort, CommunicationCluster, CommunicationConnector, FramePort, IPduPort, ISignalPort, LinCluster, LinPhysicalChannel, PhysicalChannel
+from ..models.M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import ComponentInSystemInstanceRef, VariableDataPrototypeInSystemInstanceRef
+from ..models.M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import CanNmCluster, CanNmClusterCoupling, CanNmNode, NmCluster, NmConfig, NmNode
+from ..models.M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import CanTpConfig
 
 from .abstract_arxml_writer import AbstractARXMLWriter
 class ARXMLWriter(AbstractARXMLWriter):
@@ -963,6 +961,14 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalRefType(child_element, "TARGET-DATA-PROTOTYPE-REF", ref.getAutosarVariableIRef().getTargetDataPrototypeRef())
             self.setChildElementOptionalRefType(child_element, "LOCAL-VARIABLE-REF", ref.getLocalVariableRef())
 
+    def setComponentInSystemInstanceRef(self, element: ET.Element, tag_name: str, ref: ComponentInSystemInstanceRef):
+        if ref is not None:
+            child_element = ET.SubElement(element, tag_name)
+            self.setARObjectAttributes(child_element, ref)
+            self.setChildElementOptionalRefType(child_element, "BASE-REF", ref.getBaseRef())
+            self.setChildElementOptionalRefType(child_element, "CONTEXT-COMPOSITION-REF", ref.getContextCompositionRef())
+            self.setChildElementOptionalRefType(child_element, "TARGET-COMPONENT-REF", ref.getTargetComponentRef())
+
     def setVariableAccess(self, element: ET.Element, access: VariableAccess):
         child_element = ET.SubElement(element, "VARIABLE-ACCESS")
         self.setIdentifiable(child_element, access)
@@ -2239,6 +2245,7 @@ class ARXMLWriter(AbstractARXMLWriter):
 
     def readAbstractCanCluster(self, element: ET.Element, cluster: AbstractCanCluster):
         self.setChildElementOptionalNumericalValue(element, "CAN-FD-BAUDRATE", cluster.getCanFdBaudrate())
+        self.setChildElementOptionalNumericalValue(element, "SPEED", cluster.getSpeed())
 
     def writeLinCluster(self, element: ET.Element, cluster: LinCluster):
         self.logger.debug("LinCluster %s" % cluster.short_name)
@@ -2259,14 +2266,89 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.readAbstractCanCluster(child_element, cluster)
 
     def writeCanFrame(self, element: ET.Element, frame: CanFrame):
-        self.logger.debug("CanFrame %s" % frame.short_name)
+        self.logger.debug("Write CanFrame %s" % frame.short_name)
         child_element = ET.SubElement(element, "CAN-FRAME")
         self.writeFrame(child_element, frame)
 
+    def writeCommConnectorPort(self, element: ET.Element, port: CommConnectorPort):
+        self.setIdentifiable(element, port)
+        self.setChildElementOptionalLiteral(element, "COMMUNICATION-DIRECTION", port.getCommunicationDirection())
+
+    def writeFramePort(self, element: ET.Element, port: FramePort):
+        child_element = ET.SubElement(element, "FRAME-PORT")
+        self.writeCommConnectorPort(child_element, port)
+
+    def writeIPduPort(self, element: ET.Element, port: IPduPort):
+        child_element = ET.SubElement(element, "I-PDU-PORT")
+        self.writeCommConnectorPort(child_element, port)
+
+    def writeISignalPort(self, element: ET.Element, port: ISignalPort):
+        child_element = ET.SubElement(element, "I-SIGNAL-PORT")
+        self.writeCommConnectorPort(child_element, port)
+
+    def writeCommunicationConnectorEcuCommPortInstances(self, element: ET.Element, connector: CommunicationConnector):
+        self.logger.debug("write EcuCommPortInstances of CommunicationConnector %s" % connector.getShortName())
+        ports = connector.getEcuCommPortInstances()
+        if len(ports) > 0:
+            instances_tag = ET.SubElement(element, "ECU-COMM-PORT-INSTANCES")
+            for port in ports:
+                if isinstance(port, FramePort):
+                    self.writeFramePort(instances_tag, port)
+                elif isinstance(port, IPduPort):
+                    self.writeIPduPort(instances_tag, port)
+                elif isinstance(port, ISignalPort):
+                    self.writeISignalPort(instances_tag, port)
+                else:
+                    self._raiseError("Unsupported CommConnectorPort <%s>" % type(port))      
+
+    def writeCanCommunicationController(self, element: ET.Element, controller: CanCommunicationController):
+        self.logger.debug("Write CanCommunicationController %s" % controller.getShortName())
+        self.setIdentifiable(element, controller)
+
+    def writeEcuInstanceCommControllers(self, element: ET.Element, instance: EcuInstance):
+        controllers = instance.getCommControllers()
+        if len(controllers) > 0:
+            controllers_tag = ET.SubElement(element, "COMM-CONTROLLERS")
+            for controller in controllers:
+                if isinstance(controller, CanCommunicationController):
+                    child_element = ET.SubElement(controllers_tag, "CAN-COMMUNICATION-CONTROLLER")
+                    self.writeCanCommunicationController(child_element, controller)
+                else:
+                    self._raiseError("Unsupported Communication Controller <%s>" % type(controller))
+
+    def writeCommunicationConnector(self, element: ET.Element, connector: CommunicationConnector):
+        self.setIdentifiable(element, connector)
+        self.setChildElementOptionalRefType(element, "COMM-CONTROLLER-REF", connector.getCommControllerRef())
+        self.writeCommunicationConnectorEcuCommPortInstances(element, connector)
+
+
+    def writeCanCommunicationConnector(self, element: ET.Element, connector: CanCommunicationConnector):
+        self.logger.debug("Write CanCommunicationConnector %s" % connector.getShortName())
+        self.writeCommunicationConnector(element, connector)                
+
+    def writeEcuInstanceConnectors(self, element: ET.Element, instance: EcuInstance):
+        connectors = instance.getConnectors()
+        if len(connectors) > 0:
+            connectors_tag = ET.SubElement(element, "CONNECTORS")
+            for connector in connectors:
+                if isinstance(connector, CanCommunicationConnector):
+                    child_element = ET.SubElement(connectors_tag, "CAN-COMMUNICATION-CONNECTOR")
+                    self.writeCanCommunicationConnector(child_element, connector)
+                else:
+                    self._raiseError("Unsupported Communication connector <%s>" % type(connector))
+
     def writeEcuInstance(self, element: ET.Element, instance: EcuInstance):
         self.logger.debug("EcuInstance %s" % instance.short_name)
         child_element = ET.SubElement(element, "ECU-INSTANCE")
         self.setIdentifiable(child_element, instance)
+        self.setChildElementOptionalTimeValue(child_element, "COM-CONFIGURATION-GW-TIME-BASE", instance.getComConfigurationGwTimeBase())
+        self.setChildElementOptionalTimeValue(child_element, "COM-CONFIGURATION-RX-TIME-BASE", instance.getComConfigurationRxTimeBase())
+        self.setChildElementOptionalTimeValue(child_element, "COM-CONFIGURATION-TX-TIME-BASE", instance.getComConfigurationTxTimeBase())
+        self.setChildElementOptionalBooleanValue(child_element, "COM-ENABLE-MDT-FOR-CYCLIC-TRANSMISSION", instance.getComEnableMDTForCyclicTransmission())
+        self.writeEcuInstanceCommControllers(child_element, instance)
+        self.writeEcuInstanceConnectors(child_element, instance)
+        self.setChildElementOptionalBooleanValue(child_element, "SLEEP-MODE-SUPPORTED", instance.getSleepModeSupported())
+        self.setChildElementOptionalBooleanValue(child_element, "WAKE-UP-OVER-BUS-SUPPORTED", instance.getWakeUpOverBusSupported())
 
     def writeSystemSignalGroup(self, element: ET.Element, group: SystemSignalGroup):
         self.logger.debug("Write SystemSignalGroup %s" % group.short_name)
@@ -2299,12 +2381,33 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self.setSenderReceiverToSignalGroupMapping(child_element, data_mapping)
                 else:
                     raise NotImplementedError("Unsupported Data Mapping %s" % type(data_mapping))
+                
+    def setSwcToEcuMapping(self, element: ET.Element, mapping: SwcToEcuMapping):
+        child_element = ET.SubElement(element, "SWC-TO-ECU-MAPPING")
+        self.setIdentifiable(child_element, mapping)
+        irefs = mapping.getComponentIRefs()
+        if len(irefs) > 0:
+            irefs_tag = ET.SubElement(child_element, "COMPONENT-IREFS")
+            for iref in irefs:
+                self.setComponentInSystemInstanceRef(irefs_tag, "COMPONENT-IREF", iref)
+        self.setChildElementOptionalRefType(child_element, "ECU-INSTANCE-REF", mapping.getEcuInstanceRef())
+                
+    def writeSystemMappingSwMappings(self, element: ET.Element, system_mapping: SystemMapping):
+        sw_mappings = system_mapping.getSwMappings()
+        if len(sw_mappings) > 0:
+            child_element = ET.SubElement(element, "SW-MAPPINGS")
+            for sw_mapping in sw_mappings:
+                if isinstance(sw_mapping, SwcToEcuMapping):
+                    self.setSwcToEcuMapping(child_element, sw_mapping)
+                else:
+                    raise NotImplementedError("Unsupported Sw Mapping %s" % type(sw_mapping))
 
     def writeSystemMapping(self, element: ET.Element, mapping: SystemMapping):
         self.logger.debug("Write SystemMapping %s" % mapping.short_name)
         child_element = ET.SubElement(element, "SYSTEM-MAPPING")
         self.setIdentifiable(child_element, mapping)
         self.writeSystemMappingDataMappings(child_element, mapping)
+        self.writeSystemMappingSwMappings(child_element, mapping)
 
     def writeSystemMappings(self, element: ET.Element, system: System):
         mappings = system.getMappings()
@@ -2316,6 +2419,15 @@ class ARXMLWriter(AbstractARXMLWriter):
                 else:
                     raise NotImplementedError("Unsupported Mapping %s" % type(mapping))
                 
+    def writeRootSwCompositionPrototype(self, element: ET.Element, system: System):
+        prototype = system.getRootSoftwareComposition()
+        if prototype is not None:
+            self.logger.debug("Write RootSwCompositionPrototype <%s>" % prototype.getShortName())
+            child_element = ET.SubElement(element, "ROOT-SOFTWARE-COMPOSITIONS")
+            child_element = ET.SubElement(child_element, "ROOT-SW-COMPOSITION-PROTOTYPE")
+            self.setIdentifiable(child_element, prototype)
+            self.setChildElementOptionalRefType(child_element, "SOFTWARE-COMPOSITION-TREF", prototype.getSoftwareCompositionTRef())
+                
     def writeSystem(self, element: ET.Element, system: System):
         self.logger.debug("Write System %s" % system.short_name)
         child_element = ET.SubElement(element, "SYSTEM")
@@ -2330,6 +2442,8 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalRefType(fibex_element_ref_conditional_tag, "FIBEX-ELEMENT-REF", ref)
 
         self.writeSystemMappings(child_element, system)
+        self.writeRootSwCompositionPrototype(child_element, system)
+        self.setChildElementOptionalRevisionLabelString(child_element, "SYSTEM-VERSION", system.getSystemVersion())
 
     def writePhysicalDimension(self, element: ET.Element, dimension: PhysicalDimension):
         self.logger.debug("Write PhysicalDimension %s" % dimension.short_name)
@@ -2536,12 +2650,55 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalNumericalValue(child_element, "START-POSITION", mapping.getStartPosition())
                 self.setChildElementOptionalLiteral(child_element, "TRANSFER-PROPERTY", mapping.getTransferProperty())
                 self.setChildElementOptionalNumericalValue(child_element, "UPDATE-INDICATION-BIT-POSITION", mapping.getUpdateIndicationBitPosition())
+    
+    def setDataFilter(self, element: ET.Element, key: str, filter: DataFilter):
+        child_element = ET.SubElement(element, key)
+        self.setChildElementOptionalLiteral(child_element, "DATA-FILTER-TYPE", filter.getDataFilterType())
+
+    def setTransmissionModeConditions(self, element: ET.Element, conditions: List[TransmissionModeCondition]):
+        if len(conditions) > 0:
+            conditions_tag = ET.SubElement(element, "TRANSMISSION-MODE-CONDITIONS")
+            for condition in conditions:
+                child_element = ET.SubElement(conditions_tag, "TRANSMISSION-MODE-CONDITION")
+                self.setDataFilter(child_element, "DATA-FILTER", condition.getDataFilter())
+                self.setChildElementOptionalRefType(child_element, "I-SIGNAL-IN-I-PDU-REF", condition.getISignalInIPduRef())
+
+    def setTimeRangeType(self, element: ET.Element, key: str, time_range: TimeRangeType):
+         if time_range is not None:
+            child_element = ET.SubElement(element, key)
+            self.setChildElementOptionalTimeValue(child_element, "VALUE", time_range.getValue())
+
+    def setEventControlledTiming(self, element: ET.Element, key: str, timing: EventControlledTiming):
+        if timing is not None:
+            child_element = ET.SubElement(element, key)
+            self.setChildElementOptionalIntegerValue(child_element, "NUMBER-OF-REPETITIONS", timing.getNumberOfRepetitions())
+            self.setTimeRangeType(child_element, "REPETITION-PERIOD", timing.getRepetitionPeriod())
+
+    def setTransmissionModeTiming(self, element: ET.Element, key: str, timing: TransmissionModeTiming):
+        if timing is not None:
+            self.logger.debug("Set TransmissionModeTiming of <%s>" % key)
+            child_element = ET.SubElement(element, key)
+            #timing.getCyclicTiming(child_element, "")
+            self.setEventControlledTiming(child_element, "EVENT-CONTROLLED-TIMING", timing.getEventControlledTiming())
+
+    def setTransmissionModeDeclaration(self, element: ET.Element, key: str, decl : TransmissionModeDeclaration):
+        if decl is not None:
+            child_element = ET.SubElement(element, key)
+            self.setTransmissionModeConditions(child_element, decl.getTransmissionModeConditions())
+            self.setTransmissionModeTiming(child_element, "TRANSMISSION-MODE-TRUE-TIMING", decl.getTransmissionModeTrueTiming())
+
+    def setISignalIPduIPduTimingSpecification(self, element: ET.Element, timing: IPduTiming):
+        if timing is not None:
+            spec_tag = ET.SubElement(element, "I-PDU-TIMING-SPECIFICATIONS")
+            child_element = ET.SubElement(spec_tag, "I-PDU-TIMING")
+            self.setTransmissionModeDeclaration(child_element, "TRANSMISSION-MODE-DECLARATION", timing.getTransmissionModeDeclaration())
 
     def writeISignalIPdu(self, element: ET.Element, i_pdu: ISignalIPdu):
         self.logger.debug("ISignalIPdu %s" % i_pdu.short_name)
         child_element = ET.SubElement(element, "I-SIGNAL-I-PDU")
         self.setIdentifiable(child_element, i_pdu)
         self.setChildElementOptionalNumericalValue(child_element, "LENGTH", i_pdu.getLength())
+        self.setISignalIPduIPduTimingSpecification(child_element, i_pdu.getIPduTimingSpecification())
         self.writeISignalToPduMappings(child_element, i_pdu)
         self.setChildElementOptionalLiteral(child_element, "UNUSED-BIT-PATTERN", i_pdu.getUnusedBitPattern())
 

{armodel-1.6.4.dist-info → armodel-1.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: armodel
-Version: 1.6.4
+Version: 1.7.0
 Summary: the python arxml parser
 Home-page: http://github.com/melodypapa/py-armodel
 Author: melodypapa
@@ -369,3 +369,17 @@ Fix the attribute intervalType of **Limit** is empty issue.
 2. Fix the Binary value
 3. Refactor the SwComponentType.
 
+**Version 1.7.0**
+
+1. To support the following AR Element:
+   * SWC-TO-ECU-MAPPING
+   * SW-MAPPINGS
+   * ROOT-SOFTWARE-COMPOSITIONS
+   * SPEED
+   * ECU-INSTANCE
+   * COMM-CONTROLLERS
+   * CAN-COMMUNICATION-CONNECTOR
+   * I-PDU-TIMING
+   * DATA-FILTER
+   * EVENT-CONTROLLED-TIMING
+

{armodel-1.6.4.dist-info → armodel-1.7.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 armodel/__init__.py,sha256=GVXg600GzbcLT2-Lrepuz6mjT6_BsVNmi2eDiz85NiA,67
 armodel/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/cli/arxml_dump_cli.py,sha256=Rg2am26-0YJR68Wthv3MlXYfQbM16-pMinUoF0udYa4,10874
-armodel/cli/arxml_format_cli.py,sha256=IvPSH0bWslFtNAUXx5D_CKoaZEpVy0dri3FJMrDdElY,1998
+armodel/cli/arxml_format_cli.py,sha256=-wdyefCwtYdpvJIgAQmOFIsAteitYL-U8av1ulEeBCs,2053
 armodel/cli/connector2xlsx_cli.py,sha256=hNrVRkSBlkVO3aNOQMmvmf2fPZ-ijILukKrqh5v-m4k,2163
 armodel/cli/connector_update_cli.py,sha256=glEONaSKBpKGzKW3X_Gvvr0ovzjVxGo_-qbYfWh9__E,2294
 armodel/cli/memory_section_cli.py,sha256=YPhnfP9dd8yjPG_F32FaKhnCGVmLIK-WH33Jbup31O8,2179
@@ -13,19 +13,20 @@ armodel/lib/__init__.py,sha256=5629DkORqTomt16J6VL40o5hFv86-9SRB1240OJWTts,142
 armodel/lib/cli_args_parser.py,sha256=WiTC3wy_fZYloA1AjPqCvvOA_26V_y5toun0qfV51cw,1207
 armodel/lib/sw_component.py,sha256=spUeVR8ftzqf9h-pilh17qQg8amYqcqh39XKYql3HO4,1367
 armodel/lib/system_signal.py,sha256=E3FNiUGRUZovTCclCkabkVPpScMIACOXERUpbAuBTv8,1397
-armodel/models/__init__.py,sha256=w7hTbvipp7WJrn92lRF9msiUjyYrC83wjjYkF30E4JI,3377
+armodel/models/__init__.py,sha256=ACrOXGc0fW9ERoy9QV21Gp3CjJ6FGqnG1oilI7xQnMI,4176
 armodel/models/M2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py,sha256=TiHSzzMbGUIteC139YIChIDs5LmkQiYnLsHuiRY4_tU,5056
 armodel/models/M2/AUTOSARTemplates/ECUCDescriptionTemplate.py,sha256=YL1F6U8chH-GrWi9tU1TtUq-4Ht6y5Z7s5o5tzCheTw,9283
 armodel/models/M2/AUTOSARTemplates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswBehavior.py,sha256=znEBuhFXu6Ndy7vDj2I31MlENqCpHwJn_ofRImBK3Nk,13815
+armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswBehavior.py,sha256=Z9bFQzXbDzHl45kt16-eNPU8eukc7j00L0MpZ9Flbpw,13819
 armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswImplementation.py,sha256=el7uFWztAqqYaCX_BOiSI6n7zeXsdD7acwpK52ZO5cM,2209
 armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswInterfaces.py,sha256=FjCCqKHS-KMJySiwpDtiBk5WhzrVMSHOJTCaWR4842A,2638
 armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswOverview.py,sha256=40BTjkzcUIXECsd3-wkpgbTKivcJcaFq_k20QQyYsD4,3691
 armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/__init__.py,sha256=IY7GCwskITrwr1Rv76zzNUupbMsPAiG4ZMf5ZqtQuBg,118
+armodel/models/M2/AUTOSARTemplates/CommonStructure/Filter.py,sha256=epZ2eekCBnufpMMe5QCEt6c84lNBztN9CzCmjg_XSZ0,2440
 armodel/models/M2/AUTOSARTemplates/CommonStructure/Implementation.py,sha256=qlaUllbaM1JeX8exwtBFa850BAJ7TIsB54sOKGNV5Gk,8061
 armodel/models/M2/AUTOSARTemplates/CommonStructure/ImplementationDataTypes.py,sha256=2qTV7qXwY-Hjh50N_F0ESShE1tczuQFoDef2jCweD-0,6136
-armodel/models/M2/AUTOSARTemplates/CommonStructure/InternalBehavior.py,sha256=jgm8FyfKtqyqZodLG9QJgiH1EIWC5STGgrxryVHRcMI,4595
+armodel/models/M2/AUTOSARTemplates/CommonStructure/InternalBehavior.py,sha256=pCJ-TKMmZkbYALI-XFg8Mm8QJekOkdykjslAPdhfK6g,4612
 armodel/models/M2/AUTOSARTemplates/CommonStructure/ModeDeclaration.py,sha256=uNQNAw8w7BEwVgcNcI3_1qoGtKfb48nar4v1coB8Exk,3459
 armodel/models/M2/AUTOSARTemplates/CommonStructure/ServiceNeeds.py,sha256=FnZKwzFBLDtGgfSyNFgPB5UXVpUgQ4if41MOunQW2Jo,2980
 armodel/models/M2/AUTOSARTemplates/CommonStructure/SwcBswMapping.py,sha256=r4nlKEU4E5SlmHULjH5CNL0sc-0Vu5JMO6wdF_BXUJs,1549
@@ -42,14 +43,14 @@ armodel/models/M2/AUTOSARTemplates/CommonStructure/Timing/TimingConstraint/Timin
 armodel/models/M2/AUTOSARTemplates/CommonStructure/Timing/TimingConstraint/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/M2/AUTOSARTemplates/GenericStructure/AbstractStructure.py,sha256=abfBOkDWUGN5xDPoLjYw-cfTio988lSuA35jtOPil2c,3016
 armodel/models/M2/AUTOSARTemplates/GenericStructure/__init__.py,sha256=ovguP4wzQEDNguczwiZnhMm4dRRVcvnzmHrfQtlRCNQ,15
-armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ARPackage.py,sha256=2l6qetOBIuQyFq7GjIN9QxTlD3e7R8VuOXWC1iPg6d0,28739
+armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ARPackage.py,sha256=m0z3qzXDYyGnue5i3WWiQ81Y_PylBL9SZk6BTDYFRdk,28799
 armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ArObject.py,sha256=lGpAPeVhgMbHPmdZWSxd4bKRIy6ALd1jeaa8mkHXy0Y,559
 armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ElementCollection.py,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/EngineeringObject.py,sha256=GAlpyZhgyJSNyMpGMDqF7wd7bpzQtpWhB-2wYUvQbYw,1718
 armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/Identifiable.py,sha256=F8ubItWX-JwOA-X75eO2XLAX-a51cjwfJDud7NMDujU,5490
-armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/PrimitiveTypes.py,sha256=HAd3sWBPPmiJrIaD6l9IYZ3ZXAG4-Ozojk_2oIIh5eg,9166
+armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/PrimitiveTypes.py,sha256=5gdp_t_7U7Q6ZVTpKkFIGtuEqSSjuRpldQFESF4ASUg,11582
 armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Communication.py,sha256=YyLeFwkn828KAO3aH5kftu5sJMGSo-UMwbYF1mh0t9E,11899
+armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Communication.py,sha256=-3IoSFVhlnqreKStcoDXnk5qT0gfNCOyiZhgBWh3_pg,12426
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/EndToEndProtection.py,sha256=OvATuHGdlLGpf56CEVvqG1TBqag8rW_zzw3jBEc_7Jk,6216
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/RPTScenario.py,sha256=qtSMJjrELFXwnXBrNFKtteo7tqO8m16KHd_p7Tw2JJ4,669
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcImplementation.py,sha256=ExFASEiGd3qBbHARe_p2ZlaS9YFaJ9oy68ytbeh7qVI,1259
@@ -67,7 +68,7 @@ armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/Acces
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/DataElements.py,sha256=L-IS9E_uCJxZM99PWNEBIP5XDvyKnzbOrckMSaMrNsk,1923
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/IncludedDataTypes.py,sha256=ejt-TSbPsEMSbr2u7kjdna6qQzI901y9f0Ls8QPIEf0,851
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/InstanceRefsUsage.py,sha256=a8DeEFGuT6w_F2gj8FmD2eHQk-OeuBSXyZUx3U_HNps,5745
-armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ModeDeclarationGroup.py,sha256=vgDitxhaIdRq883xM3_c5W9b_n60fGNb8UZDvxh1640,1413
+armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ModeDeclarationGroup.py,sha256=0QnmCi33e1tv0ZK9kfdTyV-MrN31LOtjz93HDuNm73c,2230
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/PerInstanceMemory.py,sha256=660PzTkQGpE4tieurBlXO5X-T3TdKgRx2LghxhTYuws,1397
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/PortAPIOptions.py,sha256=sBc-OmYx7gxv5RYvpa4bitMA4A6X1XddHiGkXxaYcYc,2789
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/RTEEvents.py,sha256=hfQVpBNj4AAfT_plDQaDaqH6wORrk1Gv1LBh2Yw11BQ,5585
@@ -76,21 +77,24 @@ armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/Servi
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/Trigger.py,sha256=lHfGVkfp4xinYS3j3rEAentSpHi7o_Rgy98O5CSo-Uc,404
 armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/__init__.py,sha256=Fxhj0jJjrUtQcC4qi2gjhciENUb-sSvHrNp0qa1ljtE,18443
 armodel/models/M2/AUTOSARTemplates/SystemTemplate/DataMapping.py,sha256=vqL3PBz58XRnnEEbPBtXYHbyTMdmYucgDzuhW48os9Q,2588
-armodel/models/M2/AUTOSARTemplates/SystemTemplate/InstanceRefs.py,sha256=xqD7TAMihcxroPMtIHxsDQNj5nGk1GRfZhAgzlffS30,1691
+armodel/models/M2/AUTOSARTemplates/SystemTemplate/InstanceRefs.py,sha256=Q8po4MxdTQ0Kz1wxignfvOzazQa67Phd_03By6OjfW8,2820
 armodel/models/M2/AUTOSARTemplates/SystemTemplate/NetworkManagement.py,sha256=bbOcXTS8aQOy5M18yf2FwKCFv_rcnjHsTRrGCRHpWys,17318
 armodel/models/M2/AUTOSARTemplates/SystemTemplate/TransportProtocols.py,sha256=Qg6SnO8rEHjMhaKlIQhUaQK5-OBa5hjQ3LJB9ErPags,334
-armodel/models/M2/AUTOSARTemplates/SystemTemplate/__init__.py,sha256=XrdtP8UsTwVsyoaI0HPxYWSo36LWN90SkfFe7thSivg,10651
+armodel/models/M2/AUTOSARTemplates/SystemTemplate/__init__.py,sha256=tNlsiCs91g2wdnm4SRNyhqWk6mDBSqpJALZsAapUtG0,13713
 armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Multiplatform.py,sha256=tGy9C8g_XB4pPnv8oeGq_kztq8_Xb9U87Go1oa_ZMSI,4324
 armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Can/CanCommunication.py,sha256=Sftihbe-JU8GEFCubE4b2nvZpWs12ZzAzHJRwZrKnFA,3729
+armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Can/CanTopology.py,sha256=lfwgKOs5janbyj-EwZEehjw9XgriJHfzRI6AI0BGJ7s,6464
 armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Can/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/EthernetFrame.py,sha256=EvRGdOINgQ5BqSnAiOSVKl84na6LFy452rl37T41efY,685
 armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/ServiceInstances.py,sha256=jG9KGNBUHz3hJT6MUBADUANhPN5vGFE1mPKqbfHp2rI,4133
 armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Ethernet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Lin/LinCommunication.py,sha256=ZhoignKlV0OVUqKLN-b_N2hiDZB-oX1WeHNmJYdGGwI,1486
 armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Lin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/CoreCommunication.py,sha256=cDx37DNAZf7zGMfm7OD40fTIQrR0IySbi2KcU8SSrfM,19768
-armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/CoreTopology.py,sha256=dUWyPxmA5DHV8M36tDp97639wkAw69xCMIgWG_Zj9Hc,7363
+armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/CoreCommunication.py,sha256=SgV3MSSL7hzI1bV7s3XtyQd8d7vTtwYOEFxi9t54pc8,19966
+armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/CoreTopology.py,sha256=hTda9W88rPqxYnsXqD0eozkoPN0YZuvmmgjQU76ZlLg,14668
+armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/EcuInstance.py,sha256=bHZsN3CBuAWtXyUxmitVCbr5SWz936dyHaaLkn0dvv0,8999
+armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/Timing.py,sha256=lYaEyQ39ecXJKZzTlW7JRK-yAH8R25Jovq3_EYsGGKI,5378
 armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/models/M2/MSR/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 armodel/models/M2/MSR/AsamHdo/AdminData.py,sha256=DxAmK0FvzZUq9W8jVNQz0dSuh8kZWYiceSKp1btOJKQ,501
@@ -116,8 +120,8 @@ armodel/models/M2/MSR/Documentation/TextModel/LanguageDataModel.py,sha256=N56B-p
 armodel/models/M2/MSR/Documentation/TextModel/MultilanguageData.py,sha256=OGbRaB8RgItToR1KEObW4CXSCi0ZWOkwnd_TFi4y6jg,1235
 armodel/models/M2/MSR/Documentation/TextModel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/parser/__init__.py,sha256=wFcqh5unmDvKvf4R8vWkeertAXwWxAuOOEsbsM4mOHs,78
-armodel/parser/abstract_arxml_parser.py,sha256=0-OrbzkpPPcppTo50XHcyAfZ8c7Uu9sD3vejB-E09ks,11237
-armodel/parser/arxml_parser.py,sha256=wFXgdmk_fA5HnGUySsgxwj2hXoeCCYOQSD3Fy6NxlT4,179353
+armodel/parser/abstract_arxml_parser.py,sha256=MSAHvF-31Hh9zY-7X7tRL7KSGXS1xFSZqDD-ya7Q9C8,12722
+armodel/parser/arxml_parser.py,sha256=fkvG3rqlQV_rBC8VSZCrtpIryuRZ4olzfB4F1Mm3iQI,189486
 armodel/parser/connector_xlsx_parser.py,sha256=0YW0WGOeDFdSNEY_Xh8Hi-Zlv4e4ctaLUh9pibj2-1w,10312
 armodel/parser/excel_parser.py,sha256=-Ws0eDvGna9LPQC9T8bgMg3Zq84v04aSuSxZUlZx1Wo,698
 armodel/parser/file_parser.py,sha256=OMGh1oBgvDvz3qz8PrKxpTKqTsuFy3i9zw_Sfpes9M8,1464
@@ -143,14 +147,14 @@ armodel/tests/test_armodel/models/test_port_prototype.py,sha256=eJMfvimtniRIhqA5
 armodel/tests/test_armodel/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 armodel/tests/test_armodel/parser/test_arxml_parser.py,sha256=4-4DKdHIZN50wiM0tzzP-nejY74aEtAWhURwYxDGrWw,747
 armodel/tests/test_armodel/parser/test_parse_bswmd.py,sha256=khyJdeMAfAbllHieAfXsZE4ycA_fb74PCu-6Ske4QRA,10260
-armodel/tests/test_armodel/parser/test_sw_components.py,sha256=U1Ajcis7PxndJYw1BXkTZQ453LuEcwEX216yZ0w-wGM,4180
-armodel/tests/test_armodel/parser/test_system.py,sha256=W-pmPQLgz4XFnI-070wCPyRhI5I7zZgc6jwHroZclQA,1051
+armodel/tests/test_armodel/parser/test_sw_components.py,sha256=VcnqjD0nyqJ8x6ZGtwu-cLDF0MLd4qYrqfPwZ0FxksY,3182
+armodel/tests/test_armodel/parser/test_system.py,sha256=6oy10Y32qPwrPV1Twgr36pGUgrugoB4bHqtibJinLI0,1051
 armodel/writer/__init__.py,sha256=eXr3qhGzFIvHNBin22x-Tk2JM6QwRgx1jwrluDKAlzQ,37
-armodel/writer/abstract_arxml_writer.py,sha256=92w6wYva6oy4UrEXJ7X4Ks1SA0PAlrEhjjffsIP2nEA,5556
-armodel/writer/arxml_writer.py,sha256=Yfh4HQ0Y-MDKDE95svhYo6VdIeYsvRgRkGnY8wFLT_c,175071
-armodel-1.6.4.dist-info/LICENSE,sha256=rceTpGhsmmN1M0k1KO0HRS11iCjen-2y56ZEqgo43wo,1088
-armodel-1.6.4.dist-info/METADATA,sha256=10jX57Nfe9OKWlGL7_QRsUzxJiFOvSHukbopxediVhY,10891
-armodel-1.6.4.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-armodel-1.6.4.dist-info/entry_points.txt,sha256=7n_GwPbHcnqMTnKCnPjjjo3s_uo_vaFrjtZQeDQtHHM,397
-armodel-1.6.4.dist-info/top_level.txt,sha256=AEATYsqAuRpr0XGa_ThW7-o4WLlA5e3PEgD0QJhzmoA,8
-armodel-1.6.4.dist-info/RECORD,,
+armodel/writer/abstract_arxml_writer.py,sha256=kUL_PMw5P7zV5eYBkNlkWQtz1FOH8FaUc7jhQ4us8Rg,6099
+armodel/writer/arxml_writer.py,sha256=x6niCpmxhjqU_9GGY9QOGH76wRcXl3SFbjeVpP4JsW8,185479
+armodel-1.7.0.dist-info/LICENSE,sha256=rceTpGhsmmN1M0k1KO0HRS11iCjen-2y56ZEqgo43wo,1088
+armodel-1.7.0.dist-info/METADATA,sha256=C_Pl4p25LixN8-z77ymO-ZyqpswE-0qSIEpvDUACZNI,11186
+armodel-1.7.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+armodel-1.7.0.dist-info/entry_points.txt,sha256=7n_GwPbHcnqMTnKCnPjjjo3s_uo_vaFrjtZQeDQtHHM,397
+armodel-1.7.0.dist-info/top_level.txt,sha256=AEATYsqAuRpr0XGa_ThW7-o4WLlA5e3PEgD0QJhzmoA,8
+armodel-1.7.0.dist-info/RECORD,,