armodel 1.7.5__py3-none-any.whl → 1.7.7__py3-none-any.whl

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/CoreTopology.py

@@ -342,15 +342,15 @@ class CommConnectorPort(Identifiable, metaclass = ABCMeta):
             raise NotImplementedError("CommConnectorPort is an abstract class.")
         
         super().__init__(parent, short_name)
+        
+        self.communicationDirection = None                                                  # type: CommunicationDirectionType
 
-        # type: CommunicationDirectionType
-        self.communicationDirection = None
-
-    def getCommunicationDirection(self) -> CommunicationDirectionType:
+    def getCommunicationDirection(self):
         return self.communicationDirection
 
-    def setCommunicationDirection(self, value: CommunicationDirectionType):
-        self.communicationDirection = value
+    def setCommunicationDirection(self, value):
+        if value is not None:
+            self.communicationDirection = value
         return self
 
 
@@ -365,9 +365,9 @@ class IPduSignalProcessingEnum(Enum):
 class IPduPort(CommConnectorPort):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
-
-        # type: IPduSignalProcessingEnum
-        self.iPduSignalProcessing = None
+        
+        self.iPduSignalProcessing = None                                # type: IPduSignalProcessingEnum
+        self.keyId = None                                               # type: PositiveInteger
         self.rxSecurityVerification = None                              # type: Boolean
         self.timestampRxAcceptanceWindow = None                         # type: TimeValue
         self.useAuthDataFreshness = None                                # type: Boolean
@@ -376,68 +376,90 @@ class IPduPort(CommConnectorPort):
         return self.iPduSignalProcessing
 
     def setIPduSignalProcessing(self, value):
-        self.iPduSignalProcessing = value
+        if value is not None:
+            self.iPduSignalProcessing = value
+        return self
+
+    def getKeyId(self):
+        return self.keyId
+
+    def setKeyId(self, value):
+        if value is not None:
+            self.keyId = value
         return self
 
     def getRxSecurityVerification(self):
         return self.rxSecurityVerification
 
     def setRxSecurityVerification(self, value):
-        self.rxSecurityVerification = value
+        if value is not None:
+            self.rxSecurityVerification = value
         return self
 
     def getTimestampRxAcceptanceWindow(self):
         return self.timestampRxAcceptanceWindow
 
     def setTimestampRxAcceptanceWindow(self, value):
-        self.timestampRxAcceptanceWindow = value
+        if value is not None:
+            self.timestampRxAcceptanceWindow = value
         return self
 
     def getUseAuthDataFreshness(self):
         return self.useAuthDataFreshness
 
     def setUseAuthDataFreshness(self, value):
-        self.useAuthDataFreshness = value
+        if value is not None:
+            self.useAuthDataFreshness = value
         return self
 
 class ISignalPort(CommConnectorPort):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
         
-        # type: DataFilter
-        self.dataFilter = None
+        self.dataFilter = None                                          # type: DataFilter
         self.ddsQosProfileRef = None                                    # type: RefType
-        # type: TimeValue
-        self.firstTimeout = None
-        # type: HandleInvalidEnum
-        self.handleInvalid = None
+        self.firstTimeout = None                                        # type: TimeValue
+        self.handleInvalid = None                                       # type: HandleInvalidEnum
+        self.timeout = None                                             # type: TimeValue
 
     def getDataFilter(self):
         return self.dataFilter
 
     def setDataFilter(self, value):
-        self.dataFilter = value
+        if value is not None:
+            self.dataFilter = value
         return self
 
     def getDdsQosProfileRef(self):
         return self.ddsQosProfileRef
 
     def setDdsQosProfileRef(self, value):
-        self.ddsQosProfileRef = value
+        if value is not None:
+            self.ddsQosProfileRef = value
         return self
 
     def getFirstTimeout(self):
         return self.firstTimeout
 
     def setFirstTimeout(self, value):
-        self.firstTimeout = value
+        if value is not None:
+            self.firstTimeout = value
         return self
 
     def getHandleInvalid(self):
         return self.handleInvalid
 
     def setHandleInvalid(self, value):
-        self.handleInvalid = value
+        if value is not None:
+            self.handleInvalid = value
+        return self
+
+    def getTimeout(self):
+        return self.timeout
+
+    def setTimeout(self, value):
+        if value is not None:
+            self.timeout = value
         return self
 
 class CommunicationConnector(Identifiable, metaclass = ABCMeta):

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/FibexCore/EcuInstance.py

