trigger

[psychlops/cpp.git] / psychlops / extension / devices / psychlops_devices_nidaqmx.h

diff --git a/psychlops/extension/devices/psychlops_devices_nidaqmx.h b/psychlops/extension/devices/psychlops_devices_nidaqmx.h
index a7eba92..2f90c1d 100644 (file)
--- a/psychlops/extension/devices/psychlops_devices_nidaqmx.h
+++ b/psychlops/extension/devices/psychlops_devices_nidaqmx.h
@@ -36,13 +36,14 @@ namespace Devices {
                virtual bool isAnalog();
 
                virtual double get();
-               virtual int NIDAQmx::get(double* buf, int length, double timeout_second);
+               virtual int get(double* buf, int length, double timeout_second);
                virtual void put(double);
+               virtual void trigger();
                virtual void pulse(double);
                virtual void keep(double);
        };
 
-       class AnalogInput_NIDAQmx : public ITrigger, public AnalogInput {
+       class AnalogInput_NIDAQmx : public AnalogInput {
                protected:
                NIDAQmxAPI *api;
 
@@ -75,6 +76,7 @@ namespace Devices {
                virtual ~AnalogOutput_NIDAQmx();
                virtual void put(double);
                static void setVoltage(double val, const char* devname = "Dev1/ao0");
+               virtual void trigger();
                virtual void pulse(double);
                virtual void keep(double);