From 6dbdc361ba4e63ae3430e70e56502e1150b40ac1 Mon Sep 17 00:00:00 2001 From: syr1us Date: Wed, 30 Dec 2015 14:02:45 +0100 Subject: callback should work with any TrigMode... --- src/events.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/events.py b/src/events.py index 72af453..e6dc5b1 100644 --- a/src/events.py +++ b/src/events.py @@ -373,13 +373,12 @@ class EventMapper(object): trigval = sci.ltrig if pos == Pos.LEFT else sci.rtrig trigval_prev = sci_p.ltrig if pos == Pos.LEFT else sci_p.rtrig mode, ev = self._trig_evts[pos] - if self._trig_modes[pos] == TrigModes.AXIS: - if trigval != trigval_prev: - if self._trig_axes_callbacks[pos]: - self._trig_axes_callbacks[pos](self, pos, trigval) - else: - syn.add(mode) - self._uip[mode].axisEvent(ev, trigval) + if trigval != trigval_prev: + if self._trig_axes_callbacks[pos]: + self._trig_axes_callbacks[pos](self, pos, trigval) + elif self._trig_modes[pos] == TrigModes.AXIS: + syn.add(mode) + self._uip[mode].axisEvent(ev, trigval) elif self._trig_modes[pos] == TrigModes.BUTTON: if self._trig_s[pos] is None and trigval > min(trigval_prev + 10, 200): self._trig_s[pos] = max(0, min(trigval - 10, 180)) -- cgit v1.2.3