@@ -1,3 +1,4 @@
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, RefType, TimeValue
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetTopology import EthernetCommunicationConnector, EthernetCommunicationController
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrameTriggering
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanTopology import CanCommunicationConnector, CanCommunicationController
@@ -21,6 +22,7 @@ class EcuInstance(FibexElement):
         self.comEnableMDTForCyclicTransmission = None                       # type: Boolean
         self.commControllers = []                                           # type: List[CommunicationController]
         self.connectors = []                                                # type: List[CommunicationConnector]
+        self.diagnosticAddress = None                                       # type: Integer             ## Only AR 4.3.1
         self.dltConfig = None                                               # type: DltConfig
         self.doIpConfig = None                                              # type: DoIpConfig
         self.ecuTaskProxyRefs = []                                          # type: List[RefType]
@@ -141,6 +143,14 @@ class EcuInstance(FibexElement):
             connector = LinCommunicationConnector(self, short_name)
             self.addElement(connector)
         return self.getElement(short_name)
+    
+    def getDiagnosticAddress(self):
+        return self.diagnosticAddress
+
+    def setDiagnosticAddress(self, value):
+        if value is not None:
+            self.diagnosticAddress = value
+        return self
 
     def getDltConfig(self):
         return self.dltConfig

armodel/models/M2/AUTOSARTemplates/SystemTemplate/NetworkManagement.py

@@ -3,7 +3,7 @@ from typing import List
 from ....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import RxIdentifierRange
 from ....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, Integer, PositiveInteger, RefType, ARBoolean, TimeValue
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, Boolean, Integer, PositiveInteger, RefType, ARBoolean, TimeValue
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 
 class NmClusterCoupling(ARObject, metaclass = ABCMeta):
@@ -62,10 +62,7 @@ class FlexrayNmClusterCoupling(NmClusterCoupling):
     def setNmScheduleVariant(self, value):
         self.nmScheduleVariant = value
         return self
