fmu-manipulation-toolbox 1.9.2b3__tar.gz → 1.9.2rc1__tar.gz

{fmu_manipulation_toolbox-1.9.2b3 → fmu_manipulation_toolbox-1.9.2rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.9.2b3
+Version: 1.9.2rc1
 Summary: FMU Manipulation Toolbox is a python package which helps to analyze, modify or combine Functional Mock-up Units (FMUs) without recompilation.
 Home-page: https://github.com/grouperenault/fmu_manipulation_toolbox/
 Author: Nicolas.LAURENT@Renault.com

fmu_manipulation_toolbox-1.9.2rc1/fmu_manipulation_toolbox/__version__.py

@@ -0,0 +1 @@
+'V1.9.2rc1'

{fmu_manipulation_toolbox-1.9.2b3 → fmu_manipulation_toolbox-1.9.2rc1}/fmu_manipulation_toolbox/cli/datalog2pcap.py

@@ -15,6 +15,20 @@ class DatalogConverter:
     def __init__(self, cvs_filename: Union[Path, str]):
         self.csv_filename = Path(cvs_filename)
         self.pcap_filename = self.csv_filename.with_suffix(".pcap")
+        self.opcode_name = {
+            "CAN": {
+            0x0001: "FMI3_LS_BUS_OP_FORMAT_ERROR",
+            0x0010: "FMI3_LS_BUS_CAN_OP_CAN_TRANSMIT",
+            0x0011: "FMI3_LS_BUS_CAN_OP_CANFD_TRANSMIT",
+            0x0012: "FMI3_LS_BUS_CAN_OP_CANXL_TRANSMIT",
+            0x0020: "FMI3_LS_BUS_CAN_OP_CONFIRM",
+            0x0030: "FMI3_LS_BUS_CAN_OP_ARBITRATION_LOST",
+            0x0031: "FMI3_LS_BUS_CAN_OP_BUS_ERROR",
+            0x0040: "FMI3_LS_BUS_CAN_OP_CONFIGURATION",
+            0x0041: "FMI3_LS_BUS_CAN_OP_STATUS",
+            0x0042: "FMI3_LS_BUS_CAN_OP_WAKEUP"
+            }
+        }
 
     def open_pcap(self):
         logger.info(f"Creating PCAP file '{self.pcap_filename}'...")
@@ -31,7 +45,10 @@ class DatalogConverter:
                                                                   # captured from each packet.
 
         file.write(int(227).to_bytes(4, byteorder="big"))         # link type. his field is defined in the Section
-                                                                  # # 8.1 IANA registry.
+                                                                  # 8.1 IANA registry.
+                                                                  # 190: Reserved for Controller Area Network (CAN) v. 2.0B packets
+                                                                  # 210: Reserved for FlexRay automotive bus
+                                                                  # 227: CAN (Controller Area Network) frames, with a pseudo-header followed by the frame payload.
         return file
 
     def open_csv(self):
@@ -42,15 +59,21 @@ class DatalogConverter:
     def decode_hexstring(self, hex_string: bytes, time_s, time_us):
         opcode = int.from_bytes(hex_string[0:4], byteorder="little")
         length = int.from_bytes(hex_string[4:8], byteorder="little")
-        can_id = int.from_bytes(hex_string[8:12], byteorder="little")
+
         if opcode == 0x10:  # TRANSMIT
+            can_id = int.from_bytes(hex_string[8:12], byteorder="little")
             rtr = int.from_bytes(hex_string[13:14], byteorder="little")
             ide = int.from_bytes(hex_string[12:13], byteorder="little")
             data_length = int.from_bytes(hex_string[14:16], byteorder="little")
             raw_data = hex_string[16:]
 
+            raw_str = ""
+            for i, b in enumerate(raw_data):
+                raw_str += f"{i}:{b:d} "
+            logger.info(f"time={time_s}.{time_us:06d} data length {data_length} with data {raw_str}")
+
             logger.debug(f"time={time_s}.{time_us:06d} OP=0x{opcode:04X} len={length} {data_length} id={can_id}"
-                         f" ide={ide} rtr={rtr} len={data_length} {raw_data}")
+                         f" ide={ide} rtr={rtr} len={data_length} raw_len={len(raw_data)} {raw_str}")
 
             # TimeStamp
             self.pcapfile.write(time_s.to_bytes(4, byteorder="big"))
@@ -76,7 +99,14 @@ class DatalogConverter:
             self.pcapfile.write(dlc.to_bytes(1, byteorder="big"))
 
             # PAYLOAD
