Skip to content

Commit 2ba641d

Browse files
committed
CRITICAL UPDATE on continuous data measurement. Reset of EITframe necessary before new measurement block.
1 parent 9975a52 commit 2ba641d

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

sciopy/EIT_16_32_64_128.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,8 +660,10 @@ def StartStopMeasurement(
660660
bSaveData=bSaveData,
661661
bDeleteDataFrame=bDeleteData,
662662
sSavePath=sCurrentPath,
663+
bStartReset=False
663664
)
664665

666+
self.cMessageParser.clear_out_data()
665667
if bDeleteData:
666668
return
667669
if return_as == "hex":

sciopy/usb_message_parser.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ def clear_out_data(self):
160160
Deletes saved data frames
161161
"""
162162
self.ppcData = []
163+
self.reset_new_data_frame()
163164

164165
# ---------------------------------------------------------------------------------------------------------------- #
165166
def init_parser(self):
@@ -212,6 +213,7 @@ def read_usb_for_seconds(
212213
bSaveData: bool = False,
213214
bDeleteDataFrame: bool = False,
214215
sSavePath: str = "C/",
216+
bStartReset: bool = True,
215217
):
216218
"""
217219
Reads out the USB connection for fTime seconds, regardless of whether data is received. Data bytes are parsed,
@@ -225,6 +227,8 @@ def read_usb_for_seconds(
225227
Returns:
226228
List of received data eit frames, no Status messages are saved
227229
"""
230+
if bStartReset:
231+
self.reset_new_data_frame()
228232
iMessageCount = 0
229233
bMessageStarted = False
230234
timeout_count = 0
@@ -256,7 +260,7 @@ def read_usb_for_seconds(
256260

257261
# ---------------------------------------------------------------------------------------------------------------- #
258262
def read_usb_till_timeout(
259-
self, bSaveData=False, bDeleteDataFrame=False, sSavePath="C/"
263+
self, bSaveData:bool =False, bDeleteDataFrame:bool =False, sSavePath:str="C/", bStartReset: bool=True
260264
):
261265
"""
262266
Reads out the USB connection until the connections times out, so for messages received + timeout. Data bytes are parsed,
@@ -269,6 +273,8 @@ def read_usb_till_timeout(
269273
Returns:
270274
List of received data eit frames, no Status messages are saved
271275
"""
276+
if bStartReset:
277+
self.reset_new_data_frame()
272278
iMessageCount = 0
273279
timeout_count = 0
274280
while True:
@@ -335,7 +341,7 @@ def interpret_data_input(
335341
if (
336342
message[2] <= self.iMaxChannelGroups
337343
): # Necessary, since all four channel groups are send
338-
if message[2] == 1 and freq_group == 1:
344+
if message[2] == 1 and freq_group == 1: # todo or gleich 0, weil er nicht mitschreibt
339345
self.CurrentFrame.excitation_stgs[self.iInjIndex] = [
340346
message[3],
341347
message[4],
@@ -348,7 +354,7 @@ def interpret_data_input(
348354

349355
# TIMESTAMP
350356
if self.iSaveCounter == 0:
351-
self.CurrentFrame.timestamp1 = message[7:11]
357+
self.CurrentFrame.timestamp1 = message[7:11] #todo byteinarray_to_flaost
352358
self.CurrentFrame.timestamp_pc = datetime.now().timestamp()
353359

354360
# Data Handling

0 commit comments

Comments
 (0)