Added new analog input read implementation

.gitignore

@@ -216,4 +216,5 @@ pip-log.txt
 *.mo
 
 #Mr Developer
-.mr.developer.cfg
+.mr.developer.cfg
+/nuget.config

NetDAQmx.sln

@@ -13,20 +13,54 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		readme.md = readme.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetDaqmx.Tests", "NetDaqmx.Tests\NetDaqmx.Tests.csproj", "{50560A28-0BDD-4F44-8FD4-22D42F85DAF1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{3E0D153A-24B3-4587-A7A1-6B59FFE157AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3E0D153A-24B3-4587-A7A1-6B59FFE157AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E0D153A-24B3-4587-A7A1-6B59FFE157AA}.Debug|x64.ActiveCfg = Debug|x64
+		{3E0D153A-24B3-4587-A7A1-6B59FFE157AA}.Debug|x64.Build.0 = Debug|x64
+		{3E0D153A-24B3-4587-A7A1-6B59FFE157AA}.Debug|x86.ActiveCfg = Debug|x86
+		{3E0D153A-24B3-4587-A7A1-6B59FFE157AA}.Debug|x86.Build.0 = Debug|x86
 		{3E0D153A-24B3-4587-A7A1-6B59FFE157AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3E0D153A-24B3-4587-A7A1-6B59FFE157AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E0D153A-24B3-4587-A7A1-6B59FFE157AA}.Release|x64.ActiveCfg = Release|x64
+		{3E0D153A-24B3-4587-A7A1-6B59FFE157AA}.Release|x64.Build.0 = Release|x64
+		{3E0D153A-24B3-4587-A7A1-6B59FFE157AA}.Release|x86.ActiveCfg = Release|x86
+		{3E0D153A-24B3-4587-A7A1-6B59FFE157AA}.Release|x86.Build.0 = Release|x86
 		{D22D6FF4-D0A1-457D-8A9C-0D4AD207DDDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D22D6FF4-D0A1-457D-8A9C-0D4AD207DDDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D22D6FF4-D0A1-457D-8A9C-0D4AD207DDDE}.Debug|x64.ActiveCfg = Debug|x64
+		{D22D6FF4-D0A1-457D-8A9C-0D4AD207DDDE}.Debug|x64.Build.0 = Debug|x64
+		{D22D6FF4-D0A1-457D-8A9C-0D4AD207DDDE}.Debug|x86.ActiveCfg = Debug|x86
+		{D22D6FF4-D0A1-457D-8A9C-0D4AD207DDDE}.Debug|x86.Build.0 = Debug|x86
 		{D22D6FF4-D0A1-457D-8A9C-0D4AD207DDDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D22D6FF4-D0A1-457D-8A9C-0D4AD207DDDE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D22D6FF4-D0A1-457D-8A9C-0D4AD207DDDE}.Release|x64.ActiveCfg = Release|x64
+		{D22D6FF4-D0A1-457D-8A9C-0D4AD207DDDE}.Release|x64.Build.0 = Release|x64
+		{D22D6FF4-D0A1-457D-8A9C-0D4AD207DDDE}.Release|x86.ActiveCfg = Release|x86
+		{D22D6FF4-D0A1-457D-8A9C-0D4AD207DDDE}.Release|x86.Build.0 = Release|x86
+		{50560A28-0BDD-4F44-8FD4-22D42F85DAF1}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{50560A28-0BDD-4F44-8FD4-22D42F85DAF1}.Debug|Any CPU.Build.0 = Debug|x86
+		{50560A28-0BDD-4F44-8FD4-22D42F85DAF1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{50560A28-0BDD-4F44-8FD4-22D42F85DAF1}.Debug|x64.Build.0 = Debug|Any CPU
+		{50560A28-0BDD-4F44-8FD4-22D42F85DAF1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{50560A28-0BDD-4F44-8FD4-22D42F85DAF1}.Debug|x86.Build.0 = Debug|Any CPU
+		{50560A28-0BDD-4F44-8FD4-22D42F85DAF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50560A28-0BDD-4F44-8FD4-22D42F85DAF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50560A28-0BDD-4F44-8FD4-22D42F85DAF1}.Release|x64.ActiveCfg = Release|Any CPU
+		{50560A28-0BDD-4F44-8FD4-22D42F85DAF1}.Release|x64.Build.0 = Release|Any CPU
+		{50560A28-0BDD-4F44-8FD4-22D42F85DAF1}.Release|x86.ActiveCfg = Release|Any CPU
+		{50560A28-0BDD-4F44-8FD4-22D42F85DAF1}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

NetDAQmx/DllWrapper.cs

@@ -0,0 +1,241 @@
+using NetDAQmx.Helpers;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace NetDAQmx;
+
+/// <summary>
+/// The main DLL wrapper of nicaiu.dll
+/// </summary>
+public static class DllWrapper
+{
+    /// <summary>
+    /// Reads all available samples parameter
+    /// </summary>
+    public const int DAQmx_Val_Auto = -1;
+    /// <summary>
+    /// Values for the Line Grouping parameter of DAQmxCreateDIChan and DAQmxCreateDOChan
+    /// </summary>
+    public enum DAQmxLineGrouping
+    {
+        /// <summary>
+        /// One Channel For Each Line
+        /// </summary>
+        ChanPerLine = 0,
+        /// <summary>
+        /// One Channel For All Lines
+        /// </summary>
+        ChanForAllLines = 1
+    }
+
+    /// <summary>
+    /// Values for the Data Layout parameter of DAQmxWriteAnalogF64, DAQmxWriteBinaryI16, DAQmxWriteDigitalU8, DAQmxWriteDigitalU32, DAQmxWriteDigitalLines
+    /// </summary>
+    public enum DAQmxDataLayout
+    {
+        /// <summary>
+        /// Group by Channel
+        /// </summary>
+        GroupByChannel = 0,
+        /// <summary>
+        /// Group by Scan Number
+        /// </summary>
+        GroupByScanNumber = 1
+    }
+
+    /// <summary>
+    /// Values for DAQmx_AI_TermCfg
+    /// </summary>
+    public enum DAQmxAITerminalConfiguration
+    {
+        /// <summary>
+        /// At run time, NI-DAQmx chooses the default terminal configuration for the channel
+        /// </summary>
+        Default = -1,
+        /// <summary>
+        /// Referenced single-ended mode
+        /// </summary>
+        RSE = 10083,
+        /// <summary>
+        /// Non-referenced single-ended mode
+        /// </summary>
+        NRSE = 10078,
+        /// <summary>
+        /// Differential mode
+        /// </summary>
+        Differential = 10106,
+        /// <summary>
+        /// Pseudodifferential mode
+        /// </summary>
+        PseudoDiff = 12529
+    }
+
+    /// <summary>
+    /// Values for DAQmx_AO_Voltage_Units
+    /// </summary>
+    public enum DAQmxAOVoltageUnits
+    {
+        /// <summary>
+        /// Volts
+        /// </summary>
+        Volts = 10348,
+        /// <summary>
+        /// From Custom Scale
+        /// </summary>
+        FromCustomScale = 10065
+    }
+
+    private const string DllPath = @"nicaiu.dll";
+
+    /// <summary>
+    /// Get the connected to the system devices
+    /// </summary>
+    /// <param name="data"> Buffer where device names will be stored</param>
+    /// <param name="bufferSize">Size of the buffer</param>
+    /// <returns></returns>
+    [DllImport(DllPath, CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
+    private static extern int DAQmxGetSysDevNames([Out] char[] data, uint bufferSize);
+
+    /// <summary>
+    /// Indicates the names of all devices installed in the system
+    /// </summary>
+    /// <param name="data">Buffer to store device names</param>
+    /// <returns>The error code returned by the function in the event of an error or warning. A value of 0 indicates success. A positive value indicates a warning. A negative value indicates an error.</returns>
+    internal static int DAQmxGetSysDevNames(char[] data)
+    {
+        return DAQmxGetSysDevNames(data, (uint)data.Length);
+    }
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxGetPhysicalChanDOPortWidth(string physicalChannel, out uint data);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxCreateTask(string taskName, out IntPtr taskHandle);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxCreateDOChan(IntPtr taskHandle, string lines, string nameToAssignToLines, DAQmxLineGrouping lineGrouping);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxCreateAIVoltageChan(IntPtr taskHandle, string physicalChannel, string nameToAssignToChannel, DAQmxAITerminalConfiguration terminalConfig, double minVal, double maxVal, DAQmxAOVoltageUnits units, string? customScaleName = null);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxCreateAOVoltageChan(IntPtr taskHandle, string physicalChannel, string nameToAssignToChannel, double minVal, double maxVal, DAQmxAOVoltageUnits units, string? customScaleName = null);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxWriteDigitalLines(IntPtr taskHandle, int numSampsPerChan, bool autoStart, double timeout, DAQmxDataLayout dataLayout, byte[] writeArray, out int sampsPerChanWritten, IntPtr reserved);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    private static extern int DAQmxWriteDigitalU8(IntPtr taskHandle, int numSampsPerChan, bool autoStart, double timeout, DAQmxDataLayout dataLayout, byte[] writeArray, out int sampsPerChanWritten, IntPtr reserved);
+
+    internal static int DAQmxWriteDigitalU8(IntPtr taskHandle, int numSampsPerChan, bool autoStart, double timeout, DAQmxDataLayout dataLayout, byte[] writeArray, out int sampsPerChanWritten)
+    {
+        return DAQmxWriteDigitalU8(taskHandle, numSampsPerChan, autoStart, timeout, dataLayout, writeArray, out sampsPerChanWritten, IntPtr.Zero);
+    }
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    private static extern int DAQmxWriteAnalogScalarF64(IntPtr taskHandle, bool autoStart, double timeout, double value, IntPtr reserved);
+
+    internal static int DAQmxWriteAnalogScalarF64(IntPtr taskHandle, bool autoStart, double timeout, double value)
+    {
+        return DAQmxWriteAnalogScalarF64(taskHandle, autoStart, timeout, value, IntPtr.Zero);
+    }
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    private static extern int DAQmxReadDigitalLines(IntPtr taskHandle, int numSampsPerChan, double timeout, DAQmxDataLayout fillMode, byte[] readArray, uint arraySizeInBytes, out int sampsPerChanRead, out int numBytesPerSamp, IntPtr reserved);
+    internal static int DAQmxReadDigitalLines(IntPtr taskHandle, int numSampsPerChan, double timeout, DAQmxDataLayout fillMode, byte[] readArray, uint arraySizeInBytes, out int sampsPerChanRead, out int numBytesPerSamp)
+    {
+        return DAQmxReadDigitalLines(taskHandle, numSampsPerChan, timeout, fillMode, readArray, arraySizeInBytes, out sampsPerChanRead, out numBytesPerSamp, IntPtr.Zero);
+    }
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    private static extern int DAQmxReadAnalogScalarF64(
+    IntPtr taskHandle,
+    double timeout,
+    out double value,
+    IntPtr reserved
+);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    private static extern int DAQmxReadAnalogF64(
+    IntPtr taskHandle,
+    int numSampsPerChan,
+    double timeout,
+    DAQmxDataLayout fillMode,
+    double[] readArray,
+    uint arraySizeInSamps,
+    out int sampsPerChanRead,
+    IntPtr reserved
+    );
+
+    internal static int DAQmxReadAnalogF64(DaqTask daqTask,
+    int numSampsPerChan,
+    double timeout,
+    DAQmxDataLayout fillMode,
+    double[] readArray,
+    uint arraySizeInSamps,
+    out int sampsPerChanRead)
+    {
+        return DAQmxReadAnalogF64(daqTask.handle, numSampsPerChan, timeout, fillMode, readArray, arraySizeInSamps, out sampsPerChanRead, IntPtr.Zero);
+    }
+
+    internal static int DAQmxReadAnalogF64(DaqTask daqTask, double timeout, DAQmxDataLayout fillMode, double[] readArray, uint arraySizeInSamps, out int sampsPerChanRead, int numSampsPerChan = DAQmx_Val_Auto)
+    {
+        return DAQmxReadAnalogF64(daqTask, numSampsPerChan, timeout, fillMode, readArray, arraySizeInSamps, out sampsPerChanRead);
+    }
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    private static extern int DAQmxReadDigitalU8(IntPtr taskHandle, int numSampsPerChan, double timeout, DAQmxDataLayout fillMode, byte[] readArray, uint arraySizeInSamps, out int sampsPerChanRead, IntPtr reserved);
+
+    /// <summary>
+    /// Reads a specified digital port as a 8bit number
+    /// </summary>
+    /// <param name="task"></param>
+    /// <param name="numSampsPerChan"></param>
+    /// <param name="timeout"></param>
+    /// <param name="fillMode"></param>
+    /// <param name="readArray"></param>
+    /// <param name="arraySizeInSamps"></param>
+    /// <param name="sampsPerChanRead"></param>
+    /// <returns></returns>
+    public static int DAQmxReadDigitalU8(Helpers.DaqTask task, int numSampsPerChan, double timeout, DAQmxDataLayout fillMode, byte[] readArray, uint arraySizeInSamps, out int sampsPerChanRead)
+    {
+        return DAQmxReadDigitalU8(task.handle, numSampsPerChan, timeout, fillMode, readArray, arraySizeInSamps, out sampsPerChanRead, IntPtr.Zero);
+    }
+
+    internal static int DAQmxReadAnalogScalarF64(IntPtr taskHandle, double timeout, out double value)
+    {
+        return DAQmxReadAnalogScalarF64(taskHandle, timeout, out value, IntPtr.Zero);
+    }
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxClearTask(IntPtr taskHandle);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxResetDevice(string deviceName);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxGetDeviceAttribute(string deviceName, int attribute, IntPtr value);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxGetErrorString(int errorCode, StringBuilder errorString, uint bufferSize);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxGetExtendedErrorInfo(StringBuilder errorString, uint bufferSize);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxGetTaskName(IntPtr taskHandle, StringBuilder data, uint bufferSize);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxGetTaskChannels(IntPtr taskHandle, StringBuilder data, uint bufferSize);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxGetTaskNumChans(IntPtr taskHandle, out uint data);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxLoadTask(string taskName, out IntPtr taskHandle);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxStartTask(IntPtr taskHandle);
+
+    [DllImport(DllPath, CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
+    internal static extern int DAQmxStopTask(IntPtr taskHandle);
+}

NetDAQmx/Helpers/DaqTask.cs

@@ -0,0 +1,28 @@
+namespace NetDAQmx.Helpers;
+/// <summary>
+/// The `Daq` functions usually operate on a "Task" handle.  This handle should be closed when finished.
+/// To ensure that it will be closed, we created this IDisposable object.
+/// </summary>
+public class DaqTask : IDisposable
+{
+    internal IntPtr handle;
+    /// <summary>
+    /// Construct a daq task with a name (default is empty string)
+    /// </summary>
+    /// <param name="taskName">The task name</param>
+    public DaqTask(string taskName = "")
+    {
+        var status = DllWrapper.DAQmxCreateTask(taskName, out handle);
+        NIDAQ.ThrowError(status);
+    }
+
+    /// <summary>
+    /// Fun Fact!  Dispose is not called in debug mode.  However, it does work when we 'Start Without Debugging'
+    /// https://stackoverflow.com/questions/518352/does-dispose-still-get-called-when-exception-is-thrown-inside-of-a-using-stateme
+    /// </summary>
+    public void Dispose()
+    {
+        var status = DllWrapper.DAQmxClearTask(handle);
+        NIDAQ.ThrowError(status);
+    }
+}