aboutsummaryrefslogtreecommitdiff
path: root/MotionControl/PhytronAxis.py
diff options
context:
space:
mode:
Diffstat (limited to 'MotionControl/PhytronAxis.py')
-rw-r--r--MotionControl/PhytronAxis.py9
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: