check over some more examples

Author: raacampbell

code/+vidrio/+AI/hardwareContinuousVoltage.m

@@ -46,7 +46,7 @@
     % Task configuration
     sampleClockSource = 'OnboardClock'; % The source terminal used for the sample Clock. 
                                         % For valid values see: zone.ni.com/reference/en-XX/help/370471AE-01/daqmxcfunc/daqmxcfgsampclktiming/
-    sampleRate = 5000;                  % Sample Rate in Hz
+    sampleRate = 10E3;                  % Sample Rate in Hz
     numSamplesPerChannel = sampleRate*2 ; % The number of samples to be stored in the buffer per channel
 
 

code/+vidrio/+AI/hardwareContinuousVoltageWithCallBack.m

@@ -37,10 +37,9 @@
 
 
     % Task configuration
-    sampleClockSource = 'OnboardClock'; % The source terminal used for the sample Clock. 
-                                        % For valid values see: zone.ni.com/reference/en-XX/help/370471AE-01/daqmxcfunc/daqmxcfgsampclktiming/
-    sampleRate = 5000;                  % Sample Rate in Hz
-    numSamplesPerChannel = sampleRate*2 ; % The number of samples to be stored in the buffer per channel
+    sampleRate = 10E3;                  % Sample Rate in Hz
+    numSamplesToPlot = 1000 ;            % Read off this many samples each time to plot
+    bufferSize_numSamplesPerChannel = 40*numSamplesToPlot; % The number of samples to be stored in the buffer per channel. 
 
 
     try
@@ -58,22 +57,23 @@
         hTask.createAIVoltageChan(devName, physicalChannels, [], minVoltage, maxVoltage);
 
 
-        % * Configure the sampling rate and the size of the buffer in samples
+        % * Configure the sampling rate and the size of the buffer in samples using the on-board sanple clock
         %   More details at: "help dabs.ni.daqmx.Task.cfgSampClkTiming"
         %   C equivalent - DAQmxCfgSampClkTiming
         %   http://zone.ni.com/reference/en-XX/help/370471AE-01/daqmxcfunc/daqmxcfgsampclktiming/
-        hTask.cfgSampClkTiming(sampleRate, 'DAQmx_Val_ContSamps', numSamplesPerChannel, sampleClockSource);
+        hTask.cfgSampClkTiming(sampleRate, 'DAQmx_Val_ContSamps', bufferSize_numSamplesPerChannel, 'OnboardClock');
 
 
         % * Set up a callback function to regularly read the buffer and plot the data.
         %   More details at: "help dabs.ni.daqmx.Task.registerEveryNSamplesEvent"
-        hTask.registerEveryNSamplesEvent(@readAndPlotData, 500, 1, 'Scaled');
+        hTask.registerEveryNSamplesEvent(@readAndPlotData, numSamplesToPlot, 1, 'Scaled');
 
 
         % Open a figure window and have it shut off the acquisition when closed
         % See: basicConcepts/windowCloseFunction.m
         fig=clf;
-        fig.CloseRequestFcn=@windowCloseFcn;
+        set(fig,'CloseRequestFcn', @windowCloseFcn, ...
+            'Name', 'Close figure window to stop acquisition')
 
 
         % Start the task and wait until it is complete. Task starts right away since we
@@ -113,12 +113,14 @@ function windowCloseFcn(~,~)
 
 
     function readAndPlotData(src,evt)
+        % This callback function runs each time a pre-defined number of points have been collected
+        % This is defined at the hTask.registerEveryNSamplesEvent method call.
         hTask = src;
         data = evt.data;
 
         errorMessage = evt.errorMessage;
-        
-        % check for errors
+
+        % check for errors and close the task if any occur. 
         if ~isempty(errorMessage)
             delete(hTask);
             error(errorMessage);

code/+vidrio/+mixed/AOandAI.m

@@ -49,21 +49,26 @@
 
     AIDevice = 'Dev1';
     AIChans = 0; 
-    AIterminalConfig = 'DAQmx_Val_RSE'; %Valid values: 'DAQmx_Val_Cfg_Default', 'DAQmx_Val_RSE', 'DAQmx_Val_NRSE', 'DAQmx_Val_Diff', 'DAQmx_Val_PseudoDiff'
+    AIterminalConfig = 'DAQmx_Val_Cfg_Default'; %Valid values: 'DAQmx_Val_Cfg_Default', 'DAQmx_Val_RSE', 'DAQmx_Val_NRSE', 'DAQmx_Val_Diff', 'DAQmx_Val_PseudoDiff'
     AODevice = 'Dev1';
     AOChan = 0; 
 
     minVoltage = -10;
     maxVoltage =  10;
 
-    sampleRate = 10e3; %Hz
-    updatePeriod = 0.15; % How often to read 
-
+    sampleRate = 30e3; % Samples per second
 
     %Play a sinewave out of the AO 
     waveform = sin(linspace(-pi,pi, sampleRate/55))' * 5; % Build a sine wave to play through the AO line. NOTE: column vector
-    numSamplesPerChannel = length(waveform) ;   % The number of samples to be stored in the buffer per channel
-
+    updatePeriod = 0.15; % How often to read 
+    readEveryNpoints=round(updatePeriod * sampleRate); % every this many points read data
+    
+    % Open a figure window and have it shut off the acquisition when closed
+    % See: basicConcepts/windowCloseFunction.m
+    fprintf('Close figure to quit acquisition\n')
+    fig = clf;
+    set(fig, 'CloseRequestFcn', @windowCloseFcn, ...
+           'Name', 'Close figure to stop acquisition')
 
     try 
         % * Create separate DAQmx tasks for the AI and AO
@@ -89,13 +94,12 @@
         %   More details at: "help dabs.ni.daqmx.Task.cfgSampClkTiming"
         %   C equivalent - DAQmxCfgSampClkTiming
         %   http://zone.ni.com/reference/en-XX/help/370471AE-01/daqmxcfunc/daqmxcfgsampclktiming/
-        hAITask.cfgSampClkTiming(sampleRate, 'DAQmx_Val_ContSamps',  round(sampleRate*updatePeriod)*10);
+        hAITask.cfgSampClkTiming(sampleRate, 'DAQmx_Val_ContSamps',  readEveryNpoints*10);
 
         % * Use a callback function to read from the buffer at the interval set by updatePeriod
         %   have been played out. Also see: basicConcepts/anonymousFunctionExample.
         %   More details at: "help dabs.ni.daqmx.Task.registerEveryNSamplesEvent"
-        hAITask.registerEveryNSamplesEvent(@readAndPlotData,  round(updatePeriod * sampleRate), false, 'Scaled');
-
+        hAITask.registerEveryNSamplesEvent(@readAndPlotData, readEveryNpoints, false, 'Scaled');
 
 
         %-------------------------------------------------------------------------------
@@ -126,16 +130,8 @@
         %   More details at: "help dabs.ni.daqmx.Task.cfgDigEdgeStartTrig"
         %   DAQmxCfgDigEdgeStartTrig
         %   http://zone.ni.com/reference/en-XX/help/370471AE-01/daqmxcfunc/daqmxcfgdigedgestarttrig/
-        hAOTask.cfgDigEdgeStartTrig(['/',AIDevice,'/ai/StartTrigger'], 'DAQmx_Val_Rising');
-
-
-        % Open a figure window and have it shut off the acquisition when closed
-        % See: basicConcepts/windowCloseFunction.m
-        fprintf('Close figure to quit acquisition\n')
-        fig = clf;
-        set(fig, 'Name', 'Close figure to stop acquisition')
-        fig.CloseRequestFcn = @windowCloseFcn;
-
+        hAOTask.cfgDigEdgeStartTrig(['/',AIDevice,'/ai/StartTrigger'], 'DAQmx_Val_Rising')
+        
         hAOTask.start();
         hAITask.start();
 
@@ -146,6 +142,7 @@
             hAITask.stop;    % Calls DAQmxStopTask
             hAOTask.stop;
             delete([hAITask, hAOTask]);  % The destructor (dabs.ni.daqmx.Task.delete) calls DAQmxClearTask
+            delete(fig)
         else
             fprintf('No task variable present for clean up\n')
         end
@@ -155,7 +152,7 @@
     end %try/catch
 
 
-    function readAndPlotData(src,evnt)
+    function readAndPlotData(src,~)
         % Scaled sets the input to be represented as a voltage value
         inData = readAnalogData(src, src.everyNSamples, 'Scaled'); 
         plot(inData)