Skip to content

Commit 0becb7e

Browse files
committed
Updating
1 parent 16bfa25 commit 0becb7e

2 files changed

Lines changed: 7 additions & 10 deletions

File tree

sciopy/EIT_16_32_64_128.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -595,14 +595,14 @@ def StartStopMeasurementFast(self, return_as="pot_mat"):
595595
elif return_as == "pot_mat":
596596
return self.get_data_as_matrix()
597597

598-
def StartStopMeasurementNew(
598+
def StartStopMeasurement(
599599
self,
600600
timeout: int = 0,
601601
return_as="pot_mat",
602602
bSaveData: bool = False,
603603
bDeleteData: bool = False,
604-
sSavepath: str = "C/",
605-
bResultsFolder=True,
604+
sSavePath: str = "C/",
605+
bResultsFolder=False,
606606
):
607607
"""
608608
Starts and stops a measurement process using the configured serial protocol (HS or FS).
@@ -631,7 +631,7 @@ def StartStopMeasurementNew(
631631
# Start measurement
632632
self.cMessageParser.clear_out_data()
633633
sCurrentPath = make_results_folder(
634-
bResultsFolder, bSaveData, sSavepath
634+
bResultsFolder, bSaveData, sSavePath
635635
) # No new path is created if bResultsFolder=False
636636

637637
self.send_message(bytearray([0xB4, 0x01, 0x01, 0xB4]))
@@ -641,8 +641,7 @@ def StartStopMeasurementNew(
641641
timeout,
642642
bSaveData=bSaveData,
643643
bDeleteDataFrame=bDeleteData,
644-
sSavePath=sCurrentPath,
645-
bResultsFolder=False,
644+
sSavePath=sCurrentPath
646645
)
647646
else:
648647
if self.setup.burst_count == 0:
@@ -651,8 +650,7 @@ def StartStopMeasurementNew(
651650
self.cMessageParser.read_usb_till_timeout(
652651
bSaveData=bSaveData,
653652
bDeleteDataFrame=bDeleteData,
654-
sSavePath=sSavepath,
655-
bResultsFolder=False,
653+
sSavePath=sCurrentPath
656654
)
657655

658656
# Stop measurement
@@ -662,7 +660,6 @@ def StartStopMeasurementNew(
662660
bSaveData=bSaveData,
663661
bDeleteDataFrame=bDeleteData,
664662
sSavePath=sCurrentPath,
665-
bResultsFolder=False,
666663
)
667664

668665
if bDeleteData:

sciopy/usb_message_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import struct
1818
from .sciopy_dataclasses import EitMeasurementSetup, EITFrame
1919
from .com_util import bytesarray_to_float, byteintarray_to_float, two_byte_to_int
20-
from datatime import datetime
20+
from datetime import datetime
2121

2222
# -------------------------------------------------------------------------------------------------------------------- #
2323
# -------------------------------------------------------------------------------------------------------------------- #

0 commit comments

Comments
 (0)