Skip to content

Commit be1bf2c

Browse files
authored
Add Linux support and DAQmx v20.1.0 (#28)
1 parent 7facae3 commit be1bf2c

File tree

5 files changed

+16943
-8
lines changed

5 files changed

+16943
-8
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "NIDAQ"
22
uuid = "66b72792-1abf-55ab-8064-6e9051317175"
3-
version = "0.5.0"
3+
version = "0.6.0"
44

55
[compat]
66
julia = "0.7, 1"

README.md

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,34 @@ Similar functionality for the Python language is provided by
1212

1313
System Requirements
1414
===================
15+
**General**
16+
- Supports Windows and Linux
17+
- NI-DAQmx Base is not supported
1518

16-
NI-DAQmx Base is not supported, so you'll need a Windows box, and a National
17-
Instruments card of course.
18-
19+
**Linux specific**
20+
- Requires the latest DAQmx (currently 20.1)
21+
- DAQmx on linux does not support USB DAQ devices
1922

2023
Installation
2124
============
22-
25+
**Windows**
2326
First download and install NI-DAQmx version
24-
[19.6](https://www.ni.com/en-us/support/downloads/drivers/download/packaged.ni-daqmx.333268.html) (or
27+
[20.1](https://www.ni.com/en-us/support/downloads/drivers/download.ni-daqmx.html#348669) (or
28+
[19.6](https://www.ni.com/en-us/support/downloads/drivers/download/packaged.ni-daqmx.333268.html),
2529
[18.6](http://www.ni.com/en-us/support/downloads/drivers/download/unpackaged.ni-daqmx.291872.html);
2630
or for Julia 0.6, [17.1.0](http://www.ni.com/download/ni-daqmx-17.1/6836/en/);
2731
or for Julia 0.5, [16.0.0](http://www.ni.com/download/ni-daqmx-16.0/6120/en/);
2832
or for Julia 0.4, [15.1.1](http://www.ni.com/download/ni-daqmx-15.1.1/5665/en/);
2933
or for Julia 0.3, [14.1.0](http://www.ni.com/download/ni-daqmx-14.1/4953/en/),
3034
[14.0.0](http://www.ni.com/download/ni-daqmx-14.0/4918/en/), or
3135
[9.6.0](http://www.ni.com/download/ni-daqmx-9.6/3423/en/)) from National
32-
Instruments. Then on the Julia command line:
36+
Instruments.
37+
38+
**Linux**
39+
The package only supports DAQmx 20.1 on linux. Follow the instructions from this [support doc](https://www.ni.com/en-us/support/documentation/supplemental/18/downloading-and-installing-ni-driver-software-on-linux-desktop.html).
3340

41+
**Adding `NIDAQ.jl`**
42+
Then on the Julia command line:
3443
```
3544
]add NIDAQ
3645
```

src/NIDAQ.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ export counter_input_channels, counter_output_channels
4444

4545
export RSE, NRSE, Differential, PseudoDifferential
4646

47-
const NIDAQmx = "C:\\Windows\\System32\\nicaiu.dll"
47+
const NIDAQmx = Sys.iswindows() ? "C:\\Windows\\System32\\nicaiu.dll" :
48+
"/usr/lib/x86_64-linux-gnu/libnidaqmx.so"
4849
const SafeCstring = Ref{UInt8}
4950

5051
primitive type Bool32<:Integer 32 end

0 commit comments

Comments
 (0)