M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

pxi6733: small cleanup

This commit is contained in:
Sebastien Bourdeauducq 2015-07-04 18:49:09 +02:00
parent 504576de58
commit abd58667b9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/devices/pxi6733/driver.py
View File

@ -1,9 +1,11 @@
# Yann Sionneau <ys@m-labs.hk>, 2015 # Yann Sionneau <ys@m-labs.hk>, 2015
from ctypes import byref, c_ulong from ctypes import byref, c_ulong
import numpy as np
import logging import logging
import numpy as np
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -40,7 +42,7 @@ class DAQmx:
self.task = None self.task = None
self.daq = daq self.daq = daq
def done_callback_py(self, taskhandle, status, callback_data): def _done_callback(self, taskhandle, status, callback_data):
if taskhandle != self.task: if taskhandle != self.task:
logger.warning("done callback called with unexpected task") logger.warning("done callback called with unexpected task")
else: else:
@ -113,7 +115,7 @@ class DAQmx:
if ret: if ret:
raise IOError("Error while writing samples to the channel buffer") raise IOError("Error while writing samples to the channel buffer")
done_cb = self.daq.DAQmxDoneEventCallbackPtr(self.done_callback_py) done_cb = self.daq.DAQmxDoneEventCallbackPtr(self._done_callback)
self.task = t.taskHandle self.task = t.taskHandle
self.daq.DAQmxRegisterDoneEvent(t.taskHandle, 0, done_cb, None) self.daq.DAQmxRegisterDoneEvent(t.taskHandle, 0, done_cb, None)
t.StartTask() t.StartTask()