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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. armodel/cli/arxml_dump_cli.py +2 -2
  2. armodel/models/M2/AUTOSARTemplates/AutosarTopLevelStructure.py +53 -16
  3. armodel/models/M2/AUTOSARTemplates/BswModuleTemplate/BswBehavior.py +41 -19
  4. armodel/models/M2/AUTOSARTemplates/CommonStructure/Filter.py +14 -14
  5. armodel/models/M2/AUTOSARTemplates/CommonStructure/ImplementationDataTypes.py +22 -11
  6. armodel/models/M2/AUTOSARTemplates/CommonStructure/ModeDeclaration.py +26 -9
  7. armodel/models/M2/AUTOSARTemplates/CommonStructure/ResourceConsumption/MemorySectionUsage.py +8 -0
  8. armodel/models/M2/AUTOSARTemplates/CommonStructure/ServiceNeeds.py +711 -27
  9. armodel/models/M2/AUTOSARTemplates/ECUCDescriptionTemplate.py +1 -1
  10. armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/ARPackage.py +91 -14
  11. armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/Identifiable.py +17 -4
  12. armodel/models/M2/AUTOSARTemplates/GenericStructure/GeneralTemplateClasses/PrimitiveTypes.py +78 -11
  13. armodel/models/M2/AUTOSARTemplates/GenericStructure/LifeCycles.py +5 -0
  14. armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Communication.py +41 -3
  15. armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Components/__init__.py +53 -15
  16. armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/Datatype/Datatypes.py +23 -8
  17. armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/PortInterface/__init__.py +44 -1
  18. armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/ServiceMapping.py +46 -5
  19. armodel/models/M2/AUTOSARTemplates/SWComponentTemplate/SwcInternalBehavior/__init__.py +56 -35
  20. armodel/models/M2/AUTOSARTemplates/SystemTemplate/Fibex/Fibex4Multiplatform.py +1 -1
  21. armodel/models/M2/MSR/AsamHdo/AdminData.py +34 -8
  22. armodel/models/M2/MSR/AsamHdo/ComputationMethod.py +170 -23
  23. armodel/models/M2/MSR/DataDictionary/AuxillaryObjects.py +4 -4
  24. armodel/models/M2/MSR/DataDictionary/RecordLayout.py +130 -37
  25. armodel/models/M2/MSR/Documentation/Annotation.py +1 -1
  26. armodel/models/M2/MSR/Documentation/TextModel/BlockElements/ListElements.py +54 -0
  27. armodel/models/M2/MSR/Documentation/TextModel/BlockElements/PaginationAndView.py +9 -0
  28. armodel/models/M2/MSR/Documentation/TextModel/BlockElements/__init__.py +25 -0
  29. armodel/models/M2/MSR/Documentation/TextModel/LanguageDataModel.py +33 -5
  30. armodel/models/M2/MSR/Documentation/TextModel/MultilanguageData.py +15 -2
  31. armodel/models/M2/MSR/Documentation/__init__.py +1 -1
  32. armodel/models/__init__.py +4 -1
  33. armodel/parser/abstract_arxml_parser.py +31 -15
  34. armodel/parser/arxml_parser.py +456 -237
  35. armodel/tests/test_armodel/models/test_ar_ref.py +7 -4
  36. armodel/tests/test_armodel/models/test_datatype.py +4 -4
  37. armodel/tests/test_armodel/models/test_m2_msr.py +5 -5
  38. armodel/tests/test_armodel/parser/test_sw_components.py +10 -1
  39. armodel/tests/test_armodel/parser/test_system.py +0 -1
  40. armodel/writer/abstract_arxml_writer.py +17 -8
  41. armodel/writer/arxml_writer.py +436 -195
  42. {armodel-1.7.0.dist-info → armodel-1.7.2.dist-info}/METADATA +29 -1
  43. {armodel-1.7.0.dist-info → armodel-1.7.2.dist-info}/RECORD +47 -43
  44. {armodel-1.7.0.dist-info → armodel-1.7.2.dist-info}/LICENSE +0 -0
  45. {armodel-1.7.0.dist-info → armodel-1.7.2.dist-info}/WHEEL +0 -0
  46. {armodel-1.7.0.dist-info → armodel-1.7.2.dist-info}/entry_points.txt +0 -0
  47. {armodel-1.7.0.dist-info → armodel-1.7.2.dist-info}/top_level.txt +0 -0
