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

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

@@ -156,9 +156,9 @@ class ImplementationDataType(AbstractImplementationDataType):
         return self._struct_type
     
     def createSymbolProps(self, short_name: str) -> SymbolProps:
-        if short_name not in self.element:
+        if short_name not in self.elements:
             symbol_props = SymbolProps(self, short_name)
-            self.elements[short_name] = symbol_props
+            self.addElement(symbol_props)
             self.symbolProps = symbol_props
         return self.symbolProps
     

armodel/models/M2/AUTOSARTemplates/CommonStructure/ResourceConsumption/MemorySectionUsage.py

@@ -56,6 +56,7 @@ class MemorySection(Identifiable):
 
     @alignment.setter
     def alignment(self, value: ARLiteral):
+        '''
         if value is not None and value.getValue() != "":
             match = False
             if value.getValue() in ("UNKNOWN", "UNSPECIFIED", "BOOLEAN", "PTR"):
@@ -69,6 +70,9 @@ class MemorySection(Identifiable):
 
             if not match:
                 raise ValueError("Invalid alignment <%s> of memory section <%s>" % (value, self.getShortName()))
+        '''
+        if value is not None:
+            self._alignment = value
 
     def addOption(self, option: ARLiteral):
         self.options.append(option)

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

@@ -40,7 +40,7 @@ from .....M2.AUTOSARTemplates.ECUCDescriptionTemplate import EcucModuleConfigura
 from .....M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ClientServerInterface, ModeSwitchInterface, ParameterInterface, PortInterfaceMappingSet, SenderReceiverInterface, TriggerInterface
 from .....M2.AUTOSARTemplates.SystemTemplate import System
 from .....M2.AUTOSARTemplates.SystemTemplate.NetworkManagement import NmConfig
-from .....M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import CanTpConfig, DoIpTpConfig
+from .....M2.AUTOSARTemplates.SystemTemplate.TransportProtocols import CanTpConfig, DoIpTpConfig, LinTpConfig
 
 class ReferenceBase(ARObject):
     def __init__(self):
@@ -390,6 +390,12 @@ class ARPackage(Identifiable, CollectableElement):
             element = CanTpConfig(self, short_name)
             self.addElement(element)
         return self.getElement(short_name)
+    
+    def createLinTpConfig(self, short_name: str) -> LinTpConfig:
+        if (short_name not in self.elements):
+            element = LinTpConfig(self, short_name)
+            self.addElement(element)
+        return self.getElement(short_name)
 
     def createCanFrame(self, short_name: str) -> CanFrame:
         if (short_name not in self.elements):

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

