py-eb-model 1.1.1__py3-none-any.whl → 1.1.2__py3-none-any.whl

eb_model/models/rte_xdm.py

@@ -1,3 +1,4 @@
+from abc import ABCMeta
 from typing import Dict, List
 from ..models.abstract import EcucContainer, EcucRefType, Module
 class RteEventToIsrMapping(EcucContainer):
@@ -10,8 +11,11 @@ class RteEventToIsrMapping(EcucContainer):
         self.RteRipsFillRoutineRef = None
         self.RteRipsFlushRoutineRef = None
 
-class AbstractEventToTaskMapping(EcucContainer):
+class AbstractEventToTaskMapping(EcucContainer, metaclass = ABCMeta):
     def __init__(self, parent, name) -> None:
+        if type(self) == AbstractEventToTaskMapping:
+            raise ValueError("RteEventToTaskMapping is an abstract class.")
+        
         super().__init__(parent, name)
 
         self.rtePositionInTask = None
@@ -23,8 +27,11 @@ class AbstractEventToTaskMapping(EcucContainer):
         self.rtePositionInTask = value
         return self
 
-class RteEventToTaskMapping(AbstractEventToTaskMapping):
+class RteEventToTaskMapping(AbstractEventToTaskMapping, metaclass = ABCMeta):
     def __init__(self, parent, name) -> None:
+        if type(self) == RteEventToTaskMapping:
+            raise ValueError("RteEventToTaskMapping is an abstract class.")
+
         super().__init__(parent, name)
         
         self.rteActivationOffset = None
@@ -174,7 +181,11 @@ class RteEventToTaskMapping(AbstractEventToTaskMapping):
 
     def setRteVirtuallyMappedToTaskRef(self, value):
         self.rteVirtuallyMappedToTaskRef = value
-        return self   
+        return self
+    
+    # abstract method
+    def getRteEventRef(self) -> EcucRefType:
+        pass
     
 class RteEventToTaskMappingV3(RteEventToTaskMapping):
     def __init__(self, parent, name):

eb_model/parser/os_xdm_parser.py

@@ -166,8 +166,24 @@ class OsXdmParser(AbstractEbModelParser):
             os_app = OsApplication(os, ctr_tag.attrib["name"]) \
                 .setOsTrusted(self.read_value(ctr_tag, "OsTrusted")) 
             
+            for ref in self.read_ref_value_list(ctr_tag, "OsAppAlarmRef"):
+                os_app.addOsAppAlarmRef(ref)
+
+            for ref in self.read_ref_value_list(ctr_tag, "OsAppCounterRef"):
+                os_app.addOsAppCounterRefs(ref)
+
+            for ref in self.read_ref_value_list(ctr_tag, "OsAppScheduleTableRef"):
+                os_app.addOsAppScheduleTableRef(ref)
+            
             for ref in self.read_ref_value_list(ctr_tag, "OsAppResourceRef"):
                 os_app.addOsAppResourceRef(ref)
 
+            for ref in self.read_ref_value_list(ctr_tag, "OsAppTaskRef"):
+                os_app.addOsAppTaskRefs(ref)
+
+            for ref in self.read_ref_value_list(ctr_tag, "OsAppIsrRef"):
+                os_app.addOsAppIsrRefs(ref)
+
+
             self.logger.debug("Read OsApplication <%s>" % os_app.getName())
             os.addOsApplication(os_app)

eb_model/parser/rte_xdm_parser.py

@@ -24,8 +24,6 @@ class RteXdmParser(AbstractEbModelParser):
         self.read_rte_bsw_module_instances(element, rte)
         self.read_rte_sw_component_instances(element, rte)
 
-        
-
     def read_rte_bsw_module_instance_event_to_task_mappings(self, element: ET.Element, instance: RteBswModuleInstance):
         for ctr_tag in self.find_ctr_tag_list(element, "RteBswEventToTaskMapping"):
             self.logger.debug("Read RteBswEventToTaskMapping <%s>" % ctr_tag.attrib['name'])