@@ -1,5 +1,5 @@
1
1
  from typing import List
2
- from .....M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import NvBlockNeeds, RoleBasedDataAssignment, ServiceNeeds
2
+ from .....M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import CryptoServiceNeeds, DiagnosticCommunicationManagerNeeds, DiagnosticEventNeeds, DiagnosticRoutineNeeds, DiagnosticValueNeeds, NvBlockNeeds, RoleBasedDataAssignment, ServiceNeeds
3
3
  from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
4
4
  from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Identifier, RefType
5
5
  from .....M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import ServiceDependency
@@ -24,7 +24,6 @@ class RoleBasedPortAssignment(ARObject):
24
24
  self.role = value
25
25
  return self
26
26
 
27
-
28
27
  class SwcServiceDependency(ServiceDependency):
29
28
  def __init__(self, parent: ARObject, short_name: str):
30
29
  super().__init__(parent, short_name)
@@ -46,12 +45,54 @@ class SwcServiceDependency(ServiceDependency):
46
45
 
47
46
  def createNvBlockNeeds(self, short_name: str) -> NvBlockNeeds:
48
47
  if (short_name not in self.elements):
49
- event = NvBlockNeeds(self, short_name)
50
- self.elements[short_name] = event
51
- return self.elements[short_name]
48
+ needs = NvBlockNeeds(self, short_name)
49
+ self.addElement(needs)
50
+ return self.getElement(short_name)
51
+
52
+ def createDiagnosticCommunicationManagerNeeds(self, short_name: str) -> DiagnosticCommunicationManagerNeeds:
53
+ if (short_name not in self.elements):
54
+ needs = DiagnosticCommunicationManagerNeeds(self, short_name)
55
+ self.addElement(needs)
56
+ return self.getElement(short_name)
57
+
58
+ def createDiagnosticRoutineNeeds(self, short_name: str) -> DiagnosticRoutineNeeds:
59
+ if (short_name not in self.elements):
60
+ needs = DiagnosticRoutineNeeds(self, short_name)
61
+ self.addElement(needs)
62
+ return self.getElement(short_name)
63
+
64
+ def createDiagnosticValueNeeds(self, short_name: str) -> DiagnosticValueNeeds:
65
+ if (short_name not in self.elements):
66
+ needs = DiagnosticValueNeeds(self, short_name)
67
+ self.addElement(needs)
68
+ return self.getElement(short_name)
69
+
70
+ def createDiagnosticEventNeeds(self, short_name: str) -> DiagnosticEventNeeds:
71
+ if (short_name not in self.elements):
72
+ needs = DiagnosticEventNeeds(self, short_name)
73
+ self.addElement(needs)
74
+ return self.getElement(short_name)
75
+
76
+ def createCryptoServiceNeeds(self, short_name: str) -> CryptoServiceNeeds:
77
+ if (short_name not in self.elements):
78
+ needs = CryptoServiceNeeds(self, short_name)
79
+ self.addElement(needs)
80
+ return self.getElement(short_name)
52
81
 
53
82
  def getNvBlockNeeds(self) -> List[NvBlockNeeds]:
54
83
  return sorted(filter(lambda c: isinstance(c, NvBlockNeeds), self.elements.values()), key=lambda e: e.short_name)
