py-eb-model 1.1.8__py3-none-any.whl → 1.1.9__py3-none-any.whl

eb_model/parser/eb_parser.py

@@ -63,6 +63,12 @@ class AbstractEbModelParser(metaclass=ABCMeta):
         if tag is None:
             raise KeyError("XPath d:var[@name='%s'] is invalid" % name)
         return self._convert_value(tag)
+    
+    def read_eb_origin_value(self, parent: ET.Element, name: str) -> str:
+        tag = parent.find(".//d:var[@name='%s']" % name, self.nsmap)
+        if tag is None:
+            return None
+        return self._convert_value(tag)
 
     def read_optional_value(self, parent: ET.Element, name: str, default_value=None) -> str:
         tag = parent.find(".//d:var[@name='%s']" % name, self.nsmap)

eb_model/parser/os_xdm_parser.py

@@ -65,19 +65,19 @@ class OsXdmParser(AbstractEbModelParser):
             os_isr.setOsIsrCategory(self.read_value(ctr_tag, "OsIsrCategory"))
             os_isr.setOsIsrPeriod(self.read_optional_value(ctr_tag, "OsIsrPeriod", 0.0))
             os_isr.setOsStacksize(int(self.read_value(ctr_tag, "OsStacksize")))
-            os_isr.setOsIsrPriority(self.read_optional_value(ctr_tag, "OsIsrPriority"))
+            os_isr.setOsIsrPriority(self.read_eb_origin_value(ctr_tag, "OsIsrPriority"))
             
             # Infineon Aurix Tricore
-            os_isr.setOsIsrPriority(self.read_optional_value(ctr_tag, "OsTricoreIrqLevel"))
-            os_isr.setOsIsrVector(self.read_optional_value(ctr_tag, "OsTricoreVector"))
-            os_isr.setOsTricoreIrqLevel(self.read_optional_value(ctr_tag, "OsTricoreIrqLevel"))
-            os_isr.setOsTricoreVector(self.read_optional_value(ctr_tag, "OsTricoreVector"))
+            os_isr.setOsIsrPriority(self.read_eb_origin_value(ctr_tag, "OsTricoreIrqLevel"))
+            os_isr.setOsIsrVector(self.read_eb_origin_value(ctr_tag, "OsTricoreVector"))
+            os_isr.setOsTricoreIrqLevel(self.read_eb_origin_value(ctr_tag, "OsTricoreIrqLevel"))
+            os_isr.setOsTricoreVector(self.read_eb_origin_value(ctr_tag, "OsTricoreVector"))
             
             # ARM Core
-            os_isr.setOsIsrPriority(self.read_optional_value(ctr_tag, "OsARMIrqLevel"))
-            os_isr.setOsIsrVector(self.read_optional_value(ctr_tag, "OsARMVector"))
-            os_isr.setOsARMIrqLevel(self.read_optional_value(ctr_tag, "OsARMIrqLevel"))
-            os_isr.setOsARMVector(self.read_optional_value(ctr_tag, "OsARMVector"))
+            os_isr.setOsIsrPriority(self.read_eb_origin_value(ctr_tag, "OsARMIrqLevel"))
+            os_isr.setOsIsrVector(self.read_eb_origin_value(ctr_tag, "OsARMVector"))
+            os_isr.setOsARMIrqLevel(self.read_eb_origin_value(ctr_tag, "OsARMIrqLevel"))
+            os_isr.setOsARMVector(self.read_eb_origin_value(ctr_tag, "OsARMVector"))
 
             # EB Safety OS
             for ref in self.read_ref_value_list(ctr_tag, "OsIsrMkMemoryRegionRef"):
@@ -186,15 +186,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, "OsAppIsrRef"):
+                os_app.addOsAppIsrRef(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, "OsAppScheduleTableRef"):
+                os_app.addOsAppScheduleTableRef(ref)
+
             for ref in self.read_ref_value_list(ctr_tag, "OsAppTaskRef"):
                 os_app.addOsAppTaskRef(ref)
 
-            for ref in self.read_ref_value_list(ctr_tag, "OsAppIsrRef"):
-                os_app.addOsAppIsrRef(ref)
-
             self.logger.debug("Read OsApplication <%s>" % os_app.getName())
             os.addOsApplication(os_app)
 

