diff options
| author | Wolfgang Draxinger (root@gar-ex-erdastep) <Wolfgang.Draxinger@physik.uni-muenchen.de> | 2011-12-09 22:29:15 +0100 |
|---|---|---|
| committer | Wolfgang Draxinger (root@gar-ex-erdastep) <Wolfgang.Draxinger@physik.uni-muenchen.de> | 2011-12-09 22:29:15 +0100 |
| commit | 1fd3f21436a53375a59035486cf3d2e1a6035bbb (patch) | |
| tree | 598acab8cfb2883571f875c29abc0bc197433d92 /MotionControl/PhytronAxis.py | |
| parent | 4b19fc744937e53c8689733f25dedf80fa8fd396 (diff) | |
| download | PyMotionControl-1fd3f21436a53375a59035486cf3d2e1a6035bbb.tar.gz PyMotionControl-1fd3f21436a53375a59035486cf3d2e1a6035bbb.tar.bz2 | |
rpyc too laggy
Diffstat (limited to 'MotionControl/PhytronAxis.py')
| -rw-r--r-- | MotionControl/PhytronAxis.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/MotionControl/PhytronAxis.py b/MotionControl/PhytronAxis.py index 80e1c47..986dad7 100644 --- a/MotionControl/PhytronAxis.py +++ b/MotionControl/PhytronAxis.py @@ -5,8 +5,8 @@ from Axis import Axis class PhytronAxis(Axis): INITIATOR_MINUS = 1 INITIATOR_PLUS = 2 - def __init__(self, ipcomm_axis, max_run_freq=None, initiator=INITIATOR_MINUS, initiator_position = 0, inverted = False, scale={}): - super(PhytronAxis, self).__init__(inverted = inverted, scale = scale) + def __init__(self, ipcomm_axis, limits=None, max_run_freq=None, initiator=INITIATOR_MINUS, initiator_position = 0, inverted = False, limited = True, scale={}): + super(PhytronAxis, self).__init__(limits = limits, inverted = inverted, scale = scale) self.ipcomm_axis = ipcomm_axis if not max_run_freq: @@ -16,6 +16,11 @@ class PhytronAxis(Axis): self.initiator = initiator self.initiator_position = initiator_position self.onInitialized.connect(self.handle_initialized) + + self.ipcomm_axis.limited = limited + + def __del__(self): + self.ipcomm_axis.stop() def handle_initialized(self, sender, initialized): if self.initialisation and sender == self and initialized: |