84
+
85
+ def getDiagnosticCommunicationManagerNeeds(self) -> List[DiagnosticCommunicationManagerNeeds]:
86
+ return sorted(filter(lambda c: isinstance(c, DiagnosticCommunicationManagerNeeds), self.elements.values()), key=lambda e: e.short_name)
87
+
88
+ def getDiagnosticRoutineNeeds(self) -> List[DiagnosticRoutineNeeds]:
89
+ return sorted(filter(lambda c: isinstance(c, DiagnosticRoutineNeeds), self.elements.values()), key=lambda e: e.short_name)
90
+
91
+ def getDiagnosticEventNeeds(self) -> List[DiagnosticEventNeeds]:
92
+ return sorted(filter(lambda c: isinstance(c, DiagnosticEventNeeds), self.elements.values()), key=lambda e: e.short_name)
93
+
94
+ def getCryptoServiceNeeds(self) -> List[CryptoServiceNeeds]:
95
+ return sorted(filter(lambda c: isinstance(c, CryptoServiceNeeds), self.elements.values()), key=lambda e: e.short_name)
55
96
 
56
97
  def getServiceNeeds(self) -> List[ServiceNeeds]:
57
98
  return sorted(filter(lambda c: isinstance(c, ServiceNeeds), self.elements.values()), key=lambda e: e.short_name)
@@ -1,11 +1,12 @@
1
1
  from typing import Dict, List
2
2
 
3
+ from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.AccessCount import AbstractAccessPoint
3
4
  from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PortAPIOptions import PortAPIOption
4
5
  from .....M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
5
6
  from .....M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes import ParameterDataPrototype, VariableDataPrototype
6
7
  from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
7
8
  from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PerInstanceMemory import PerInstanceMemory
8
- from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import DataReceivedEvent, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, RTEEvent, SwcModeSwitchEvent, TimingEvent
9
+ from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import AsynchronousServerCallReturnsEvent, DataReceivedEvent, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, RTEEvent, SwcModeSwitchEvent, TimingEvent
9
10
  from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServiceMapping import SwcServiceDependency
10
11
  from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, RefType, ARBoolean
11
12
  from .....M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import ParameterAccess, VariableAccess
@@ -27,12 +28,8 @@ class RunnableEntityArgument(ARObject):
27
28
  def setSymbol(self, value):
28
29
  self.symbol = value
29
30
  return self
30
-
31
- class AsynchronousServerCallPoint(ServerCallPoint):
32
- def __init__(self, parent: ARObject, short_name: str):
33
- super().__init__(parent, short_name)
34
-
35
- class AsynchronousServerCallResultPoint(ServerCallPoint):
31
+
32
+ class AsynchronousServerCallResultPoint(AbstractAccessPoint):
36
33
  def __init__(self, parent: ARObject, short_name: str):
37
34
  super().__init__(parent, short_name)
38
35
 
@@ -43,7 +40,11 @@ class AsynchronousServerCallResultPoint(ServerCallPoint):
43
40
 
44
41
  def setAsynchronousServerCallPointRef(self, value):
45
42
  self.asynchronousServerCallPointRef = value
46
- return self
43
+ return self
44
+
45
+ class AsynchronousServerCallPoint(ServerCallPoint):
46
+ def __init__(self, parent: ARObject, short_name: str):
47
+ super().__init__(parent, short_name)
47
48
 
48
49
  class SynchronousServerCallPoint(ServerCallPoint):
49
50
  def __init__(self, parent: ARObject, short_name: str):
@@ -63,6 +64,7 @@ class RunnableEntity(ExecutableEntity):
63
64
  super().__init__(parent, short_name)
64
65
 
65
66
  self.arguments = [] # type: List[RunnableEntityArgument]
67
+ self.asynchronousServerCallResultPoints = [] # type: List[AsynchronousServerCallResultPoint]
66
68
  self.canBeInvokedConcurrently = None # type: ARBoolean
67
69
  self.dataReadAccesses = {} # type: Dict[str, VariableAccess]
68
70
  self.dataReceivePointByArguments = {} # type: Dict[str, VariableAccess]
@@ -92,7 +94,7 @@ class RunnableEntity(ExecutableEntity):
92
94
  def addArgument(self, value):
93
95
  self.arguments.append(value)
