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

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Lin/LinTopology.py

@@ -0,0 +1,94 @@
+from typing import List
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Integer, String, TimeValue
+from .......models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import CommunicationConnector, CommunicationController
+
+
+class LinCommunicationController(CommunicationController):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.protocolVersion = None                                     # type: String
+
+    def getProtocolVersion(self):
+        return self.protocolVersion
+
+    def setProtocolVersion(self, value):
+        if value is not None:
+            self.protocolVersion = value
+        return self
+
+class LinMaster(LinCommunicationController):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        # type: List[LinSlaveConfig]
+        self.linSlaves = []
+        # type: TimeValue
+        self.timeBase = None
+        self.timeBaseJitter = None                                      # type: TimeValue
+
+    def getLinSlaves(self):
+        return self.linSlaves
+
+    def addLinSlaves(self, value):
+        if value is not None:
+            self.linSlaves.append(value)
+        return self
+
+    def getTimeBase(self):
+        return self.timeBase
+
+    def setTimeBase(self, value):
+        if value is not None:
+            self.timeBase = value
+        return self
+
+    def getTimeBaseJitter(self):
+        return self.timeBaseJitter
+
+    def setTimeBaseJitter(self, value):
+        if value is not None:
+            self.timeBaseJitter = value
+        return self
+
+class LinCommunicationConnector(CommunicationConnector):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.initialNad = None                                      # type: Integer
+        self.linConfigurableFrames = []                             # type: List[LinConfigurableFrame]
+        self.linOrderedConfigurableFrames = []                      # type: List[LinOrderedConfigurableFrame]
+        self.scheduleChangeNextTimeBase = None                      # type: Boolean
+
+    def getInitialNad(self):
+        return self.initialNad
+
+    def setInitialNad(self, value):
+        if value is not None:
+            self.initialNad = value
+        return self
+
+    def getLinConfigurableFrames(self):
+        return self.linConfigurableFrames
+
+    def addLinConfigurableFrame(self, value):
+        if value is not None:
+            self.linConfigurableFrames.append(value)
+        return self
+
+    def getLinOrderedConfigurableFrames(self):
+        return self.linOrderedConfigurableFrames
+
+    def addLinOrderedConfigurableFrame(self, value):
+        if value is not None:
+            self.linOrderedConfigurableFrames.append(value)
+        return self
+
+    def getScheduleChangeNextTimeBase(self):
+        return self.scheduleChangeNextTimeBase
+
+    def setScheduleChangeNextTimeBase(self, value):
+        if value is not None:
+            self.scheduleChangeNextTimeBase = value
+        return self

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

@@ -1,12 +1,9 @@
 from abc import ABCMeta
 from typing import List
