Merge branch 'bomber8013-master'

JaneliaSciComp · Apr 21, 2019 · 190fb1d · 190fb1d · bjarthur · Apr 21, 2019
2 parents af439b8 + cb1e6de
commit 190fb1d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/src/NIDAQ.jl b/src/NIDAQ.jl
@@ -42,6 +42,8 @@ export analog_input_channels, analog_output_channels
 export digital_input_channels, digital_output_channels
 export counter_input_channels, counter_output_channels
 
+export RSE, NRSE, Differential, PseudoDifferential
+
 const NIDAQmx = "C:\\Windows\\System32\\nicaiu.dll"
 const SafeCstring = Ref{UInt8}
 

diff --git a/src/analog.jl b/src/analog.jl
@@ -1,8 +1,5 @@
-analog_input_configs = Dict{AbstractString,Number}(
-    "referenced single-ended" => Val_RSE,
-    "non-referenced single-ended" => Val_NRSE,
-    "pseudo-differential" => Val_PseudoDiff,
-    "differential" => Val_Diff )
+@enum TerminalConfig::Cuint RSE=Val_RSE NRSE=Val_NRSE Differential=Val_Diff PseudoDifferential=Val_PseudoDiff
+
 
 """
 `analog_input(channel, config, range) -> task`
@@ -11,22 +8,22 @@ analog_input_configs = Dict{AbstractString,Number}(
 
 create an analog input channel, and a new task if one is not specified
 """
-function analog_input(channel::String; terminal_config="differential", range=nothing)
+function analog_input(channel::String; terminal_config::TerminalConfig=Differential, range=nothing)
     t = AITask()
     analog_input(t, channel, terminal_config=terminal_config, range=range)
     t
 end
 
 function analog_input(t::AITask, channel::String;
-        terminal_config="differential", range=nothing)
+        terminal_config::TerminalConfig=Differential, range=nothing)
     if range==nothing
         device::String = split(channel,'/')[1]
         range=float(analog_input_ranges(device)[end,:])
     end
     catch_error( CreateAIVoltageChan(t.th,
             Ref(codeunits(channel),1),
             Ref(codeunits(""), 1),
-            analog_input_configs[terminal_config],
+            terminal_config,
             range[1], range[2],
             Val_Volts,
             convert(Ptr{UInt8},C_NULL)) )
@@ -67,8 +64,10 @@ read_analog_cfunctions = Dict{Type,Function}(
     UInt16 => ReadBinaryU16,
     UInt32 => ReadBinaryU32 )
 
-function read(t::AITask, precision::DataType, num_samples_per_chan::Integer = -1)
-    num_channels = getproperties(t)["NumChans"][1]
+function read(t::AITask, num_samples_per_chan::Integer = -1, precision::DataType = Float64)
+    outdata_ref = Ref{Cuint}()
+    DAQmxGetTaskNumChans(t.th, outdata_ref)
+    num_channels = outdata_ref.x
     num_samples_per_chan_read = Int32[0]
     buffer_size = num_samples_per_chan==-1 ? 1024 : num_samples_per_chan
     data = Array{precision}(undef, buffer_size*num_channels)

diff --git a/src/digital.jl b/src/digital.jl
@@ -36,8 +36,10 @@ read_digital_cfunctions = Dict{Type,Function}(
     UInt16 => ReadDigitalU16,
     UInt32 => ReadDigitalU32 )
 
-function read(t::DITask, precision::DataType, num_samples_per_chan::Integer = -1)
-    num_channels = getproperties(t)["NumChans"][1]
+function read(t::DITask, num_samples_per_chan::Integer = -1, precision::DataType = UInt32)
+    outdata_ref = Ref{Cuint}()
+    DAQmxGetTaskNumChans(t.th, outdata_ref)
+    num_channels = outdata_ref.x
     num_samples_per_chan_read = Int32[0]
     buffer_size = num_samples_per_chan==-1 ? 1024 : num_samples_per_chan
     data = Array{precision}(undef, buffer_size*num_channels)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -39,16 +39,16 @@ else
     @test typeof(getproperties(t,dev*"/ai0")) == Dict{String,Tuple{Any,Bool}}
     @test typeof(t) == NIDAQ.AITask
     @test start(t) == nothing
-    @test length(read(t, Float64, 3)) == 3
+    @test length(read(t, 3)) == 3
     @test stop(t) == nothing
     @test analog_input(t, dev*"/ai1") == nothing
     @test start(t) == nothing
-    @test length(read(t, UInt32, 6)) == 12
+    @test length(read(t, 6, UInt32)) == 12
     @test stop(t) == nothing
     @test NIDAQ.CfgSampClkTiming(t.th, convert(Ref{UInt8},b""), 100.0, NIDAQ.Val_Rising,
               NIDAQ.Val_FiniteSamps, UInt64(10)) == 0
     @test start(t) == nothing
-    @test length(read(t, Float64)) == 20
+    @test length(read(t)) == 20
     @test stop(t) == nothing
     @test clear(t) == nothing
 end
@@ -85,11 +85,11 @@ else
     t = digital_input(dev*"/Port0/Line0")
     @test typeof(t) == NIDAQ.DITask
     @test start(t) == nothing
-    @test length(read(t, UInt32, 3)) == 3
+    @test length(read(t, 3)) == 3
     @test stop(t) == nothing
     @test digital_input(t, dev*"/Port0/Line1") == nothing
     @test start(t) == nothing
-    @test length(read(t, UInt32, 6)) == 12
+    @test length(read(t, 6)) == 12
     @test stop(t) == nothing
     rslt = Ref{UInt32}(0)
     NIDAQ.DAQmxGetBufInputOnbrdBufSize(t.th, rslt)
@@ -98,7 +98,7 @@ else
                                      NIDAQ.Val_FiniteSamps, UInt64(10)) == 0
         if first(props["ProductCategory"]) != :Val_MSeriesDAQ # M Series has no digital onboard clock
 	    @test start(t) == nothing
-	    @test length(read(t, UInt32)) == 20
+	    @test length(read(t)) == 20
 	    @test stop(t) == nothing
         end
         @test clear(t) == nothing