Merge branch 'dev'

Author: raacampbell

code/+vidrio/+AI/hardwareContinuousVoltage.m

@@ -25,9 +25,10 @@
     % 
     % Also see:
     % Vidrio example: dabs.ni.daqmx.demos.AnalogInput.Voltage_Continuous_Input
-    % The following two examples are similar but use a callback function to plot the data
+    % The following examples are similar but use a callback function to plot the data:
     % TMW DAQ Toolbox example: daqtoolbox.AI.analogInput_Continuous
     % ANSI C: DAQmx_ANSI_C_examples/AI/ContAcq-IntClk.c 
+    % vidrio.AI.hardwareContinuousVoltageWithCallBack
     % PyDAQmx: https://pythonhosted.org/PyDAQmx/callback.html
 
 
@@ -76,7 +77,7 @@
         hTask.start
 
 
-        fprintf('Recoding data on %s. Hit ctrl-C to stop.\n', devName);
+        fprintf('Recording data on %s. Hit ctrl-C to stop.\n', devName);
         clf 
         while 1
             % readAnalogData returns once 500 samples have been acquired or the 5 second timeout is reached

code/+vidrio/+AI/hardwareContinuousVoltageWithCallBack.m

@@ -28,7 +28,7 @@
 
 
     % Parameters for the acquisition (device and channels)
-    devName = 'scan';       % the name of the DAQ device as shown in MAX
+    devName = 'Dev1';       % the name of the DAQ device as shown in MAX
     taskName = 'hardAI';    % A string that will provide a label for the task
     physicalChannels = 0:3; % A scalar or an array with the channel numbers
     minVoltage = -0.5;       % Channel input range minimum

code/+vidrio/+AO/hardwareFiniteVoltage.m

@@ -54,7 +54,7 @@
     sampleRate = 1000;                  % Sample Rate in Hz
 
     % Build one cycle of a sine wave to play through the AO line (note the transpose)
-    waveForm=sin(linspace(-pi,pi, sampleRate))';
+    waveForm = sin(linspace(-pi,pi, sampleRate))';
     numSamplesPerChannel = length(waveForm) ;   % The number of samples to be stored in the buffer per channel