94
96
  return self
95
-
97
+
96
98
  def getCanBeInvokedConcurrently(self):
97
99
  return self.canBeInvokedConcurrently
98
100
 
@@ -148,35 +150,48 @@ class RunnableEntity(ExecutableEntity):
148
150
  def createParameterAccess(self, short_name: str) -> ParameterAccess:
149
151
  if (short_name not in self.elements):
150
152
  access = ParameterAccess(self, short_name)
151
- self.elements[short_name] = access
152
- return self.elements[short_name]
153
+ self.addElement(access)
154
+ return self.getElement(short_name)
153
155
 
154
156
  def createSynchronousServerCallPoint(self, short_name: str) -> SynchronousServerCallPoint:
155
157
  if (short_name not in self.serverCallPoints):
156
- server_call_point = SynchronousServerCallPoint(self, short_name)
157
- self.serverCallPoints[short_name] = server_call_point
158
- return self.serverCallPoints[short_name]
158
+ point = SynchronousServerCallPoint(self, short_name)
159
+ self.addElement(point)
160
+ return self.getElement(short_name)
161
+ #self.serverCallPoints[short_name] = server_call_point
162
+ #return self.serverCallPoints[short_name]
159
163
 
160
164
  def createAsynchronousServerCallPoint(self, short_name: str) -> AsynchronousServerCallPoint:
161
165
  if (short_name not in self.serverCallPoints):
162
- server_call_point = AsynchronousServerCallPoint(self, short_name)
163
- self.serverCallPoints[short_name] = server_call_point
164
- return self.serverCallPoints[short_name]
166
+ point = AsynchronousServerCallPoint(self, short_name)
167
+ self.addElement(point)
168
+ return self.getElement(short_name)
169
+ #self.serverCallPoints[short_name] = server_call_point
170
+ #return self.serverCallPoints[short_name]
171
+
172
+ def createAsynchronousServerCallResultPoint(self, short_name: str) -> AsynchronousServerCallResultPoint:
173
+ if (short_name not in self.serverCallPoints):
174
+ point = AsynchronousServerCallResultPoint(self, short_name)
175
+ self.addElement(point)
176
+ return self.getElement(short_name)
165
177
 
166
- def getSynchronousServerCallPoint(self) -> List[ServerCallPoint]:
167
- return filter(lambda o: isinstance(o, SynchronousServerCallPoint), self.getServerCallPoints())
178
+ def getSynchronousServerCallPoint(self) -> List[SynchronousServerCallPoint]:
179
+ return list(sorted(filter(lambda a: isinstance(a, SynchronousServerCallPoint), self.elements.values()), key= lambda o:o.getShortName()))
168
180
 
169
- def getAsynchronousServerCallPoint(self) -> List[ServerCallPoint]:
170
- return filter(lambda o: isinstance(o, AsynchronousServerCallPoint), self.getServerCallPoints())
181
+ def getAsynchronousServerCallPoint(self) -> List[AsynchronousServerCallPoint]:
182
+ return list(sorted(filter(lambda a: isinstance(a, AsynchronousServerCallPoint), self.elements.values()), key= lambda o:o.getShortName()))
183
+
184
+ def getAsynchronousServerCallResultPoints(self) -> List[AsynchronousServerCallResultPoint]:
185
+ return list(sorted(filter(lambda a: isinstance(a, AsynchronousServerCallResultPoint), self.elements.values()), key= lambda o:o.getShortName()))
171
186
 
172
187
  def getServerCallPoints(self) -> List[ServerCallPoint]:
173
- return sorted(self.serverCallPoints.values(), key=lambda v: v.short_name)
188
+ return list(sorted(filter(lambda a: isinstance(a, ServerCallPoint), self.elements.values()), key= lambda o:o.getShortName()))
174
189
 
175
190
  def createInternalTriggeringPoint(self, short_name: str) -> InternalTriggeringPoint:
176
191
  if (short_name not in self.elements):
177
192
  point = InternalTriggeringPoint(self, short_name)