-
-class UdpNmClusterCoupling(NmClusterCoupling):
-    def __init__(self):
-        super().__init__()
+    
 
 class NmNode(Identifiable, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -203,6 +200,223 @@ class UdpNmNode(NmNode):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
+        self.allNmMessagesKeepAwake = None                                  # type: Boolean
+        self.nmMsgCycleOffset = None                                        # type: TimeValue
+
+    def getAllNmMessagesKeepAwake(self):
+        return self.allNmMessagesKeepAwake
+
+    def setAllNmMessagesKeepAwake(self, value):
+        if value is not None:
+            self.allNmMessagesKeepAwake = value
+        return self
+
+    def getNmMsgCycleOffset(self):
+        return self.nmMsgCycleOffset
+
+    def setNmMsgCycleOffset(self, value):
+        if value is not None:
+            self.nmMsgCycleOffset = value
+        return self
+
+class BusspecificNmEcu(ARObject, metaclass = ABCMeta):
+    def __init__(self):
+        super().__init__()
+
+class CanNmEcu(BusspecificNmEcu):
+    def __init__(self):
+        super().__init__()
+
+class FlexrayNmEcu(BusspecificNmEcu):
+    def __init__(self):
+        super().__init__()
+
+class J1939NmEcu(BusspecificNmEcu):
+    def __init__(self):
+        super().__init__()
+
+class UdpNmEcu(BusspecificNmEcu):
+    def __init__(self):
+        super().__init__()     
+
+        self.nmSynchronizationPointEnabled = None                       # type: Boolean         ## Only AR 4.3.1
+
+    def getNmSynchronizationPointEnabled(self):
+        return self.nmSynchronizationPointEnabled
+
+    def setNmSynchronizationPointEnabled(self, value):
+        if value is not None:
+            self.nmSynchronizationPointEnabled = value
+        return self
+
+
+class NmEcu(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.busDependentNmEcus = []                                    # type: List[BusspecificNmEcu]
+        self.ecuInstanceRef = None                                      # type: RefType
+        self.nmBusSynchronizationEnabled = None                         # type: Boolean
+        self.nmComControlEnabled = None                                 # type: Boolean
+        self.nmCoordinator = None                                       # type: NmCoordinator
+        self.nmCycletimeMainFunction = None                             # type: TimeValue
+        self.nmNodeDetectionEnabled = None                              # type: Boolean
+        self.nmNodeIdEnabled = None                                     # type: Boolean
+        self.nmPduRxIndicationEnabled = None                            # type: Boolean
+        self.nmRemoteSleepIndEnabled = None                             # type: Boolean
+        self.nmRepeatMsgIndEnabled = None                               # type: Boolean
+        self.nmStateChangeIndEnabled = None                             # type: Boolean
+        self.nmUserDataEnabled = None                                   # type: Boolean
+
+    def getBusDependentNmEcus(self):
+        return self.busDependentNmEcus
+
+    def addBusDependentNmEcu(self, value):
+        if value is not None:
+            self.busDependentNmEcus.append(value)
+        return self
+
+    def getEcuInstanceRef(self):
+        return self.ecuInstanceRef
+
+    def setEcuInstanceRef(self, value):
+        if value is not None:
+            self.ecuInstanceRef = value
+        return self
+
+    def getNmBusSynchronizationEnabled(self):
+        return self.nmBusSynchronizationEnabled
+
+    def setNmBusSynchronizationEnabled(self, value):
+        if value is not None:
+            self.nmBusSynchronizationEnabled = value
+        return self
+
+    def getNmComControlEnabled(self):
+        return self.nmComControlEnabled
+
+    def setNmComControlEnabled(self, value):
+        if value is not None:
+            self.nmComControlEnabled = value
+        return self
+
+    def getNmCoordinator(self):
+        return self.nmCoordinator
+
+    def setNmCoordinator(self, value):
+        if value is not None:
+            self.nmCoordinator = value
+        return self
+
+    def getNmCycletimeMainFunction(self):
+        return self.nmCycletimeMainFunction
+
+    def setNmCycletimeMainFunction(self, value):
+        if value is not None:
+            self.nmCycletimeMainFunction = value
+        return self
+    
+    def getNmNodeDetectionEnabled(self):
+        return self.nmNodeDetectionEnabled
+
+    def setNmNodeDetectionEnabled(self, value):
+        if value is not None:
+            self.nmNodeDetectionEnabled = value
+        return self
+
+    def getNmNodeIdEnabled(self):
+        return self.nmNodeIdEnabled
+
+    def setNmNodeIdEnabled(self, value):
+        if value is not None:
+            self.nmNodeIdEnabled = value
+        return self
+
+    def getNmPduRxIndicationEnabled(self):
+        return self.nmPduRxIndicationEnabled
+
+    def setNmPduRxIndicationEnabled(self, value):
+        if value is not None:
+            self.nmPduRxIndicationEnabled = value
+        return self
+
+    def getNmRemoteSleepIndEnabled(self):
+        return self.nmRemoteSleepIndEnabled
+
+    def setNmRemoteSleepIndEnabled(self, value):
+        if value is not None:
+            self.nmRemoteSleepIndEnabled = value
+        return self
+    
+    def getNmRepeatMsgIndEnabled(self):
+        return self.nmRepeatMsgIndEnabled
+
+    def setNmRepeatMsgIndEnabled(self, value):
+        if value is not None:
+            self.nmRepeatMsgIndEnabled = value
+        return self
+
+    def getNmStateChangeIndEnabled(self):
+        return self.nmStateChangeIndEnabled
+
+    def setNmStateChangeIndEnabled(self, value):
+        if value is not None:
+            self.nmStateChangeIndEnabled = value
+        return self
+
+    def getNmUserDataEnabled(self):
+        return self.nmUserDataEnabled
+
+    def setNmUserDataEnabled(self, value):
+        if value is not None:
+            self.nmUserDataEnabled = value
+        return self   
+
+class NmConfig(FibexElement):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.nmClusterCouplings = []                # type: List[NmClusterCoupling]
+        self.nmIfEcus = []                          # type: List[NmEcu]
+
+    def createCanNmCluster(self, short_name: str):          # type: (str) -> CanNmCluster
+        if (short_name not in self.elements):
+            cluster = CanNmCluster(self, short_name)
+            self.addElement(cluster)
+        return self.getElement(short_name)
+    
+    def createUdpNmCluster(self, short_name: str):          # type: (str) -> UdpNmCluster
+        if (short_name not in self.elements):
+            cluster = UdpNmCluster(self, short_name)
+            self.addElement(cluster)
+        return self.getElement(short_name)
+
+    def getCanNmClusters(self):                             # type: () -> List[CanNmCluster]
+        return list(sorted(filter(lambda a: isinstance(a, CanNmCluster), self.elements.values()), key= lambda o:o.short_name))
+    
+    def getUdpNmClusters(self):                             # type: () -> List[UdpNmCluster]
+        return list(sorted(filter(lambda a: isinstance(a, UdpNmCluster), self.elements.values()), key= lambda o:o.short_name))
+    
+    def getNmClusters(self):                                # type: () -> List[NmCluster]
+        return list(sorted(filter(lambda a: isinstance(a, NmCluster), self.elements.values()), key= lambda o:o.short_name))
+    
+    def getNmClusterCouplings(self):
+        return self.nmClusterCouplings
+
+    def addNmClusterCouplings(self, value):
+        self.nmClusterCouplings.append(value)
+        return self
+
+    def getNmIfEcus(self):
+        return self.nmIfEcus
+
+    def createNmEcu(self, short_name: str) -> NmEcu:
+        if (short_name not in self.elements):
+            cluster = NmEcu(self, short_name)
+            self.addElement(cluster)
+            self.nmIfEcus.append(cluster)
+        return self.getElement(short_name)
+    
 class NmCluster(Identifiable, metaclass=ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
@@ -437,142 +651,36 @@ class J1939NmCluster(NmCluster):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
-class UdpNmCluster(NmCluster):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-class NmEcu(Identifiable):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.busDependentNmEcus = []
-        self.ecuInstance = None
-        self.nmBusSynchronizationEnabled = None
-        self.nmComControlEnabled = None
-        self.nmCoordinator = None
-        self.nmCycletimeMainFunction = None
-        self.nmPduRxIndicationEnabled = None
-        self.nmRemoteSleepIndEnabled = None
-        self.nmStateChangeIndEnabled = None
-        self.nmUserDataEnabled = None
-
-    def getBusDependentNmEcus(self):
-        return self.busDependentNmEcus
-
-    def addBusDependentNmEcu(self, value):
-        self.busDependentNmEcus.append(value)
-        return self
-
-    def getEcuInstance(self):
-        return self.ecuInstance
-
-    def setEcuInstance(self, value):
-        self.ecuInstance = value
-        return self
-
-    def getNmBusSynchronizationEnabled(self):
-        return self.nmBusSynchronizationEnabled
-
-    def setNmBusSynchronizationEnabled(self, value):
-        self.nmBusSynchronizationEnabled = value
-        return self
-
-    def getNmComControlEnabled(self):
-        return self.nmComControlEnabled
-
-    def setNmComControlEnabled(self, value):
-        self.nmComControlEnabled = value
-        return self
-
-    def getNmCoordinator(self):
-        return self.nmCoordinator
-
-    def setNmCoordinator(self, value):
-        self.nmCoordinator = value
-        return self
-
-    def getNmCycletimeMainFunction(self):
-        return self.nmCycletimeMainFunction
-
-    def setNmCycletimeMainFunction(self, value):
-        self.nmCycletimeMainFunction = value
-        return self
-
-    def getNmPduRxIndicationEnabled(self):
-        return self.nmPduRxIndicationEnabled
-
-    def setNmPduRxIndicationEnabled(self, value):
-        self.nmPduRxIndicationEnabled = value
-        return self
-
-    def getNmRemoteSleepIndEnabled(self):
-        return self.nmRemoteSleepIndEnabled
+class UdpNmClusterCoupling(NmClusterCoupling):
+    def __init__(self):
+        super().__init__()
 
-    def setNmRemoteSleepIndEnabled(self, value):
-        self.nmRemoteSleepIndEnabled = value
-        return self
+        self.coupledClusterRefs = []                        # type: List[RefType]
+        self.nmImmediateRestartEnabled = None               # type: Boolean
 
-    def getNmStateChangeIndEnabled(self):
-        return self.nmStateChangeIndEnabled
+    def getCoupledClusterRefs(self):
+        return self.coupledClusterRefs
 
-    def setNmStateChangeIndEnabled(self, value):
-        self.nmStateChangeIndEnabled = value
+    def addCoupledClusterRef(self, value):
+        if value is not None:
+            self.coupledClusterRefs.append(value)
         return self
 
-    def getNmUserDataEnabled(self):
-        return self.nmUserDataEnabled
-
-    def setNmUserDataEnabled(self, value):
-        self.nmUserDataEnabled = value
-        return self   
-
-class NmConfig(FibexElement):
-    def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name)
-
-        self.nmClusterCouplings = []                # type: List[NmClusterCoupling]
-        self.nmIfEcus = []                          # type: List[NmEcu]
-
-    def createCanNmCluster(self, short_name: str) -> CanNmCluster:
-        if (short_name not in self.elements):
-            cluster = CanNmCluster(self, short_name)
-            self.addElement(cluster)
-        return self.getElement(short_name)
-    
-    def createUdpNmCluster(self, short_name: str) -> UdpNmCluster:
-        if (short_name not in self.elements):
-            cluster = UdpNmCluster(self, short_name)
-            self.addElement(cluster)
-        return self.getElement(short_name)
-
-    def getCanNmClusters(self) -> List[CanNmCluster]:
-        return list(sorted(filter(lambda a: isinstance(a, CanNmCluster), self.elements.values()), key= lambda o:o.short_name))
-    
-    def getUdpNmClusters(self) -> List[UdpNmCluster]:
-        return list(sorted(filter(lambda a: isinstance(a, UdpNmCluster), self.elements.values()), key= lambda o:o.short_name))
-    
-    def getNmClusters(self) -> List[NmCluster]:
-        return list(sorted(filter(lambda a: isinstance(a, NmCluster), self.elements.values()), key= lambda o:o.short_name))
-    
-    def getNmClusterCouplings(self):
-        return self.nmClusterCouplings
+    def getNmImmediateRestartEnabled(self):
+        return self.nmImmediateRestartEnabled
 
-    def addNmClusterCouplings(self, value):
-        self.nmClusterCouplings.append(value)
+    def setNmImmediateRestartEnabled(self, value):
+        if value is not None:
+            self.nmImmediateRestartEnabled = value
         return self
 
-    def getNmIfEcus(self):
-        return self.nmIfEcus
 
-    def addNmIfEcus(self, value):
-        self.nmIfEcus.append(value)
-        return self
-    
 class UdpNmCluster(NmCluster):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)
 
         self.nmCbvPosition = None                           # type: Integer
+        self.nmChannelActive = None                         # type: Boolean
         self.nmImmediateNmCycleTime = None                  # type: TimeValue
         self.nmImmediateNmTransmissions = None              # type: PositiveInteger
         self.nmMessageTimeoutTime = None                    # type: TimeValue
@@ -591,6 +699,15 @@ class UdpNmCluster(NmCluster):
         if value is not None:
             self.nmCbvPosition = value
         return self
+    
+    def getNmChannelActive(self):
+        return self.nmChannelActive
+
+    def setNmChannelActive(self, value):
+        if value is not None:
+            self.nmChannelActive = value
+        return self
+
 
     def getNmImmediateNmCycleTime(self):
         return self.nmImmediateNmCycleTime
@@ -670,6 +787,4 @@ class UdpNmCluster(NmCluster):
     def setVlanRef(self, value):
         if value is not None:
             self.vlanRef = value
-        return self
-
-        
+        return self

armodel/models/M2/AUTOSARTemplates/SystemTemplate/SWmapping.py

@@ -0,0 +1,27 @@
+from typing import List
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....M2.AUTOSARTemplates.SystemTemplate.InstanceRefs import ComponentInSystemInstanceRef
+
+class SwcToImplMapping(Identifiable):
+    def __init__(self, parent, short_name):
+        super().__init__(parent, short_name)
+
+        self.componentIRefs = []                                    # type: List[ComponentInSystemInstanceRef]
+        self.componentImplementationRef = None                      # type: RefType
+
+    def getComponentIRefs(self):
+        return self.componentIRefs
+
+    def addComponentIRef(self, value):
+        if value is not None:
+            self.componentIRefs.append(value)
+        return self
+
+    def getComponentImplementationRef(self):
+        return self.componentImplementationRef
+
+    def setComponentImplementationRef(self, value):
+        if value is not None:
+            self.componentImplementationRef = value
+        return self