-
-from armodel.models.M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.Timing import TransmissionModeDeclaration
-
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable, Describable
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, ARPositiveInteger, RefType, ARBoolean, TimeValue
-
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, ARPositiveInteger, Boolean, Integer, RefType, ARBoolean, String, TimeValue, UnlimitedInteger
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.Timing import TransmissionModeDeclaration
 class FibexElement(Identifiable, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         if type(self) == FibexElement:
@@ -500,7 +497,7 @@ class PduTriggering(Identifiable):
         return self
 
     def getISignalTriggeringRefs(self):
-        return self.iSignalTriggeringRefs
+        return sorted(self.iSignalTriggeringRefs, key = lambda i: i.getShortValue())
 
     def addISignalTriggeringRef(self, value):
         self.iSignalTriggeringRefs.append(value)
@@ -623,3 +620,151 @@ class ISignalTriggering(Identifiable):
     def addISignalPortRef(self, value):
         self.iSignalPortRefs.append(value)
         return self
+
+class MultiplexedIPdu(IPdu):
+    def __init__(self, parent, short_name):
+        super().__init__(parent, short_name)
+
+        self.dynamicPart = None                                     # type: DynamicPart
+        self.selectorFieldByteOrder = None                          # type: ByteOrderEnum
+        self.selectorFieldLength = None                             # type: Integer
+        self.selectorFieldStartPosition = None                      # type: Integer
+        self.staticPart = None                                      # type: StaticPart
+        self.triggerMode = None                                     # type: TriggerMode
+        self.unusedBitPattern = None                                # type: Integer
+
+    def getDynamicPart(self):
+        return self.dynamicPart
+
+    def setDynamicPart(self, value):
+        if value is not None:
+            self.dynamicPart = value
+        return self
+
+    def getSelectorFieldByteOrder(self):
+        return self.selectorFieldByteOrder
+
+    def setSelectorFieldByteOrder(self, value):
+        if value is not None:
+            self.selectorFieldByteOrder = value
+        return self
+
+    def getSelectorFieldLength(self):
+        return self.selectorFieldLength
+
+    def setSelectorFieldLength(self, value):
+        if value is not None:
+            self.selectorFieldLength = value
+        return self
+
+    def getSelectorFieldStartPosition(self):
+        return self.selectorFieldStartPosition
+
+    def setSelectorFieldStartPosition(self, value):
+        if value is not None:
+            self.selectorFieldStartPosition = value
+        return self
+
+    def getStaticPart(self):
+        return self.staticPart
+
+    def setStaticPart(self, value):
+        if value is not None:
+            self.staticPart = value
+        return self
+
+    def getTriggerMode(self):
+        return self.triggerMode
+
+    def setTriggerMode(self, value):
+        if value is not None:
+            self.triggerMode = value
+        return self
+
+    def getUnusedBitPattern(self):
+        return self.unusedBitPattern
+
+    def setUnusedBitPattern(self, value):
+        if value is not None:
+            self.unusedBitPattern = value
+        return self
+
+class UserDefinedIPdu(IPdu):
+    def __init__(self, parent, short_name):
+        super().__init__(parent, short_name)
+
+        self.cddType = None                                 # type: String
+
+    def getCddType(self):
+        return self.cddType
+
+    def setCddType(self, value):
+        if value is not None:
+            self.cddType = value
+        return self
+    
+class GeneralPurposeIPdu(IPdu):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+class UserDefinedPdu(Pdu):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.cddType = None                                     # type: String
+
+    def getCddType(self):
+        return self.cddType
+
+    def setCddType(self, value):
+        if value is not None:
+            self.cddType = value
+        return self
+
+class GeneralPurposePdu(Pdu):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.hasDynamicLength = None                            # type: Boolean
+        self.length = None                                      # type: UnlimitedInteger
+
+    def getHasDynamicLength(self):
+        return self.hasDynamicLength
+
+    def setHasDynamicLength(self, value):
+        if value is not None:
+            self.hasDynamicLength = value
+        return self
+
+    def getLength(self):
+        return self.length
+
+    def setLength(self, value):
+        if value is not None:
+            self.length = value
+        return self
+
+class SecureCommunicationPropsSet(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        # type: List[SecureCommunicationAuthenticationProps]
+        self.authenticationProps = []
+        # type: List[SecureCommunicationFreshnessProps]
+        self.freshnessProps = []
+
+    def getAuthenticationProps(self):
+        return self.authenticationProps
+
+    def addAuthenticationProp(self, value):
+        if value is not None:
+            self.authenticationProps.append(value)
+        return self
+
+    def getFreshnessProps(self):
+        return self.freshnessProps
+
+    def addFreshnessProp(self, value):
+        if value is not None:
+            self.freshnessProps.append(value)
+        return self

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

@@ -1,14 +1,13 @@
 from abc import ABCMeta
 from enum import Enum
 from typing import List
-
-from ......M2.AUTOSARTemplates.SWComponentTemplate.Communication import HandleInvalidEnum
-from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrameTriggering
-from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import LinFrameTriggering
-from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement, FrameTriggering, ISignalTriggering, PduTriggering
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, Boolean, PositiveInteger, RefType, ARLiteral, TimeValue
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARFloat, Boolean, PositiveInteger, PositiveUnlimitedInteger, RefType, ARLiteral, TimeValue
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrameTriggering
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import LinFrameTriggering, LinScheduleTable
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement, FrameTriggering, ISignalTriggering, PduTriggering
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.NetworkEndpoint import NetworkEndpoint
 
 class PhysicalChannel (Identifiable, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -80,7 +79,77 @@ class CanPhysicalChannel(AbstractCanPhysicalChannel):
 
 class LinPhysicalChannel(PhysicalChannel):
     def __init__(self, parent: ARObject, short_name: str):
-        super().__init__(parent, short_name) 
+        super().__init__(parent, short_name)
+
+        self.busIdleTimeoutPeriod = None                        # type: TimeValue
+        # type: List[LinScheduleTable]
+        self.scheduleTables = []
+
+    def getBusIdleTimeoutPeriod(self):
+        return self.busIdleTimeoutPeriod
+
+    def setBusIdleTimeoutPeriod(self, value):
+        if value is not None:
+            self.busIdleTimeoutPeriod = value
+        return self
+
+    def getScheduleTables(self):
+        return self.scheduleTables
+
+    def createLinScheduleTable(self, short_name:str) -> LinScheduleTable:
+        if (short_name not in self.elements):
+            end_point = LinScheduleTable(self, short_name)
+            self.addElement(end_point)
+            self.scheduleTables.append(end_point)
+        return self.getElement(short_name)
+    
+class VlanConfig(Identifiable):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.vlanIdentifier = None                              # type: PositiveInteger
+
+    def getVlanIdentifier(self):
+        return self.vlanIdentifier
+
+    def setVlanIdentifier(self, value):
+        if value is not None:
+            self.vlanIdentifier = value
+        return self
+class EthernetPhysicalChannel(PhysicalChannel):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+        self.networkEndpoints = []                              # type: List[NetworkEndpoint]
+        self.soAdConfig = None                                  # type: SoAdConfig
+        self.vlan = None                                        # type: VlanConfig
+
+    def getNetworkEndpoints(self):
+        return self.networkEndpoints
+
+    def createNetworkEndPoint(self, short_name:str) -> NetworkEndpoint:
+        if (short_name not in self.elements):
+            end_point = NetworkEndpoint(self, short_name)
+            self.addElement(end_point)
+            self.networkEndpoints.append(end_point)
+        return self.getElement(short_name)
+
+    def getSoAdConfig(self):
+        return self.soAdConfig
+
+    def setSoAdConfig(self, value):
+        self.soAdConfig = value
+        return self
+
+    def getVlan(self):
+        return self.vlan
+
+    def createVlanConfig(self, short_name: str) -> VlanConfig:
+        if (short_name not in self.elements):
+            config = VlanConfig(self, short_name)
+            self.vlan = config
+            self.addElement(config)
+        return self.getElement(short_name)  
 
 class CommunicationCluster(FibexElement, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -109,6 +178,9 @@ class CommunicationCluster(FibexElement, metaclass = ABCMeta):
     def getLinPhysicalChannels(self) -> List[LinPhysicalChannel]:
         return list(sorted(filter(lambda a: isinstance(a, LinPhysicalChannel), self.elements.values()), key= lambda o:o.getShortName()))
     
+    def getEthernetPhysicalChannels(self) -> List[EthernetPhysicalChannel]:
+        return list(sorted(filter(lambda a: isinstance(a, EthernetPhysicalChannel), self.elements.values()), key= lambda o:o.getShortName()))
+    
     def createCanPhysicalChannel(self, short_name: str):
         if (short_name not in self.elements):
             channel = CanPhysicalChannel(self, short_name)
@@ -120,6 +192,12 @@ class CommunicationCluster(FibexElement, metaclass = ABCMeta):
             channel = LinPhysicalChannel(self, short_name)
             self.addElement(channel)
         return self.getElement(short_name)
+    
+    def createEthernetPhysicalChannel(self, short_name: str):
+        if (short_name not in self.elements):
+            channel = EthernetPhysicalChannel(self, short_name)
+            self.addElement(channel)
+        return self.getElement(short_name)
 
     def getProtocolName(self):
         return self.protocolName
@@ -133,8 +211,58 @@ class CommunicationCluster(FibexElement, metaclass = ABCMeta):
 
     def setProtocolVersion(self, value):
         self.protocolVersion = value
-        return self      
+        return self
     
+class CanClusterBusOffRecovery(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.borCounterL1ToL2 = None                            # type: PositiveInteger
+        self.borTimeL1 = None                                   # type: TimeValue
+        self.borTimeL2 = None                                   # type: TimeValue
+        self.borTimeTxEnsured = None                            # type: TimeValue
+        self.mainFunctionPeriod = None                          # type: TimeValue
+
+    def getBorCounterL1ToL2(self):
+        return self.borCounterL1ToL2
+
+    def setBorCounterL1ToL2(self, value):
+        if value is not None:
+            self.borCounterL1ToL2 = value
+        return self
+
+    def getBorTimeL1(self):
+        return self.borTimeL1
+
+    def setBorTimeL1(self, value):
+        if value is not None:
+            self.borTimeL1 = value
+        return self
+
+    def getBorTimeL2(self):
+        return self.borTimeL2
+
+    def setBorTimeL2(self, value):
+        if value is not None:
+            self.borTimeL2 = value
+        return self
+
+    def getBorTimeTxEnsured(self):
+        return self.borTimeTxEnsured
+
+    def setBorTimeTxEnsured(self, value):
+        if value is not None:
+            self.borTimeTxEnsured = value
+        return self
+
+    def getMainFunctionPeriod(self):
+        return self.mainFunctionPeriod
+
+    def setMainFunctionPeriod(self, value):
+        if value is not None:
+            self.mainFunctionPeriod = value
+        return self
+
 class AbstractCanCluster(CommunicationCluster, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         if type(self) == AbstractCanCluster:
@@ -142,10 +270,10 @@ class AbstractCanCluster(CommunicationCluster, metaclass = ABCMeta):
         
         super().__init__(parent, short_name)
 
-        self.busOffRecovery = None
-        self.canFdBaudrate = None
-        self.canXlBaudrate = None
-        self.speed = None
+        self.busOffRecovery = None                              # type: CanClusterBusOffRecovery
+        self.canFdBaudrate = None                               # type: PositiveUnlimitedInteger
+        self.canXlBaudrate = None                               # type: PositiveUnlimitedInteger
+        self.speed = None                                       # type: PositiveUnlimitedInteger
 
     def getBusOffRecovery(self):
         return self.busOffRecovery

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

@@ -1,8 +1,9 @@
-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
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import FibexElement
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import CommunicationConnector, CommunicationController
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinTopology import LinCommunicationConnector, LinMaster
 from typing import List
 
 class EcuInstance(FibexElement):
@@ -105,17 +106,41 @@ class EcuInstance(FibexElement):
     def createCanCommunicationController(self, short_name: str) -> CanCommunicationController:
         if (short_name not in self.elements):
             controller = CanCommunicationController(self, short_name)
-            self.elements[short_name] = controller
-        return self.elements[short_name]
+            self.addElement(controller)
+        return self.getElement(short_name)
+    
+    def createEthernetCommunicationController(self, short_name: str) -> EthernetCommunicationController:
+        if (short_name not in self.elements):
+            controller = EthernetCommunicationController(self, short_name)
+            self.addElement(controller)
+        return self.getElement(short_name)
+    
+    def createLinMaster(self, short_name: str) -> LinMaster:
+        if (short_name not in self.elements):
+            controller = LinMaster(self, short_name)
+            self.addElement(controller)
+        return self.getElement(short_name)
 
     def getConnectors(self):
         return list(sorted(filter(lambda a: isinstance(a, CommunicationConnector), self.elements.values()), key= lambda o:o.short_name))
 
     def createCanCommunicationConnector(self, short_name: str) -> CanCommunicationConnector:
         if (short_name not in self.elements):
-            controller = CanCommunicationConnector(self, short_name)
-            self.elements[short_name] = controller
-        return self.elements[short_name]
+            connector = CanCommunicationConnector(self, short_name)
+            self.addElement(connector)
+        return self.getElement(short_name)
+    
+    def createEthernetCommunicationConnector(self, short_name: str) -> EthernetCommunicationConnector:
+        if (short_name not in self.elements):
+            connector = EthernetCommunicationConnector(self, short_name)
+            self.addElement(connector)
+        return self.getElement(short_name)
+    
+    def createLinCommunicationConnector(self, short_name: str) -> LinCommunicationConnector:
+        if (short_name not in self.elements):
+            connector = LinCommunicationConnector(self, short_name)
+            self.addElement(connector)
+        return self.getElement(short_name)
 
     def getDltConfig(self):
         return self.dltConfig

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

@@ -1,3 +1,4 @@
+from typing import List
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Describable
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Integer, RefType, TimeValue
@@ -109,8 +110,7 @@ class TransmissionModeTiming(ARObject):
         super().__init__()
 
         self.cyclicTiming = None                                # type: CyclicTiming
-        # type: EventControlledTiming
-        self.eventControlledTiming = None
+        self.eventControlledTiming = None                       # type: EventControlledTiming
 
     def getCyclicTiming(self):
         return self.cyclicTiming
@@ -130,16 +130,11 @@ class TransmissionModeDeclaration(ARObject):
     def __init__(self):
         super().__init__()
 
-        # type: ModeDrivenTransmissionModeCondition
-        self.modeDrivenFalseConditions = []
-        # type: ModeDrivenTransmissionModeCondition
-        self.modeDrivenTrueConditions = []
-        # type: TransmissionModeCondition
-        self.transmissionModeConditions = []
-        # type: TransmissionModeTiming
-        self.transmissionModeFalseTiming = None
-        # type: TransmissionModeTiming
-        self.transmissionModeTrueTiming = None
+        self.modeDrivenFalseConditions = []                         # type: List[ModeDrivenTransmissionModeCondition]
+        self.modeDrivenTrueConditions = []                          # type: List[ModeDrivenTransmissionModeCondition]
+        self.transmissionModeConditions = []                        # typeL List[TransmissionModeCondition]
+        self.transmissionModeFalseTiming = None                     # type: TransmissionModeTiming
+        self.transmissionModeTrueTiming = None                      # type: TransmissionModeTiming
 
     def getModeDrivenFalseConditions(self):
         return self.modeDrivenFalseConditions