diff --git a/cpdctrl/led_script.py b/cpdctrl/led_script.py index 48f8961..d38e9fe 100644 --- a/cpdctrl/led_script.py +++ b/cpdctrl/led_script.py @@ -109,9 +109,12 @@ class LedScript: bool Whether is past the script length """ - if t is None: t = time.time() - return t >= self.script["dtsum"][-1] + dt = self.get_dt(t) + return dt >= self.script["dtsum"][-1] + def get_dt(self, t: None|float=None) -> float: + if t is None: t = time.time() + return t - self.t_start def get_state(self, t: None|float=None) -> int: """ @@ -129,9 +132,7 @@ class LedScript: int LED Intensity [0,100] """ - if t is None: - t = time.time() - dt = t - self.t_start + dt = self.get_dt(t) return self.get_relative_state(dt) def get_relative_state(self, dt: float) -> int: diff --git a/cpdctrl/measurement.py b/cpdctrl/measurement.py index 25b11fa..500e86b 100644 --- a/cpdctrl/measurement.py +++ b/cpdctrl/measurement.py @@ -134,6 +134,7 @@ def measure( t_iter_start = time.time() # 5) update LED if stop_on_script_end and led_script.is_done(t_iter_start): + if verbose: print("Reached script end") break new_led_val = led_script.get_state(t_iter_start) if new_led_val != led_val: