fixed state lock
This commit is contained in:
parent
96422fe0d2
commit
2108ce78fc
1 changed files with 6 additions and 3 deletions
|
|
@ -639,7 +639,8 @@ class StitchingScanner:
|
||||||
self._displacement_since_append_x += dx
|
self._displacement_since_append_x += dx
|
||||||
self._displacement_since_append_y += dy
|
self._displacement_since_append_y += dy
|
||||||
total_x += dx
|
total_x += dx
|
||||||
self.state.current_x += dx
|
with self._state_lock:
|
||||||
|
self.state.current_x += dx
|
||||||
|
|
||||||
with self._state_lock:
|
with self._state_lock:
|
||||||
self.state.cumulative_x = self._displacement_since_append_x
|
self.state.cumulative_x = self._displacement_since_append_x
|
||||||
|
|
@ -717,7 +718,8 @@ class StitchingScanner:
|
||||||
|
|
||||||
self._displacement_since_append_y += dy
|
self._displacement_since_append_y += dy
|
||||||
total_y += dy
|
total_y += dy
|
||||||
self.state.current_y += dy
|
with self._state_lock:
|
||||||
|
self.state.current_y += dy
|
||||||
|
|
||||||
with self._state_lock:
|
with self._state_lock:
|
||||||
self.state.cumulative_y = total_y
|
self.state.cumulative_y = total_y
|
||||||
|
|
@ -742,7 +744,8 @@ class StitchingScanner:
|
||||||
# Done when we've moved enough
|
# Done when we've moved enough
|
||||||
if abs(total_y) >= target_displacement:
|
if abs(total_y) >= target_displacement:
|
||||||
self.log(f"Row transition complete: {abs(total_y):.1f}px")
|
self.log(f"Row transition complete: {abs(total_y):.1f}px")
|
||||||
self.state.current_y = 0
|
with self._state_lock:
|
||||||
|
self.state.current_y = 0
|
||||||
self.motion.send_command('s')
|
self.motion.send_command('s')
|
||||||
time.sleep(self.config.settle_time)
|
time.sleep(self.config.settle_time)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue