diff --git a/MainCode/adalm1000_logger.py b/MainCode/adalm1000_logger.py index bc9c5c8..e7b47d6 100644 --- a/MainCode/adalm1000_logger.py +++ b/MainCode/adalm1000_logger.py @@ -105,11 +105,10 @@ class DeviceDisconnectedError(Exception): class MeasurementThread(QThread): update_signal = pyqtSignal(float, float, float) error_signal = pyqtSignal(str) - + def __init__(self, device, interval=0.1): super().__init__() - self.devices = {} # serial -> DeviceManager - self.active_device = None + self.device = device self.interval = interval self._running = False self.filter_window_size = 10 @@ -118,13 +117,12 @@ class MeasurementThread(QThread): self.start_time = None self.measurement_queue = Queue(maxsize=1) self.current_direction = 1 # 1 for source, -1 for sink - + def run(self): """Continuous measurement loop""" self._running = True - if self.start_time is None: # Nur setzen wenn noch nicht gesetzt + if self.start_time is None: self.start_time = time.time() - while self._running: try: samples = self.device.read(self.filter_window_size, 500, True)