{py_eb_model-1.1.8.dist-info → py_eb_model-1.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-eb-model
-Version: 1.1.8
+Version: 1.1.9
 Summary: The parser for EB XDM file
 Home-page: UNKNOWN
 Author: melodypapa
@@ -233,3 +233,11 @@ PrefSystemImporter --base-path c:/EB/ACG-8_8_8_WIN32X86/workspace/simple_demo_rt
 1. Support to read NvM configuration from EB tresos Xdm file
 2. Export the NvM Configuration to excel file.
 
+**Version 1.1.9**
+
+1. Parse the OsAppAlarmRef List of OsApplication
+2. Parse the OsAppCounterRef List of OsApplication
+3. Parse the OsAppScheduleTableRef Lis of OsApplication
+4. Add the **read_eb_origin_value** method to read the optional EB extended configuration
+5. Fix the OsIsrPriority and OsIsrVector issue.
+

{py_eb_model-1.1.8.dist-info → py_eb_model-1.1.9.dist-info}/RECORD

@@ -13,10 +13,10 @@ eb_model/models/nvm_xdm.py,sha256=_QF5d32KKDUPWPWjItU1vS5BnrxZmPKuUqIlCcb4pYo,21
 eb_model/models/os_xdm.py,sha256=xBJPXDaKIczkI5TuKCBM28Xiga5FV3j7WK-UqLK8Qks,42939
 eb_model/models/rte_xdm.py,sha256=5z7m5zp4_eoMypKhB4tq65RHLLm8Tww_3P59MqxZ6ZQ,22067
 eb_model/parser/__init__.py,sha256=K_sp7EVjS2KoWUCdX_0h2jIY8Gxhwqs6AtRP1Pgj1TU,214
-eb_model/parser/eb_parser.py,sha256=l3oLb60GxlXiOYNmT0bLIGDfojS8gxa6YoXlak7fkiM,8434
+eb_model/parser/eb_parser.py,sha256=Z_CcqcKEjn82cxRXbnD3GLXRm6OhLkTJpZxv3mVLtCA,8676
 eb_model/parser/eb_parser_factory.py,sha256=zqsqq52uImU4-WcS5dvHfhM95hiEPAGRtNzVik8i8wc,971
 eb_model/parser/nvm_xdm_parser.py,sha256=r3awxfeNIqXoJlhD_t05ebsnfZNuQ_AYhCikhhZziWo,7860
-eb_model/parser/os_xdm_parser.py,sha256=M44HAGBj98s2xyAIwzVdAwJQb_JBlN7xh7CjXrSh8Kw,14212
+eb_model/parser/os_xdm_parser.py,sha256=Vf7WuZmum0RfFSJKimzUQ76PQ_JJHljlHycBs1Z-WnM,14638
 eb_model/parser/pref_xdm_parser.py,sha256=EjfR4vrnjRVLw_7wyPmMYlBj6lPXZbBZMEdWlYPj3uI,1539
 eb_model/parser/rte_xdm_parser.py,sha256=zKs1vz0DxIt4zPi6yBvPjGvLkq-BR2z_Dz7Pv8LBuDA,5560
 eb_model/reporter/__init__.py,sha256=p-sMv7gJkxe3u8la09SZJjiWPgGGjZSaX0WoBD-hn-0,77
@@ -40,9 +40,9 @@ eb_model/tests/parser/test_os_xdm_parser.py,sha256=nZdlaW4slLVdfpf4W04c35WbEvcjN
 eb_model/writer/__init__.py,sha256=CXvQAsNV1OvYClkHdKCG7Q300OVBzcl2TmoD68MyQOs,95
 eb_model/writer/project_writer.py,sha256=9BQU1CJAktVxFvQk89Pj4IbizTJXnlQidt4eX_CIFXU,2800
 eb_model/writer/text_writer.py,sha256=kvPKC265bvTZq2g1YEvLXDBh5XpTvSr0iPAsedicAOM,1020
-py_eb_model-1.1.8.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
-py_eb_model-1.1.8.dist-info/METADATA,sha256=n2nW1XZkNgZitE9s5LGaaajEhA_ZTw7lVDFw8glSqH4,7172
-py_eb_model-1.1.8.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-py_eb_model-1.1.8.dist-info/entry_points.txt,sha256=N7cHTMb7nGQXu2X5JvJo3JJQdRE11vRMlLyx27uarHg,234
-py_eb_model-1.1.8.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
-py_eb_model-1.1.8.dist-info/RECORD,,
+py_eb_model-1.1.9.dist-info/LICENSE,sha256=I52rGS7W1IwAmYCUfqTpDaSHoFAdt7grcNiBhk-Z3eI,1088
+py_eb_model-1.1.9.dist-info/METADATA,sha256=_-iJ76xeoALOf5XpLjYQ0JSPfk2RI3yOjH-OlMzgKxo,7494
+py_eb_model-1.1.9.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+py_eb_model-1.1.9.dist-info/entry_points.txt,sha256=N7cHTMb7nGQXu2X5JvJo3JJQdRE11vRMlLyx27uarHg,234
+py_eb_model-1.1.9.dist-info/top_level.txt,sha256=DGBNh6YW_x4RF_UoLKW3cKqb2SLnmfuEIZlkTewR66A,9
+py_eb_model-1.1.9.dist-info/RECORD,,