-            self.pcapfile.write(raw_data)
+            self.pcapfile.write(raw_data[0:data_length])
+
+        elif opcode == 0x40:
+            parameter = int.from_bytes(hex_string[8:9], byteorder="little")
+            logger.debug(f"Config parameter: {parameter}")
+            if (parameter == 1):
+                baudrate = int.from_bytes(hex_string[9:13], byteorder="little")
+                logger.debug(f"baudrate parameter: {baudrate}")
 
     def convert(self):
         with self.open_csv() as self.csvfile, self.open_pcap() as self.pcapfile:

{fmu_manipulation_toolbox-1.9.2b3 → fmu_manipulation_toolbox-1.9.2rc1}/fmu_manipulation_toolbox/container.py

@@ -95,6 +95,7 @@ class EmbeddedFMUPort:
         self.start_value = attrs.get("start", None)
         self.initial = attrs.get("initial", None)
         self.clock = attrs.get("clocks", None)
+        self.interval_variability = attrs.get("intervalVariability", None)
 
 
     def xml(self, vr: int, name=None, causality=None, start=None, fmi_version=2) -> str:
@@ -601,9 +602,13 @@ class FMUContainer:
     canHandleVariableCommunicationStepSize="true"
     canBeInstantiatedOnlyOncePerProcess="{only_once}"
     canNotUseMemoryManagementFunctions="true"
-    canGetAndSetFMUstate="false"
-    canSerializeFMUstate="false"
-    providesDirectionalDerivative="false"
+    canGetAndSetFMUState="false"
+    canSerializeFMUState="false"
+    providesDirectionalDerivatives="false"
+    providesAdjointDerivatives="false"
+    providesPerElementDependencies="false"
+    providesEvaluateDiscreteStates="false"
+    hasEventMode="true"
     needsExecutionTool="{execution_tool}">
   </CoSimulation>
 
@@ -1106,8 +1111,8 @@ class FMUContainer:
             else:
                 local_per_type["clock"].append(link.vr)
                 for cport_to in link.cport_to_list:
-                    if cport_to.fmu.ls.is_bus:
-                        logger.info(f"LS-BUS: importer scheduling for '{cport_to.fmu.name}' '{cport_to.port.name}' (clock={cport_to.port.vr}, {link.vr})")
+                    if cport_to.port.interval_variability == "countdown":
+                        logger.info(f"LS-BUS: importer scheduling for '{cport_to.fmu.name}' '{cport_to.port.name}' (clock={cport_to.port.vr}, vr={link.vr})")
                         clock_list.append(cport_to, link.vr)
                         break
 

{fmu_manipulation_toolbox-1.9.2b3 → fmu_manipulation_toolbox-1.9.2rc1}/fmu_manipulation_toolbox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fmu_manipulation_toolbox
-Version: 1.9.2b3
+Version: 1.9.2rc1
 Summary: FMU Manipulation Toolbox is a python package which helps to analyze, modify or combine Functional Mock-up Units (FMUs) without recompilation.
 Home-page: https://github.com/grouperenault/fmu_manipulation_toolbox/
 Author: Nicolas.LAURENT@Renault.com

{fmu_manipulation_toolbox-1.9.2b3 → fmu_manipulation_toolbox-1.9.2rc1}/tests/test_suite.py

@@ -52,7 +52,7 @@ class TestSuite:
             for i, (lineA, lineB) in enumerate(zip(a, b)):
                 if i > 10:
                     assert lineA == lineB, \
-                       f"file {log_filename} and {ref_filename} missmatch (excl. GUID):\n" \
+                       f"files {log_filename} and {ref_filename} missmatch (excl. GUID):\n" \
                        f"{lineA}\n" \
                        f"vs.\n\n" \
                        f"{lineB}"
@@ -79,11 +79,11 @@ class TestSuite:
                     if keyword in lineA:
                         skip = True
                         break
-                assert(skip or lineA == lineB,
-                       f"file {filename1} and {filename2} missmatch:\n"
-                       f"{lineA}\n"
-                       f"vs.\n\n"
-                       f"{lineB}")
+                assert skip or lineA == lineB, \
+                       f"file {filename1} and {filename2} missmatch:\n" \
+                       f"{lineA}\n" \
+                       f"vs.\n\n" \
+                       f"{lineB}"
 
     def assert_names_match_ref(self, fmu_filename):
         fmu = FMU(fmu_filename)

fmu_manipulation_toolbox-1.9.2b3/fmu_manipulation_toolbox/__version__.py

@@ -1 +0,0 @@
-'V1.9.2b3'