{py_eb_model-1.1.1.dist-info → py_eb_model-1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-eb-model
-Version: 1.1.1
+Version: 1.1.2
 Summary: The parser for EB XDM file
 Home-page: UNKNOWN
 Author: melodypapa
@@ -180,8 +180,11 @@ PrefSystemImporter --base-path c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rt
 
 **Version 1.1.1**
 
-1. PrefSystemImporter
-  * Add the support to append SystemMod/EcuExtract.arxml into list automatically.
+1. Add the support to append SystemMod/EcuExtract.arxml into list automatically for PrefSystemImporter.
+
+**Version 1.1.2**
+
+1. Read the OsAppTaskRef from OsApplication.
 
 
 

{py_eb_model-1.1.1.dist-info → py_eb_model-1.1.2.dist-info}/RECORD

@@ -9,13 +9,13 @@ eb_model/models/eb_doc.py,sha256=hPsGdNHlm3vl-ys3B3NGrlJRrWAWPhRvFJrN3fLQTW8,256
 eb_model/models/eclipse_project.py,sha256=W6ovTd3SMnlmWm_efVBZqTUGQebF0hJocsTqMlQ7_XQ,169
 eb_model/models/importer_xdm.py,sha256=B2Vqw5nkmzFgaGSpZlmTVFWZ88rTMqD8Iryytg4kUnk,4249
 eb_model/models/os_xdm.py,sha256=2Y6PJ_IMrXjC6oSK_k3vtZpH8P31GlJhfNv18zbPFQg,32438
-eb_model/models/rte_xdm.py,sha256=otYbFuIKsFl0Jlqm18fRqroTi1fUEGw2HPhGZb7sAQ0,21060
+eb_model/models/rte_xdm.py,sha256=kCn5WTrBY3nwMCYYaaWuoO6jWy37BmzNycTnVXnMDvQ,21482
 eb_model/parser/__init__.py,sha256=7VOmPr4dng_TrOyDZFu2_s3r0BJZQGiOUxALMY8EnqI,170
 eb_model/parser/eb_parser.py,sha256=_5sUl2pMt1SchHvrLOhU2axqa3FmKTWElSB79taz0O4,8188
 eb_model/parser/eb_parser_factory.py,sha256=zqsqq52uImU4-WcS5dvHfhM95hiEPAGRtNzVik8i8wc,971
-eb_model/parser/os_xdm_parser.py,sha256=UBN-NZKes_3IX1crTLTDAYOa_wbklRfD9rp5-24WVW4,9909
+eb_model/parser/os_xdm_parser.py,sha256=ZBS36hcnMufCsiypnx-wmWmHYuECOqRWGOjOHbqXjBc,10560
 eb_model/parser/pref_xdm_parser.py,sha256=EjfR4vrnjRVLw_7wyPmMYlBj6lPXZbBZMEdWlYPj3uI,1539
-eb_model/parser/rte_xdm_parser.py,sha256=plUue0c4ejreE9w71_mT0JNzGSClf30cXhfC2NalrII,5471
+eb_model/parser/rte_xdm_parser.py,sha256=nUqlVMBJVxMGb3yENFBm1RB9jWQ7azhMKhGkfLfz4K0,5459
 eb_model/reporter/__init__.py,sha256=H8D_23UwJi1Ph6yjBfZhxWVbu9ci5_O4471gqXGiZCM,36
 eb_model/reporter/markdown.py,sha256=NhcJOFQ_BVbkgGe66uAT7KUPIchWU4kfVMtMLQtbK-w,1647
 eb_model/reporter/excel_reporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -45,9 +45,9 @@ py_eb_model/reporter/markdown.py,sha256=NhcJOFQ_BVbkgGe66uAT7KUPIchWU4kfVMtMLQtb
 py_eb_model/reporter/excel_reporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_eb_model/reporter/excel_reporter/abstract.py,sha256=BOuLhWwwTwqBzErtmwPrelB1iByMfZP9haFmg9ayFQw,1488
 py_eb_model/reporter/excel_reporter/os_xdm.py,sha256=WGMxK0PYxi9J5fUZ-EeiiM8NBpIg2WyxRsrN-gK37YE,1589
-py_eb_model-1.1.1.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
-py_eb_model-1.1.1.dist-info/METADATA,sha256=o3TxYweK34vDd6CJN2ynv3xpTD0PsWNGyNKYco5g9iQ,5869
-py_eb_model-1.1.1.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-py_eb_model-1.1.1.dist-info/entry_points.txt,sha256=yDLH9wnJ5Fp7ImgyFRSnr3mU6nvaenuKZnbe2rgs8Mk,183
-py_eb_model-1.1.1.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
-py_eb_model-1.1.1.dist-info/RECORD,,
+py_eb_model-1.1.2.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
+py_eb_model-1.1.2.dist-info/METADATA,sha256=3LOAFETww4ZvsasY7bi0uG8-Pehw6bYpn9KHTLslkVI,5937
+py_eb_model-1.1.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+py_eb_model-1.1.2.dist-info/entry_points.txt,sha256=yDLH9wnJ5Fp7ImgyFRSnr3mU6nvaenuKZnbe2rgs8Mk,183
+py_eb_model-1.1.2.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
+py_eb_model-1.1.2.dist-info/RECORD,,