Commit a80bf1d2 authored by Vincent Michel's avatar Vincent Michel Committed by Sebastien Petitdemange
Browse files

Python 3 migration - Update motor modules

parent 5a750777
...@@ -206,9 +206,9 @@ class Mockup(Controller): ...@@ -206,9 +206,9 @@ class Mockup(Controller):
_pos = self.read_position(axis) / float(axis.steps_per_unit) _pos = self.read_position(axis) / float(axis.steps_per_unit)
if self.__encoders[encoder]["measured_noise"] > 0: amplitude = self.__encoders[encoder]["measured_noise"]
if amplitude is not None and amplitude > 0:
# Simulates noisy encoder. # Simulates noisy encoder.
amplitude = self.__encoders[encoder]["measured_noise"]
noise_mm = random.uniform(-amplitude, amplitude) noise_mm = random.uniform(-amplitude, amplitude)
_pos += noise_mm _pos += noise_mm
......
...@@ -230,9 +230,8 @@ class IntegratingCounterAcquisitionDevice(BaseCounterAcquisitionDevice): ...@@ -230,9 +230,8 @@ class IntegratingCounterAcquisitionDevice(BaseCounterAcquisitionDevice):
) )
): ):
warnings.warn( warnings.warn(
"IntegratingCounterAcquisitionDevice: npoints, \ "IntegratingCounterAcquisitionDevice: npoints, prepare_once or "
prepare_once or start_once flags will be overwritten\ "start_once flags will be overwritten by master controller"
by master controller"
) )
reader, counters = _get_group_reader(counters_or_groupreadhandler) reader, counters = _get_group_reader(counters_or_groupreadhandler)
......
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