178
193
  self.elements[point.short_name] = point
179
- return self.elements[point.short_name]
194
+ return self.elements[short_name]
180
195
 
181
196
  def getInternalTriggeringPoints(self) -> List[InternalTriggeringPoint]:
182
197
  return filter(lambda o: isinstance(o, InternalTriggeringPoint), self.elements)
@@ -245,38 +260,44 @@ class SwcInternalBehavior(InternalBehavior):
245
260
  def createOperationInvokedEvent(self, short_name: str) -> OperationInvokedEvent:
246
261
  if (short_name not in self.elements):
247
262
  event = OperationInvokedEvent(self, short_name)
248
- self.elements[short_name] = event
249
- return self.elements[short_name]
263
+ self.addElement(event)
264
+ return self.getElement(short_name)
250
265
 
251
266
  def createTimingEvent(self, short_name: str) -> TimingEvent:
252
267
  if (short_name not in self.elements):
253
268
  event = TimingEvent(self, short_name)
254
- self.elements[short_name] = event
255
- return self.elements[short_name]
269
+ self.addElement(event)
270
+ return self.getElement(short_name)
256
271
 
257
272
  def createInitEvent(self, short_name: str) -> InitEvent:
258
273
  if (short_name not in self.elements):
259
274
  event = InitEvent(self, short_name)
260
- self.elements[short_name] = event
261
- return self.elements[short_name]
275
+ self.addElement(event)
276
+ return self.getElement(short_name)
277
+
278
+ def createAsynchronousServerCallReturnsEvent(self, short_name: str) -> AsynchronousServerCallReturnsEvent:
279
+ if (short_name not in self.elements):
280
+ event = AsynchronousServerCallReturnsEvent(self, short_name)
281
+ self.addElement(event)
282
+ return self.getElement(short_name)
262
283
 
263
284
  def createDataReceivedEvent(self, short_name: str) -> DataReceivedEvent:
264
285
  if (short_name not in self.elements):
265
286
  event = DataReceivedEvent(self, short_name)
266
- self.elements[short_name] = event
267
- return self.elements[short_name]
287
+ self.addElement(event)
288
+ return self.getElement(short_name)
268
289
 
269
290
  def createSwcModeSwitchEvent(self, short_name: str) -> SwcModeSwitchEvent:
270
291
  if (short_name not in self.elements):
271
292
  event = SwcModeSwitchEvent(self, short_name)
272
- self.elements[short_name] = event
273
- return self.elements[short_name]
293
+ self.addElement(event)
294
+ return self.getElement(short_name)
274
295
 
275
296
  def createInternalTriggerOccurredEvent(self, short_name: str) -> InternalTriggerOccurredEvent:
276
297
  if (short_name not in self.elements):
277
298
  event = InternalTriggerOccurredEvent(self, short_name)
278
- self.elements[short_name] = event
279
- return self.elements[short_name]
299
+ self.addElement(event)
300
+ return self.getElement(short_name)
280
301
 
281
302
  def createSwcServiceDependency(self, short_name: str) -> SwcServiceDependency:
282
303
  if (short_name not in self.elements):
@@ -1,6 +1,6 @@
1
1
  from typing import List
2
2
 
3
- from .....M2.MSR.Documentation.BlockElements import DocumentationBlock
3
+ from ....MSR.Documentation.TextModel.BlockElements import DocumentationBlock
4
4
  from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
5
5
  from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
6
6
  from .....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARPositiveInteger
@@ -1,3 +1,5 @@
1
+ from ....M2.MSR.Documentation.TextModel.LanguageDataModel import LEnum
2
+ from ....M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguagePlainText
1
3
  from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
2
4
  from ....M2.MSR.AsamHdo.SpecialData import Sdg
3
5
  from typing import List
@@ -6,13 +8,37 @@ class AdminData(ARObject):
6
8
  def __init__(self):
7
9
  super().__init__()
8
10
 
9
- self.doc_revision = []
10
- self.language = None
11
- self.sdg = []
12
- self.used_languages = None
11
+ self.DocRevisions = [] # type: List[DocRevision]
12
+ self.language = None # type: LEnum
13
+ self.sdgs = [] # type: List[Sdg]
14
+ self.usedLanguages = None # type: MultiLanguagePlainText
13
15
 
14
- def addSdg(self, sdg: Sdg):
15
- self.sdg.append(sdg)
16
+ def getDocRevisions(self):
17
+ return self.DocRevisions
16
18
 
17
- def getSdgs(self) -> List[Sdg]:
18
- return self.sdg
19
+ def setDocRevisions(self, value):
20
+ self.DocRevisions.append(value)
21
+ return self
22
+
23
+ def getLanguage(self):
24
+ return self.language
25
+
26
+ def setLanguage(self, value):
27
+ self.language = value
28
+ return self
29
+
30
+ def getSdgs(self):
31
+ return self.sdgs
32
+
33
+ def addSdg(self, value):
34
+ self.sdgs.append(value)
35
+ return self
36
+
37
+ def getUsedLanguages(self):
38
+ return self.usedLanguages
39
+
40
+ def setUsedLanguages(self, value):
41
+ self.usedLanguages = value
42
+ return self
43
+
44
+
@@ -1,7 +1,7 @@
1
1
  from typing import List
2
2
  from abc import ABCMeta
3
3
  from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement
4
- from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral
4
+ from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import ARLiteral, CIdentifier, Identifier, PositiveUnlimitedInteger, String
5
5
  from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ArObject import ARObject
6
6
  from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType
7
7
  from ....M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import Limit
@@ -23,18 +23,35 @@ class CompuConst(ARObject):
23
23
  def __init__(self):
24
24
  super().__init__()
25
25
 
26
- self.compu_const_content_type = None # type: CompuConstContent
26
+ self.compuConstContentType = None # type: CompuConstContent
27
27
 
28
+ def getCompuConstContentType(self):
29
+ return self.compuConstContentType
30
+
31
+ def setCompuConstContentType(self, value):
32
+ self.compuConstContentType = value
33
+ return self
28
34
 
29
35
  class Compu(ARObject):
30
36
  def __init__(self):
31
37
  super().__init__()
32
38
 
33
- '''required'''
34
- self.compu_content = None # type: CompuContent
39
+ self.compuContent = None # type: CompuContent
40
+ self.compuDefaultValue = None # type: CompuConst
41
+
42
+ def getCompuContent(self):
43
+ return self.compuContent
44
+
45
+ def setCompuContent(self, value):
46
+ self.compuContent = value
47
+ return self
35
48
 
36
- '''optional'''
37
- self.compu_default_value = None # type: CompuConst
49
+ def getCompuDefaultValue(self):
50
+ return self.compuDefaultValue
51
+
52
+ def setCompuDefaultValue(self, value):
53
+ self.compuDefaultValue = value
54
+ return self
38
55
 
39
56
 
40
57
  class CompuConstContent(ARObject, metaclass=ABCMeta):
@@ -62,6 +79,12 @@ class CompuConstTextContent(CompuConstContent):
62
79
 
63
80
  self.vt = None
64
81
 
82
+ def getVt(self):
83
+ return self.vt
84
+
85
+ def setVt(self, value):
86
+ self.vt = value
87
+ return self
65
88
 
66
89
  class CompuConstNumericContent(CompuConstContent):
67
90
 
@@ -70,6 +93,12 @@ class CompuConstNumericContent(CompuConstContent):
70
93
 
71
94
  self.v = None
72
95
 
96
+ def getV(self):
97
+ return self.v
98
+
99
+ def setV(self, value):
100
+ self.v = value
101
+ return self
73
102
 
74
103
  class CompuScaleContents(ARObject, metaclass=ABCMeta):
75
104
  def __init__(self):
@@ -83,8 +112,14 @@ class CompuScaleConstantContents(CompuScaleContents):
83
112
  def __init__(self):
