Commit a5f78923 authored by Matias Guijarro's avatar Matias Guijarro
Browse files

Merge branch '2859-wrong-controller-velocity-is-different-from-set-velocity-warning' into 'master'

Resolve "wrong "controller velocity is different from set velocity" warning"

Closes #2859

See merge request !3868
parents f9993140 08a7355c
Pipeline #50654 failed with stages
in 100 minutes and 38 seconds
......@@ -1298,7 +1298,7 @@ class Axis(Scannable):
_user_vel = self.__controller.read_velocity(self) / abs(self.steps_per_unit)
if new_velocity != _user_vel:
if not math.isclose(new_velocity, _user_vel, rel_tol=1e-4):
log_warning(
self,
f"Controller velocity ({_user_vel}) is different from set velocity ({new_velocity})",
......
......@@ -244,8 +244,8 @@ OUTPUT_UMV_CALC_MOT2 = """
calc_mot2[keV] calc_mot1[keV] roby
\x1b[Fuser 0.000 0.000 0.000
dial 0.000 0.000 0.000\x1b[Fuser 4.000 2.000 1.000
dial 4.000 2.000 1.000
dial 0.000 0.000 0.000\x1b[Fuser 8.000 4.000 2.000
dial 8.000 4.000 2.000
"""
......@@ -259,7 +259,7 @@ def test_umv_shell(capfd, default_session):
def test_umv_calc_shell(capfd, default_session):
calc_mot2 = default_session.config.get("calc_mot2")
try:
umv(calc_mot2, 4)
umv(calc_mot2, 8)
output = capfd.readouterr().out
assert output == OUTPUT_UMV_CALC_MOT2
finally:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment