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

armodel/cli/arxml_format_cli.py

@@ -8,17 +8,7 @@ from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..parser.arxml_parser import ARXMLParser
 from ..writer import ARXMLWriter
 
-def main():
-    version = pkg_resources.require("armodel")[0].version
-
-    ap = argparse.ArgumentParser()
-    ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
-    ap.add_argument("-w", "--warning", required= False, help= "Skip the error and report it as warning message", action= "store_true")
-    ap.add_argument("INPUT", help = "The path of AUTOSAR ARXML file")
-    ap.add_argument("OUTPUT", help = "The path of output ARXML file")
-
-    args = ap.parse_args()
-
+def perform_format(args):
     logger = logging.getLogger()
     
     formatter = logging.Formatter('[%(levelname)s] : %(message)s')
@@ -64,5 +54,18 @@ def main():
         logger.error(e)
         raise e
 
+def main():
+    version = pkg_resources.require("armodel")[0].version
+
+    ap = argparse.ArgumentParser()
+    ap.add_argument("-v", "--verbose", required= False, help= "Print debug information", action= "store_true")
+    ap.add_argument("-w", "--warning", required= False, help= "Skip the error and report it as warning message", action= "store_true")
+    ap.add_argument("INPUT", help = "The path of AUTOSAR ARXML file")
+    ap.add_argument("OUTPUT", help = "The path of output ARXML file")
+
+    args = ap.parse_args()
+
+    perform_format(args)
+
 if __name__ == "__main__":
     main()

armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswBehavior.py

@@ -1,5 +1,5 @@
 from ....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
-from ....M2.AUTOSARTemplates.CommonStructure.SwcInternalBehavior.ModeDeclarationGroup import IncludedModeDeclarationGroupSet
+from ....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import IncludedModeDeclarationGroupSet
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean, ARFloat, ARNumerical
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject

armodel/models/M2/AUTOSARTemplates/CommonStructure/Filter.py

