Updated timestamp saving

Author: patfuchs

sciopy/EIT_16_32_64_128.py

@@ -418,8 +418,9 @@ def SetMeasurementSetup(self, setup: EitMeasurementSetup):
         elif setup.gain == 1_000:
             self.write_command_string(bytearray([0xB0, 0x03, 0x09, 0x01, 0x03, 0xB0]))
 
-        # Single ended mode:
-        self.write_command_string(bytearray([0xB0, 0x03, 0x08, 0x01, 0x01, 0xB0]))
+        # Single ended mode as standard setup, if else configured, skip patterns are possible:
+        self.update_measurement_mode(setup.mea_mode, boundary=setup.mea_mode_boundary)
+        #self.write_command_string(bytearray([0xB0, 0x03, 0x08, 0x01, 0x01, 0xB0]))
 
         # Excitation switch type:
         self.write_command_string(bytearray([0xB0, 0x02, 0x0C, 0x01, 0xB0]))
@@ -487,7 +488,7 @@ def ResetMeasurementSetup(self):
         self.print_msg = False
 
     def update_measurement_mode(
-        self, meamode: str = "skip4", boundary: str = "external"
+        self, meamode: str = "singleended", boundary: str = "internal"
     ):
         """
         Updates the measurement modes out of the options "singleended", "skip0", "skip2" or "skip4"

sciopy/sciopy_dataclasses.py

@@ -30,7 +30,7 @@ class EitMeasurementSetup:
     gain: int
     adc_range: int
     mea_mode: str = "singleended"
-    mea_mode_boundary: str = "external"
+    mea_mode_boundary: str = "internal"
     # TBD: lin/log/sweep
 
 
@@ -228,6 +228,8 @@ class EITFrame:
     frequency_stgs : List[str] # todo
     timestamp1 : int Timestamp of the very first measured channel group in this frame, milli seconds?
     timestamp2 : int Timestamp of the very last measured channel group in this frame, milli seconds?
+    timestamp_pc : int Timestamp of the receiving computer for further data synchronisation from datetime.now().
+                       timestamp()
     ppcData : np.array [[Complex measured data]]
               for e in used excitations stages,
                  for f in used frequency stages:
@@ -239,4 +241,5 @@ class EITFrame:
     frequency_stgs: npt.NDArray[int]  # List of Frequency-Sweep Settings,
     timestamp1: int  # [ms]
     timestamp2: int
+    timestamp_pc: int
     ppcData: npt.NDArray[complex]  # Channels 1-(64) all channel groups combined

sciopy/usb_message_parser.py

@@ -17,6 +17,7 @@
 import struct
 from .sciopy_dataclasses import EitMeasurementSetup, EITFrame
 from .com_util import bytesarray_to_float, byteintarray_to_float, two_byte_to_int
+from datatime import datetime
 
 # -------------------------------------------------------------------------------------------------------------------- #
 # -------------------------------------------------------------------------------------------------------------------- #
@@ -147,6 +148,7 @@ def reset_new_data_frame(self):
             # todo fill in setup freq settings
             timestamp1=0,
             timestamp2=0,
+            timestamp_pc=0,
             ppcData=np.zeros(
                 self.iMaxChannelGroups * 16 * self.iNumExcitationSettings, dtype=complex
             ),
@@ -347,6 +349,7 @@ def interpret_data_input(
             # TIMESTAMP
             if self.iSaveCounter == 0:
                 self.CurrentFrame.timestamp1 = message[7:11]
+                self.CurrentFrame.timestamp_pc = datetime.now().timestamp()
 
             # Data Handling
             for i in range(11, 135, 8):
@@ -430,6 +433,7 @@ def save_data_frame(path: str, dataframe: EITFrame, iNPZSaveIndex: int):
         frequency_stgs=dataframe.frequency_stgs,
         timestamp1=dataframe.timestamp1,
         timestamp2=dataframe.timestamp2,
+        timestamp_pc = dataframe.timestamp_pc,
         ppcData=dataframe.ppcData,
     )
 
@@ -455,6 +459,7 @@ def load_eit_frames(path):
             frequency_stgs=l["frequency_stgs"],
             timestamp1=l["timestamp1"],
             timestamp2=l["timestamp2"],
+            timestamp_pc=l["timestamp_pc"],
             ppcData=l["ppcData"],
         )
         loaded.append(e)