diff options
| author | Wolfgang Draxinger (root@gar-ex-erdastep) <Wolfgang.Draxinger@physik.uni-muenchen.de> | 2011-12-12 19:59:22 +0100 |
|---|---|---|
| committer | Wolfgang Draxinger (root@gar-ex-erdastep) <Wolfgang.Draxinger@physik.uni-muenchen.de> | 2011-12-12 19:59:22 +0100 |
| commit | 233782803b5b73502a594dcfbd155782f99d4c23 (patch) | |
| tree | d9f6ccfb4adc0ab049a5b2e062a2a1a8814168ae /MotionControl/Axis.py | |
| parent | 1fd3f21436a53375a59035486cf3d2e1a6035bbb (diff) | |
| download | PyMotionControl-233782803b5b73502a594dcfbd155782f99d4c23.tar.gz PyMotionControl-233782803b5b73502a594dcfbd155782f99d4c23.tar.bz2 | |
Diffstat (limited to 'MotionControl/Axis.py')
| -rw-r--r-- | MotionControl/Axis.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/MotionControl/Axis.py b/MotionControl/Axis.py index d137d54..42f6222 100644 --- a/MotionControl/Axis.py +++ b/MotionControl/Axis.py @@ -1,10 +1,9 @@ # -*- coding: utf8 -*- class Axis(object): - def __init__(self, limits=None, inverted = False, scale={}): + def __init__(self, limits=None, scale={}): from blinker import Signal self.limits = limits - self.inverted = inverted self.scale = scale self.position = None self.running = None @@ -15,8 +14,7 @@ class Axis(object): self.initiator_error = None self.temperature_warning = None self.onPosition = Signal() - self.onStarted = Signal() - self.onStopped = Signal() + self.onRunning = Signal() self.onInitializing = Signal() self.onInitialized = Signal() self.onInitiatorMinus = Signal() @@ -40,10 +38,7 @@ class Axis(object): self.onPosition.send(self, position = self.position) if last_running != self.running: - if self.running: - self.onStarted.send(self) - else: - self.onStopped.send(self) + self.onRunning.send(self, running = self.running) if last_initializing != self.initializing: self.onInitializing.send(self, initializing = self.initializing) |