@@ -0,0 +1,86 @@
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import AREnum, PositiveInteger, UnlimitedInteger
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+
+
+class DataFilterTypeEnum(AREnum):
+
+    maskedNewDiffersMaskedOld = "maskedNewDiffersMaskedOld"
+    maskedNewDiffersX = "maskedNewDiffersX"
+    maskedNewEqualsX = "maskedNewEqualsX"
+    never = "never"
+    newIsOutside = "newIsOutside"
+    newIsWithin = "newIsWithin"
+    oneEveryN = "oneEveryN"
+
+    def __init__(self):
+        super().__init__((
+            self.maskedNewDiffersMaskedOld,
+            self.maskedNewDiffersX,
+            self.maskedNewEqualsX, 
+            self.never,
+            self.newIsOutside,
+            self.newIsWithin,
+            self.oneEveryN
+        ))
+
+
+class DataFilter(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.dataFilterType = None                  # type: DataFilterTypeEnum
+        self.mask = None                            # type: UnlimitedInteger
+        self.max = None                             # type: UnlimitedInteger
+        self.min = None                             # type: UnlimitedInteger
+        self.offset = None                          # type: PositiveInteger
+        self.period = None                          # type: PositiveInteger
+        self.x = None                               # type: UnlimitedInteger
+
+    def getDataFilterType(self):
+        return self.dataFilterType
+
+    def setDataFilterType(self, value):
+        self.dataFilterType = value
+        return self
+
+    def getMask(self):
+        return self.mask
+
+    def setMask(self, value):
+        self.mask = value
+        return self
+
+    def getMax(self):
+        return self.max
+
+    def setMax(self, value):
+        self.max = value
+        return self
+
+    def getMin(self):
+        return self.min
+
+    def setMin(self, value):
+        self.min = value
+        return self
+
+    def getOffset(self):
+        return self.offset
+
+    def setOffset(self, value):
+        self.offset = value
+        return self
+
+    def getPeriod(self):
+        return self.period
+
+    def setPeriod(self, value):
+        self.period = value
+        return self
+
+    def getX(self):
+        return self.x
+
+    def setX(self, value):
+        self.x = value
+        return self

armodel/models/M2/AUTOSARTemplates/CommonStructure/InternalBehavior.py

@@ -7,10 +7,9 @@ from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTy
 from ....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ParameterDataPrototype
 
 class ReentrancyLevelEnum(Enum):
-    multicoreReentrant = "multicoreReentrant"
-    nonReentrant = "nonReentrant"
-    singleCoreReentrant = "singleCoreReentrant"
-
+    ENUM_MULTICORE_REENTRANT = "multicoreReentrant"
+    ENUM_NON_REENTRANT = "nonReentrant"
+    ENUM_SINGLE_CORE_REENTRANT = "singleCoreReentrant"
 
 class ExclusiveArea(Identifiable):
     def __init__(self, parent: ARObject, short_name: str):

armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ARPackage.py

@@ -1,4 +1,6 @@
 from typing import Dict, List
+
+from ...SystemTemplate.Fibex.FibexCore.EcuInstance import EcuInstance
 from .....M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingExtensions import SwcTiming
 from .....M2.AUTOSARTemplates.SWComponentTemplate.Components import CompositionSwComponentType, ServiceSwComponentType, SwComponentType, ApplicationSwComponentType, AtomicSwComponentType, ComplexDeviceDriverSwComponentType, EcuAbstractionSwComponentType, SensorActuatorSwComponentType
 from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Ethernet.EthernetFrame import GenericEthernetFrame
@@ -22,7 +24,7 @@ from .....M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndT
 from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Can.CanCommunication import CanFrame
 from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Multiplatform import Gateway
 from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import DcmIPdu, ISignal, ISignalGroup, ISignalIPdu, ISignalIPduGroup, NPdu, NmPdu, SecuredIPdu, SystemSignal, SystemSignalGroup
-from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import CanCluster, EcuInstance, LinCluster
+from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import CanCluster, LinCluster
 from .....M2.AUTOSARTemplates.SystemTemplate.Fibex.Fibex4Lin.LinCommunication import LinUnconditionalFrame
 from .....M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping
 from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import SwcImplementation

armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/PrimitiveTypes.py

@@ -1,5 +1,6 @@
 from abc import ABCMeta
 import re
+from typing import List
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 
 class ARType(metaclass = ABCMeta):
@@ -101,6 +102,16 @@ class ARFloat(ARNumerical):
         else:
             return str(self._value)
         
+class Float(ARFloat):
+    '''
+        An instance of Float is an element from the set of real numbers.
+        Tags:
+            * xml.xsd.customType=FLOAT
+            * xml.xsd.type=double
+    '''
+    def __init__(self):
+        super().__init__()
+        
 class TimeValue(ARFloat):
     '''
         This primitive type is taken for expressing time values. The numerical value is supposed to be interpreted
@@ -137,6 +148,23 @@ class ARLiteral(ARType):
     def upper(self) -> str:
         return self.value.upper()
 
+class AREnum(ARLiteral):
+    def __init__(self, enum_values: List[str]):
+        super().__init__()
+        
+        self.enumValues = enum_values                # List[str]
+
+    def getEnumValues(self):
+        return self.enumValues
+
+    def setEnumValues(self, values: List[str]):
+        self.enumValues = values
+        return self
+
+    def validateEnumValue(self, value: str):
+        if value in self.enumValues:
+            return True
+        return False
 
 class String(ARLiteral):
     
@@ -177,9 +205,9 @@ class ARBoolean(ARType):
 
     def _convertStringToBoolean(self, value: str) -> bool:
         value = value.lower()
-        if value == "true":
+        if value == "true" or value == "1":
             return True
-        elif value == "false":
+        elif value == "false" or value == "0":
             return False
         else:
             return self._convertNumberToBoolean(int(value))
@@ -239,6 +267,16 @@ class PositiveInteger(ARPositiveInteger):
     def __init__(self):
         super().__init__()
 
+class PositiveUnlimitedInteger(ARPositiveInteger):
+    '''
+        This is a positive unlimited integer which can be denoted in decimal, binary, octal and hexadecimal.
+        
+        Tags:
+            * xml.xsd.customType=POSITIVE-UNLIMITED-INTEGER
+            * xml.xsd.pattern=0|[\+]?[1-9][0-9]*|0[xX][0-9a-fA-F]+|0[bB][0-1]+|0[0-7]+
+            * xml.xsd.type=string
+    '''        
+
 class Integer(ARNumerical):
     '''
         An instance of Integer is an element in the set of integer numbers ( ..., -2, -1, 0, 1, 2, ...).
@@ -254,6 +292,21 @@ class Integer(ARNumerical):
     def __init__(self):
         super().__init__()
 
+class UnlimitedInteger(Integer):
+    '''
+        An instance of UnlimitedInteger is an element in the set of integer numbers ( ..., -2, -1, 0, 1, 2, ...).
+        The range is limited by constraint 2534.
+        The value can be expressed in decimal, octal, hexadecimal and binary representation. Negative numbers
+        can only be expressed in decimal notation.
+        
+        Tags:
+            * xml.xsd.customType=UNLIMITED-INTEGER
+            * xml.xsd.pattern=0|[\+\-]?[1-9][0-9]*|0[xX][0-9a-fA-F]+|0[bB][0-1]+|0[0-7]+
+            * xml.xsd.type=string
+    '''
+    def __init__(self):
+        super().__init__()
+
 class Boolean(ARBoolean):
     '''
         A Boolean value denotes a logical condition that is either 'true' or 'false'. It can be one of "0", "1", "true",
@@ -282,6 +335,21 @@ class Identifier(ARLiteral):
     '''
     def __init__(self):
         super().__init__()
+
+class RevisionLabelString(ARLiteral):
+    '''
+        This primitive represents an internal AUTOSAR revision label which identifies an engineering object. It
+        represents a pattern which
+            * supports three integers representing from left to right MajorVersion, MinorVersion, PatchVersion.
+            * may add an application specific suffix separated by one of ".", "_", ";".
+        Legal patterns are for example:
+            * 4.0.0
+            * 4.0.0.1234565
+            * 4.0.0_vendor specific;13
+            * 4.0.0;12
+    '''
+
+    
 class Limit(ARObject):
     def __init__(self):
         super().__init__()

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Communication.py

@@ -1,14 +1,27 @@
 from abc import ABCMeta
 from typing import List
+from ....M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps
+from ....M2.AUTOSARTemplates.CommonStructure import ValueSpecification
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import AREnum, ARLiteral, ARNumerical, ARPositiveInteger
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
+from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
+from ....M2.AUTOSARTemplates.SWComponentTemplate.PortInterface.InstanceRefs import ApplicationCompositeElementInPortInterfaceInstanceRef
+
+class HandleInvalidEnum(AREnum):
+    DONT_INVALIDATE = "dontInvalidate"
+    EXTERNAL_REPLACEMENT = "externalReplacement"
+    KEEP = "keep"
+    REPLACE = "replace"
 
-from armodel.models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface.InstanceRefs import ApplicationCompositeElementInPortInterfaceInstanceRef
-
-from ..GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, ARPositiveInteger
-from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean
-from ..GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
-from ...MSR.DataDictionary.DataDefProperties import SwDataDefProps
-from ..CommonStructure import ValueSpecification
+    def __init__(self):
+        super().__init__((
+            HandleInvalidEnum.DONT_INVALIDATE,
+            HandleInvalidEnum.EXTERNAL_REPLACEMENT,
+            HandleInvalidEnum.KEEP,
+            HandleInvalidEnum.REPLACE
+        ))
+    
 
 class PPortComSpec(ARObject, metaclass = ABCMeta):
     """

armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ModeDeclarationGroup.py

@@ -1,3 +1,5 @@
+from armodel.models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, RefType
+from typing import List
 from .....M2.AUTOSARTemplates.SWComponentTemplate.RPTScenario import ModeAccessPointIdent
 from .....M2.AUTOSARTemplates.SWComponentTemplate.Components.InstanceRefs import PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef
 from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.AccessCount import AbstractAccessPoint
@@ -36,3 +38,25 @@ class ModeSwitchPoint(AbstractAccessPoint):
     def setModeGroupIRef(self, value):
         self.modeGroupIRef = value
         return self
+
+
+class IncludedModeDeclarationGroupSet(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.mode_declaration_group_refs = []           # type: List[RefType]
+        self.prefix = None                              # type: ARLiteral
+
+    def addModeDeclarationGroupRef(self, ref: RefType):
+        self.mode_declaration_group_refs.append(ref)
+        return self
+
+    def getModeDeclarationGroupRefs(self) -> List[RefType]:
+        return self.mode_declaration_group_refs
+
+    def setPrefix(self, prefix: str):
+        self.prefix = prefix
+        return self
+
+    def getPrefix(self) -> ARLiteral:
+        return self.prefix

armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Can/CanTopology.py

@@ -0,0 +1,173 @@
+from abc import ABCMeta
+
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, Float, Integer, PositiveInteger, PositiveUnlimitedInteger
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
+from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import CommunicationConnector, CommunicationController
+
+class AbstractCanCommunicationControllerAttributes(ARObject, metaclass = ABCMeta):
+    def __init__(self):
+        super().__init__()
+
+        self.canControllerFdAttributes = None                           # type: CanControllerFdConfiguration
+        self.canControllerFdRequirements = None                         # type: CanControllerFdConfigurationRequirements
+        self.canControllerXlAttributes = None                           # type: CanControllerXlConfiguration
+        self.canControllerXlRequirements = None                         # type: CanControllerXlConfigurationRequirements
+
+    def getCanControllerFdAttributes(self):
+        return self.canControllerFdAttributes
+
+    def setCanControllerFdAttributes(self, value):
+        self.canControllerFdAttributes = value
+        return self
+
+    def getCanControllerFdRequirements(self):
+        return self.canControllerFdRequirements
+
+    def setCanControllerFdRequirements(self, value):
+        self.canControllerFdRequirements = value
+        return self
+
+    def getCanControllerXlAttributes(self):
+        return self.canControllerXlAttributes
+
+    def setCanControllerXlAttributes(self, value):
+        self.canControllerXlAttributes = value
+        return self
+
+    def getCanControllerXlRequirements(self):
+        return self.canControllerXlRequirements
+
+    def setCanControllerXlRequirements(self, value):
+        self.canControllerXlRequirements = value
+        return self
+
+class CanControllerConfigurationRequirements(AbstractCanCommunicationControllerAttributes):
+    def __init__(self):
+        super().__init__()
+
+        self.maxNumberOfTimeQuantaPerBit = None                         # type: Integer
+        self.maxSamplePoint = None                                      # type: Float
+        self.maxSyncJumpWidth = None                                    # type: Float
+        self.minNumberOfTimeQuantaPerBit = None                         # type: Integer
+        self.minSamplePoint = None                                      # type: Float
+        self.minSyncJumpWidth = None                                    # type: Float
+
+    def getMaxNumberOfTimeQuantaPerBit(self):
+        return self.maxNumberOfTimeQuantaPerBit
+
+    def setMaxNumberOfTimeQuantaPerBit(self, value):
+        self.maxNumberOfTimeQuantaPerBit = value
+        return self
+
+    def getMaxSamplePoint(self):
+        return self.maxSamplePoint
+
+    def setMaxSamplePoint(self, value):
+        self.maxSamplePoint = value
+        return self
+
+    def getMaxSyncJumpWidth(self):
+        return self.maxSyncJumpWidth
+
+    def setMaxSyncJumpWidth(self, value):
+        self.maxSyncJumpWidth = value
+        return self
+
+    def getMinNumberOfTimeQuantaPerBit(self):
+        return self.minNumberOfTimeQuantaPerBit
+
+    def setMinNumberOfTimeQuantaPerBit(self, value):
+        self.minNumberOfTimeQuantaPerBit = value
+        return self
+
+    def getMinSamplePoint(self):
+        return self.minSamplePoint
+
+    def setMinSamplePoint(self, value):
+        self.minSamplePoint = value
+        return self
+
+    def getMinSyncJumpWidth(self):
+        return self.minSyncJumpWidth
+
+    def setMinSyncJumpWidth(self, value):
+        self.minSyncJumpWidth = value
+        return self
+
+
+
+class AbstractCanCommunicationController(CommunicationController, metaclass = ABCMeta):
+    def __init__(self, parent: ARObject, short_name: str):
+        if type(self) == AbstractCanCommunicationController:
+            raise NotImplementedError("AbstractCanCommunicationController is an abstract class.")
+        
+        super().__init__(parent, short_name)
+
+        self.canControllerAttributes = None                             # type: AbstractCanCommunicationControllerAttributes
+
+    def getCanControllerAttributes(self):
+        return self.canControllerAttributes
+
+    def setCanControllerAttributes(self, value):
+        self.canControllerAttributes = value
+        return self
+
+class CanCommunicationController(AbstractCanCommunicationController):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)
+
+class AbstractCanCommunicationConnector(CommunicationConnector, metaclass = ABCMeta):
+    def __init__(self, parent: ARObject, short_name: str):
+        if type(self) == AbstractCanCommunicationConnector:
+            raise NotImplementedError("AbstractCanCommunicationConnector is an abstract class.")
+        
+        super().__init__(parent, short_name)
+
+class CanCommunicationConnector(AbstractCanCommunicationConnector):
+    def __init__(self, parent: ARObject, short_name: str):
+        super().__init__(parent, short_name)  
+
+        # type: PositiveInteger
+        self.pncWakeupCanId = None
+        self.pncWakeupCanIdExtended = None                          # type: Boolean
+        # type: PositiveInteger
+        self.pncWakeupCanIdMask = None
+        # type: PositiveUnlimitedInteger
+        self.pncWakeupDataMask = None
+        # type: PositiveInteger
+        self.pncWakeupDlc = None
+
+    def getPncWakeupCanId(self):
+        return self.pncWakeupCanId
+
+    def setPncWakeupCanId(self, value):
+        self.pncWakeupCanId = value
+        return self
+
+    def getPncWakeupCanIdExtended(self):
+        return self.pncWakeupCanIdExtended
+
+    def setPncWakeupCanIdExtended(self, value):
+        self.pncWakeupCanIdExtended = value
+        return self
+
+    def getPncWakeupCanIdMask(self):
+        return self.pncWakeupCanIdMask
+
+    def setPncWakeupCanIdMask(self, value):
+        self.pncWakeupCanIdMask = value
+        return self
+
+    def getPncWakeupDataMask(self):
+        return self.pncWakeupDataMask
+
+    def setPncWakeupDataMask(self, value):
+        self.pncWakeupDataMask = value
+        return self
+
+    def getPncWakeupDlc(self):
+        return self.pncWakeupDlc
+
+    def setPncWakeupDlc(self, value):
+        self.pncWakeupDlc = value
+        return self

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

@@ -1,9 +1,11 @@
 from abc import ABCMeta
 from typing import List
 
-from ....GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable, Describable
-from ....GenericStructure.GeneralTemplateClasses.ArObject import ARObject
-from ....GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, ARNumerical, ARPositiveInteger, RefType, ARBoolean
+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
 
 class FibexElement(Identifiable, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
@@ -279,14 +281,12 @@ class DcmIPdu(IPdu):
         self.diagPduType = value
         return self
 
-
 class IPduTiming(Describable):
     def __init__(self):
         super().__init__()
 
         self.minimumDelay = None                                # type: TimeValue
-        # type: TransmissionModeDeclaration
-        self.transmissionModeDeclaration = None
+        self.transmissionModeDeclaration = None                 # type: TransmissionModeDeclaration
 
     def getMinimumDelay(self):
         return self.minimumDelay