84
113
  super().__init__()
85
114
 
86
- self.compu_const = None # type: CompuConst
115
+ self.compuConst = None # type: CompuConst
116
+
117
+ def getCompuConst(self):
118
+ return self.compuConst
87
119
 
120
+ def setCompuConst(self, value):
121
+ self.compuConst = value
122
+ return self
88
123
 
89
124
  class CompuRationalCoeffs(ARObject):
90
125
  '''
@@ -95,9 +130,22 @@ class CompuRationalCoeffs(ARObject):
95
130
  def __init__(self):
96
131
  super().__init__()
97
132
 
98
- self.compu_denominator = None # type: CompuNominatorDenominator
99
- self.compu_numerator = None # type: CompuNominatorDenominator
133
+ self.compuDenominator = None # type: CompuNominatorDenominator
134
+ self.compuNumerator = None # type: CompuNominatorDenominator
135
+
136
+ def getCompuDenominator(self):
137
+ return self.compuDenominator
138
+
139
+ def setCompuDenominator(self, value):
140
+ self.compuDenominator = value
141
+ return self
100
142
 
143
+ def getCompuNumerator(self):
144
+ return self.compuNumerator
145
+
146
+ def setCompuNumerator(self, value):
147
+ self.compuNumerator = value
148
+ return self
101
149
 
102
150
  class CompuScaleRationalFormula(CompuScaleContents):
103
151
  '''
@@ -106,8 +154,14 @@ class CompuScaleRationalFormula(CompuScaleContents):
106
154
  def __init__(self):
107
155
  super().__init__()
108
156
 
109
- self.compu_rational_coeffs = None # type: CompuRationalCoeffs
157
+ self.compuRationalCoeffs = None # type: CompuRationalCoeffs
158
+
159
+ def getCompuRationalCoeffs(self):
160
+ return self.compuRationalCoeffs
110
161
 
162
+ def setCompuRationalCoeffs(self, value):
163
+ self.compuRationalCoeffs = value
164
+ return self
111
165
 
112
166
  class CompuNominatorDenominator(ARObject):
