armodel 1.8.5__py3-none-any.whl → 1.8.7__py3-none-any.whl

armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py

@@ -18,7 +18,10 @@ from ...M2.AUTOSARTemplates.SWComponentTemplate.Components import AtomicSwCompon
 from ...M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import VariableDataPrototype
 from ...M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType
 from ...M2.AUTOSARTemplates.SystemTemplate import RootSwCompositionPrototype, System
+from ...M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import RunnableEntity
 from ...M2.AUTOSARTemplates.SystemTemplate.Fibex.FibexCore.CoreCommunication import SystemSignal, SystemSignalGroup
+from ...M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswSchedulableEntity, BswCalledEntity
+from ...M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
 
 
 class FileInfoComment(ARObject):
@@ -152,7 +155,26 @@ class AbstractAUTOSAR(CollectableElement):
     def getDestType(self, type) -> str:
         if isinstance(type, ImplementationDataType):
             return "IMPLEMENTATION-DATA-TYPE"
-        return ""
+        elif isinstance(type, ApplicationDataType):
+            return "APPLICATION-DATA-TYPE"
+        elif isinstance(type, AtomicSwComponentType):
+            return "ATOMIC-SW-COMPONENT-TYPE"
+        elif isinstance(type, CompositionSwComponentType):
+            return "COMPOSITION-SW-COMPONENT-TYPE"
+        elif isinstance(type, SystemSignal):
+            return "SYSTEM-SIGNAL"
+        elif isinstance(type, SystemSignalGroup):
+            return "SYSTEM-SIGNAL-GROUP"
+        elif isinstance(type, RunnableEntity):
+            return "RUNNABLE-ENTITY"
+        elif isinstance(type, BswSchedulableEntity):
+            return "BSW-SCHEDULABLE-ENTITY"
+        elif isinstance(type, BswModuleEntry):
+            return "BSW-MODULE-ENTRY"
+        elif isinstance(type, BswCalledEntity):
+            return "BSW-CALLED-ENTITY"
+
+        raise NotImplementedError("The type <%s> is not implemented for getDestType method" % type.__class__.__name__)
     
     def findAtomicSwComponentType(self, referred) -> AtomicSwComponentType:
         return self.find(referred)

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

@@ -2,8 +2,7 @@ from abc import ABCMeta
 from typing import List
 
 from ....M2.MSR.DataDictionary.DataDefProperties import SwImplPolicyEnum
-from ....M2.AUTOSARTemplates.CommonStructure.InternalBehavior import ExecutableEntity
-from ....M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
+from ....M2.AUTOSARTemplates.CommonStructure.InternalBehavior import AbstractEvent, ExecutableEntity, InternalBehavior
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import Identifiable
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARBoolean, AREnum, ARFloat, ARNumerical, Boolean
 from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import PositiveInteger, String, TimeValue
@@ -266,7 +265,7 @@ class BswInterruptEntity(BswModuleEntity):
         return self
 
 
-class BswEvent(Identifiable, metaclass=ABCMeta):
+class BswEvent(AbstractEvent, metaclass=ABCMeta):
     def __init__(self, parent: ARObject, short_name: str):
         if type(self) is BswEvent:
             raise NotImplementedError("BswEvent is an abstract class.")

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

@@ -1,4 +0,0 @@
-from .BswBehavior import *
-from .BswImplementation import *
-from .BswInterfaces import *
-from .BswOverview import *

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

@@ -216,6 +216,25 @@ class NvRequireComSpec(RPortComSpec):
     def __init__(self):
         super().__init__()
 
+        self.initValue: ValueSpecification = None
+        self.variableRef: RefType = None
+
+    def getInitValue(self):
+        return self.initValue
+    
+    def setInitValue(self, value: ValueSpecification):
+        if value is not None:
+            self.initValue = value
+        return self
+    
+    def getVariableRef(self):
+        return self.variableRef
+    
+    def setVariableRef(self, value: RefType):
+        if value is not None:
+            self.variableRef = value
+        return self
+
 
 class ParameterRequireComSpec(RPortComSpec):
     def __init__(self):
@@ -574,6 +593,39 @@ class ServerComSpec(PPortComSpec):
         if transformationComSpecProps is not None:
             self.transformationComSpecProps.append(transformationComSpecProps)
         return self
+
+
+class NvProvideComSpec(PPortComSpec):
+    def __init__(self):
+        super().__init__()
+
+        self.ramBlockInitValue: ValueSpecification = None
+        self.romBlockInitValue: ValueSpecification = None
+        self.variableRef: RefType = None
+
+    def getRamBlockInitValue(self):
+        return self.ramBlockInitValue
+    
+    def setRamBlockInitValue(self, value: ValueSpecification):
+        if value is not None:
+            self.ramBlockInitValue = value
+        return self
+    
+    def getRomBlockInitValue(self):
+        return self.romBlockInitValue
+    
+    def setRomBlockInitValue(self, value: ValueSpecification):
+        if value is not None:
+            self.romBlockInitValue = value
+        return self
+    
+    def getVariableRef(self):
+        return self.variableRef
+    
+    def setVariableRef(self, value: RefType):
+        if value is not None:
+            self.variableRef = value
+        return self
     
 
 class NonqueuedReceiverComSpec(ReceiverComSpec):

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

@@ -6,6 +6,7 @@ from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiab
 from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
 from .....M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps
 
+
 class ParameterAccess(AbstractAccessPoint):
     def __init__(self, parent: ARObject, short_name: str):
         super().__init__(parent, short_name)

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

@@ -86,6 +86,7 @@ class VariableInAtomicSWCTypeInstanceRef(AtpInstanceRef):
         self.targetDataPrototypeRef = value
         return self
     
+
 class ParameterInAtomicSWCTypeInstanceRef(AtpInstanceRef):
     def __init__(self):
         super().__init__()
@@ -131,13 +132,13 @@ class ParameterInAtomicSWCTypeInstanceRef(AtpInstanceRef):
         self.targetDataPrototypeRef = value
         return self
 
+
 class AutosarParameterRef(ARObject):
     def __init__(self):
         super().__init__()
-
-        # type: ParameterInAtomicSWCTypeInstanceRef
-        self.autosarParameterIRef = None
-        self.localParameterRef = None               # type: RefType
+        
+        self.autosarParameterIRef: ParameterInAtomicSWCTypeInstanceRef = None
+        self.localParameterRef: RefType = None               # type: RefType
 
     def getAutosarParameterIRef(self):
         return self.autosarParameterIRef

armodel/models/__init__.py

@@ -47,6 +47,7 @@ from .M2.AUTOSARTemplates.SWComponentTemplate.Composition import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.RPTScenario import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import *
+from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.AccessCount import *
 from .M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import *