@@ -493,5 +493,18 @@ class Ip6AddressString(ARLiteral):
             * xml.xsd.pattern=[0-9A-Fa-f]{1,4}(:[0-9A-Fa-f]{1,4}){7,7}|ANY
             * xml.xsd.type=string
     '''
+    def __init__(self):
+        super().__init__()
+
+class MacAddressString(ARLiteral):
+    '''
+        This primitive specifies a Mac Address. Notation: FF:FF:FF:FF:FF:FF
+        Alternative notations, e.g. using dash instead of colon, or another grouping of numbers, is not allowed.
+        
+        Tags:
+            * xml.xsd.customType=MAC-ADDRESS-STRING
+            * xml.xsd.pattern=([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}
+            * xml.xsd.type=string
+    '''
     def __init__(self):
         super().__init__()

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

@@ -1,9 +1,172 @@
 from abc import ABCMeta
 
-from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, Float, Integer, PositiveInteger, PositiveUnlimitedInteger
+from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Boolean, Float, Integer, PositiveInteger, PositiveUnlimitedInteger, TimeValue
 from ......M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
 from ......M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreTopology import CommunicationConnector, CommunicationController
 
+class CanControllerFdConfiguration(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.paddingValue = None                                        # type: PositiveInteger
+        self.propSeg = None                                             # type: PositiveInteger
+        self.sspOffset = None                                           # type: PositiveInteger
+        self.syncJumpWidth = None                                       # type: PositiveInteger
+        self.timeSeg1 = None                                            # type: PositiveInteger
+        self.timeSeg2 = None                                            # type: PositiveInteger
+        self.txBitRateSwitch = None                                     # type: Boolean
+
+    def getPaddingValue(self):
+        return self.paddingValue
+
+    def setPaddingValue(self, value):
+        if value is not None:
+            self.paddingValue = value
+        return self
+
+    def getPropSeg(self):
+        return self.propSeg
+
+    def setPropSeg(self, value):
+        if value is not None:
+            self.propSeg = value
+        return self
+
+    def getSspOffset(self):
+        return self.sspOffset
+
+    def setSspOffset(self, value):
+        if value is not None:
+            self.sspOffset = value
+        return self
+
+    def getSyncJumpWidth(self):
+        return self.syncJumpWidth
+
+    def setSyncJumpWidth(self, value):
+        if value is not None:
+            self.syncJumpWidth = value
+        return self
+
+    def getTimeSeg1(self):
+        return self.timeSeg1
+
+    def setTimeSeg1(self, value):
+        if value is not None:
+            self.timeSeg1 = value
+        return self
+
+    def getTimeSeg2(self):
+        return self.timeSeg2
+
+    def setTimeSeg2(self, value):
+        if value is not None:
+            self.timeSeg2 = value
+        return self
+
+    def getTxBitRateSwitch(self):
+        return self.txBitRateSwitch
+
+    def setTxBitRateSwitch(self, value):
+        if value is not None:
+            self.txBitRateSwitch = value
+        return self
+
+class CanControllerFdConfigurationRequirements(ARObject):
+    def __init__(self):
+        super().__init__()
+
+        self.maxNumberOfTimeQuantaPerBit = None                         # type: Integer
+        self.maxSamplePoint = None                                      # type: Float
+        self.maxSyncJumpWidth = None                                    # type: Float
+        self.maxTrcvDelayCompensationOffset = None                      # type: TimeValue
+        self.minNumberOfTimeQuantaPerBit = None                         # type: Integer
+        self.minSamplePoint = None                                      # type: Float
+        self.minSyncJumpWidth = None                                    # type: Float
+        self.minTrcvDelayCompensationOffset = None                      # type: TimeValue
+        self.paddingValue = None                                        # type: PositiveInteger
+        self.txBitRateSwitch = None                                     # type: Boolean
+
+    def getMaxNumberOfTimeQuantaPerBit(self):
+        return self.maxNumberOfTimeQuantaPerBit
+
+    def setMaxNumberOfTimeQuantaPerBit(self, value):
+        if value is not None:
+            self.maxNumberOfTimeQuantaPerBit = value
+        return self
+
+    def getMaxSamplePoint(self):
+        return self.maxSamplePoint
+
+    def setMaxSamplePoint(self, value):
+        if value is not None:
+            self.maxSamplePoint = value
+        return self
+
+    def getMaxSyncJumpWidth(self):
+        return self.maxSyncJumpWidth
+
+    def setMaxSyncJumpWidth(self, value):
+        if value is not None:
+            self.maxSyncJumpWidth = value
+        return self
+
+    def getMaxTrcvDelayCompensationOffset(self):
+        return self.maxTrcvDelayCompensationOffset
+
+    def setMaxTrcvDelayCompensationOffset(self, value):
+        if value is not None:
+            self.maxTrcvDelayCompensationOffset = value
+        return self
+
+    def getMinNumberOfTimeQuantaPerBit(self):
+        return self.minNumberOfTimeQuantaPerBit
+
+    def setMinNumberOfTimeQuantaPerBit(self, value):
+        if value is not None:
+            self.minNumberOfTimeQuantaPerBit = value
+        return self
+
+    def getMinSamplePoint(self):
+        return self.minSamplePoint
+
+    def setMinSamplePoint(self, value):
+        if value is not None:
+            self.minSamplePoint = value
+        return self
+
+    def getMinSyncJumpWidth(self):
+        return self.minSyncJumpWidth
+
+    def setMinSyncJumpWidth(self, value):
+        if value is not None:
+            self.minSyncJumpWidth = value
+        return self
+
+    def getMinTrcvDelayCompensationOffset(self):
+        return self.minTrcvDelayCompensationOffset
+
+    def setMinTrcvDelayCompensationOffset(self, value):
+        if value is not None:
+            self.minTrcvDelayCompensationOffset = value
+        return self
+
+    def getPaddingValue(self):
+        return self.paddingValue
+
+    def setPaddingValue(self, value):
+        if value is not None:
+            self.paddingValue = value
+        return self
+
+    def getTxBitRateSwitch(self):
+        return self.txBitRateSwitch
+
+    def setTxBitRateSwitch(self, value):
+        if value is not None:
+            self.txBitRateSwitch = value
+        return self
+
 class AbstractCanCommunicationControllerAttributes(ARObject, metaclass = ABCMeta):
     def __init__(self):
         super().__init__()
@@ -94,8 +257,6 @@ class CanControllerConfigurationRequirements(AbstractCanCommunicationControllerA
         self.minSyncJumpWidth = value
         return self
 
-
-
 class AbstractCanCommunicationController(CommunicationController, metaclass = ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         if type(self) == AbstractCanCommunicationController:
@@ -111,7 +272,7 @@ class AbstractCanCommunicationController(CommunicationController, metaclass = AB
     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)