113
167
  '''
@@ -131,25 +185,90 @@ class CompuScale(Compu):
131
185
  def __init__(self):
132
186
  super().__init__()
133
187
 
134
- self.symbol = None # type: ARLiteral
135
- self.lowerLimit = None # type: Limit
136
- self.upperLimit = None # type: Limit
137
- self.compuInverseValue = None # type: CompuConst
138
- self.compuScaleContents = None # type: CompuScaleContents
139
- self.short_label = None # type: ARLiteral
188
+ self.a2lDisplayText = None # type: String
189
+ self.compuInverseValue = None # type: CompuConst
190
+ self.compuScaleContents = None # type: CompuScaleContents
191
+ self.desc = None # type: MultiLanguageOverviewParagraph
192
+ self.lowerLimit = None # type: Limit
193
+ self.mask = None # type: PositiveUnlimitedInteger
194
+ self.shortLabel = None # type: Identifier
195
+ self.symbol = None # type: CIdentifier
196
+ self.upperLimit = None # type: Limit
197
+
198
+ def getA2lDisplayText(self):
199
+ return self.a2lDisplayText
200
+
201
+ def setA2lDisplayText(self, value):
202
+ self.a2lDisplayText = value
203
+ return self
204
+
205
+ def getCompuInverseValue(self):
206
+ return self.compuInverseValue
207
+
208
+ def setCompuInverseValue(self, value):
209
+ self.compuInverseValue = value
210
+ return self
211
+
212
+ def getCompuScaleContents(self):
213
+ return self.compuScaleContents
214
+
215
+ def setCompuScaleContents(self, value):
216
+ self.compuScaleContents = value
217
+ return self
218
+
219
+ def getDesc(self):
220
+ return self.desc
140
221
 
222
+ def setDesc(self, value):
223
+ self.desc = value
224
+ return self
225
+
226
+ def getLowerLimit(self):
227
+ return self.lowerLimit
228
+
229
+ def setLowerLimit(self, value):
230
+ self.lowerLimit = value
231
+ return self
232
+
233
+ def getMask(self):
234
+ return self.mask
235
+
236
+ def setMask(self, value):
237
+ self.mask = value
238
+ return self
239
+
240
+ def getShortLabel(self):
241
+ return self.shortLabel
242
+
243
+ def setShortLabel(self, value):
244
+ self.shortLabel = value
245
+ return self
246
+
247
+ def getSymbol(self):
248
+ return self.symbol
249
+
250
+ def setSymbol(self, value):
251
+ self.symbol = value
252
+ return self
253
+
254
+ def getUpperLimit(self):
255
+ return self.upperLimit
256
+
257
+ def setUpperLimit(self, value):
258
+ self.upperLimit = value
259
+ return self
141
260
 
142
261
  class CompuScales(CompuContent):
143
262
  def __init__(self):
144
263
  super().__init__()
145
264
 
146
- self.compu_scales = [] # type: List[CompuScale]
265
+ self.compuScales = [] # type: List[CompuScale]
147
266
 
148
267
  def addCompuScale(self, compu_scale: CompuScale):
149
- self.compu_scales.append(compu_scale)
268
+ self.compuScales.append(compu_scale)
150
269
 
151
270
  def getCompuScales(self) -> List[CompuScale]:
152
- return self.compu_scales
271
+ return self.compuScales
153
272
 
154
273
 
155
274
  class CompuMethod(ARElement):
@@ -158,7 +277,35 @@ class CompuMethod(ARElement):
158
277
  def __init__(self, parent: ARObject, short_name: str):
159
278
  super().__init__(parent, short_name)
160
279
 
161
- self.compu_internal_to_phys = None # type: Compu
162
- self.compu_phys_to_internal = None # type: Compu
163
- self.display_format = None # type: DisplayFormatString
164
- self.unit_ref = None # type: RefType
280
+ self.compuInternalToPhys = None # type: Compu
281
+ self.compuPhysToInternal = None # type: Compu
282
+ self.displayFormat = None # type: DisplayFormatString
283
+ self.unitRef = None # type: RefType
284
+
285
+ def getCompuInternalToPhys(self):
286
+ return self.compuInternalToPhys
287
+
288
+ def setCompuInternalToPhys(self, value):
289
+ self.compuInternalToPhys = value
290
+ return self
291
+
292
+ def getCompuPhysToInternal(self):
293
+ return self.compuPhysToInternal
294
+
295
+ def setCompuPhysToInternal(self, value):
296
+ self.compuPhysToInternal = value
297
+ return self
298
+
299
+ def getDisplayFormat(self):
300
+ return self.displayFormat
301
+
302
+ def setDisplayFormat(self, value):
303
+ self.displayFormat = value
304
+ return self
305
+
306
+ def getUnitRef(self):
307
+ return self.unitRef
308
+
309
+ def setUnitRef(self, value):
310
+ self.unitRef = value
311
+ return self
@@ -8,7 +8,7 @@ class SwAddrMethod(Identifiable):
8
8
  super().__init__(parent, short_name)
9
9
 
10
10
  self.memoryAllocationKeywordPolicy = None # type: ARLiteral
11
- self.option = [] # type: List[ARLiteral]
11
+ self.options = [] # type: List[ARLiteral]
12
12
  self.sectionInitializationPolicy = None # type: ARLiteral
13
13
  self.sectionType = None # type: ARLiteral
14
14
 
@@ -19,11 +19,11 @@ class SwAddrMethod(Identifiable):
19
19
  self.memoryAllocationKeywordPolicy = value
20
20
  return self
21
21
 
22
- def getOption(self):
23
- return self.option
22
+ def getOptions(self):
23
+ return self.options
24
24
 
25
25
  def addOption(self, value):
26
- self.option.append(value)
26
+ self.options.append(value)
27
27
  return self
28
28
 
29
29
  def getSectionInitializationPolicy(self):