Jan/Adalm1000_Battery_SMU
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MainCode/adalm1000_logger.py aktualisiert

Browse Source 
Mit diesen Anpassungen verschwindet:

    das Mitschleppen alter Kurven,

    die Crash-Gefahr durch eine halb abgestoppte QThread/Worker-Kombination.
C
This commit is contained in:
Jan 2025-08-05 15:07:49 +02:00
parent b5c587d981
commit d59e75cad4
1 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
MainCode/adalm1000_logger.py
View File

@ -1269,13 +1269,22 @@ class BatteryTester(QMainWindow):
def start_cycle_test(self): def start_cycle_test(self):
"""Start the battery cycle test""" """Start the battery cycle test"""
# Clean up any previous test # Clean up any previous test
if hasattr(self, 'test_sequence_worker'):
try:
self.test_sequence_worker.stop()
except:
pass
self.test_sequence_worker.deleteLater()
if hasattr(self, 'test_sequence_thread'): if hasattr(self, 'test_sequence_thread'):
self.test_sequence_thread.quit() self.test_sequence_thread.quit()
self.test_sequence_thread.wait(500) self.test_sequence_thread.wait()
if hasattr(self, 'test_sequence_worker'): self.test_sequence_thread.deleteLater()
self.test_sequence_worker.deleteLater()
del self.test_sequence_thread del self.test_sequence_thread
self.reset_test()
self.reset_plot()
if hasattr(self, 'measurement_thread'):
self.measurement_thread.start_time = time.time()
# Reset stop flag # Reset stop flag
self.request_stop = False self.request_stop = False
@ -1376,11 +1385,20 @@ class BatteryTester(QMainWindow):
def start_discharge_test(self): def start_discharge_test(self):
"""Start the battery discharge test""" """Start the battery discharge test"""
# Clean up any previous test # Clean up any previous test
self.reset_test() # löscht time_data, voltage_data, current_data, display_*, phase_data
self.reset_plot()
if hasattr(self, 'measurement_thread'):
self.measurement_thread.start_time = time.time()
if hasattr(self, 'discharge_worker'):
try:
self.discharge_worker.stop()
except:
pass
self.discharge_worker.deleteLater()
if hasattr(self, 'discharge_thread'): if hasattr(self, 'discharge_thread'):
self.discharge_thread.quit() self.discharge_thread.quit()
self.discharge_thread.wait(500) self.discharge_thread.wait() # warte unbegrenzt, bis er wirklich fertig ist
if hasattr(self, 'discharge_worker'): self.discharge_thread.deleteLater()
self.discharge_worker.deleteLater()
del self.discharge_thread del self.discharge_thread
# Reset stop flag # Reset stop flag
@ -1472,12 +1490,21 @@ class BatteryTester(QMainWindow):
def start_charge_test(self): def start_charge_test(self):
"""Start the battery charge test""" """Start the battery charge test"""
# Clean up any previous test # Clean up any previous test
if hasattr(self, 'charge_worker'):
try:
self.charge_worker.stop()
except:
pass
self.charge_worker.deleteLater()
if hasattr(self, 'charge_thread'): if hasattr(self, 'charge_thread'):
self.charge_thread.quit() self.charge_thread.quit()
self.charge_thread.wait(500) self.charge_thread.wait()
if hasattr(self, 'charge_worker'): self.charge_thread.deleteLater()
self.charge_worker.deleteLater()
del self.charge_thread del self.charge_thread
self.reset_test()
self.reset_plot()
if hasattr(self, 'measurement_thread'):
self.measurement_thread.start_time = time.time()
# Reset stop flag # Reset stop flag
self.request_stop = False self.request_stop = False