Ver 1.2.0 commit

mccdaq · May 11, 2020 · 24ba881 · 24ba881
1 parent 0b72c31
commit 24ba881
Show file tree

Hide file tree

Showing 133 changed files with 195,213 additions and 158 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,23 @@
 # Changelog
 All notable changes to the UL for Linux project will be documented in this file.
 
+## [1.2.0] - May 11, 2020
+### Added
+* support for the following DAQ devices
+  * E-1608
+  * E-TC
+  * E-DIO24
+  * TC32
+
+* RemoteNetDiscovery example
+
+### Changed
+- The FPGA folder and its content have been removed. The FPGA images have been embedded in the library file.
+- To address the libusb fork operation issue which is explained [here](http://libusb.sourceforge.net/api-1.0/libusb_caveats.html), libusb will no longer be initialized when the uldaq library is loaded. Instead, libusb is initialized when the first uldaq function is invoked. This change allows users to initialize libusb in the child process by invoking the first uldaq function after a fork() call. 
+
+### Removed
+- none
+
 ## [1.1.2] - November 22, 2019
 ### Added
 * support for the following DAQ devices

diff --git a/Makefile.am b/Makefile.am
@@ -15,15 +15,15 @@ dist_doc_DATA = README.md
 pkgconfigdir=$(libdir)/pkgconfig
 dist_pkgconfig_DATA=libuldaq.pc
 
-fpgadatadir=/etc/uldaq/fpga
-dist_fpgadata_DATA=fpga/USB_1208HS.rbf\
-fpga/USB_1608G_2.rbf\
-fpga/USB_1608G.rbf\
-fpga/USB_1808.bin\
-fpga/usb_2020.bin\
-fpga/USB_26xx.rbf\
-fpga/USB_CTR.bin\
-fpga/USB_DIO32HS.bin
+# fpgadatadir=/etc/uldaq/fpga
+# dist_fpgadata_DATA=fpga/USB_1208HS.rbf\
+# fpga/USB_1608G_2.rbf\
+# fpga/USB_1608G.rbf\
+# fpga/USB_1808.bin\
+# fpga/usb_2020.bin\
+# fpga/USB_26xx.rbf\
+# fpga/USB_CTR.bin\
+# fpga/USB_DIO32HS.bin
 
 if OS_LINUX
 rulesdatadir=/lib/udev/rules.d/

diff --git a/README.md b/README.md
@@ -51,21 +51,21 @@ Building the **uldaq** package requires C/C++ compilers, make tool, and the deve
 
 ```
   Linux
-     $ wget -N https://github.com/mccdaq/uldaq/releases/download/v1.1.2/libuldaq-1.1.2.tar.bz2
+     $ wget -N https://github.com/mccdaq/uldaq/releases/download/v1.2.0/libuldaq-1.2.0.tar.bz2
 
   macOS
-     $ curl -L -O https://github.com/mccdaq/uldaq/releases/download/v1.1.2/libuldaq-1.1.2.tar.bz2
+     $ curl -L -O https://github.com/mccdaq/uldaq/releases/download/v1.2.0/libuldaq-1.2.0.tar.bz2
 ``` 
 2. Extract the tar file:
 
 ```
-  $ tar -xvjf libuldaq-1.1.2.tar.bz2
+  $ tar -xvjf libuldaq-1.2.0.tar.bz2
 ```
 
 3. Run the following commands to build and install the library:
 
 ```
-  $ cd libuldaq-1.1.2
+  $ cd libuldaq-1.2.0
   $ ./configure && make
   $ sudo make install
 ```

diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([LIBUL_MAJOR],   1)
-m4_define([LIBUL_MINOR],   1)
-m4_define([LIBUL_MICRO], 2)
+m4_define([LIBUL_MINOR],   2)
+m4_define([LIBUL_MICRO], 0)
 m4_define([LIBUL_RC],)
 
 AC_INIT([libuldaq],[LIBUL_MAJOR[.]LIBUL_MINOR[.]LIBUL_MICRO[]LIBUL_RC],[[email protected]],[libuldaq],[http://www.mccdaq.com])
@@ -9,9 +9,9 @@ AC_INIT([libuldaq],[LIBUL_MAJOR[.]LIBUL_MINOR[.]LIBUL_MICRO[]LIBUL_RC],[info@mcc
 # These numbers should be tweaked on every release. Read carefully:
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 # http://sourceware.org/autobook/autobook/autobook_91.html
-lt_current=2
-lt_revision=2
-lt_age=1
+lt_current=3
+lt_revision=0
+lt_age=2
 LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}"
 
 CFLAGS='-O3'

diff --git a/doc/pagesref.txt b/doc/pagesref.txt
diff --git a/examples/AIn.c b/examples/AIn.c
@@ -70,7 +70,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/AInScan.c b/examples/AInScan.c
@@ -81,7 +81,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/AInScanIepe.c b/examples/AInScanIepe.c
@@ -87,7 +87,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/AInScanWithEvents.c b/examples/AInScanWithEvents.c
@@ -105,7 +105,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/AInScanWithQueue.c b/examples/AInScanWithQueue.c
@@ -94,7 +94,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/AInScanWithTrigger.c b/examples/AInScanWithTrigger.c
@@ -86,7 +86,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/AOut.c b/examples/AOut.c
@@ -66,7 +66,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);
 

diff --git a/examples/AOutScan.c b/examples/AOutScan.c
@@ -81,7 +81,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to  the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/CIn.c b/examples/CIn.c
@@ -58,7 +58,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/CInScan.c b/examples/CInScan.c
@@ -74,7 +74,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/CInScanWithEncoder.c b/examples/CInScanWithEncoder.c
@@ -88,7 +88,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/DBitIn.c b/examples/DBitIn.c
@@ -68,7 +68,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/DBitOut.c b/examples/DBitOut.c
@@ -72,7 +72,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/DIn.c b/examples/DIn.c
@@ -65,7 +65,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/DInScan.c b/examples/DInScan.c
@@ -79,7 +79,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/DOut.c b/examples/DOut.c
@@ -68,7 +68,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/DOutScan.c b/examples/DOutScan.c
@@ -82,7 +82,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/DaqInScan.c b/examples/DaqInScan.c
@@ -89,7 +89,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/DaqInScanWithTrigger.c b/examples/DaqInScanWithTrigger.c
@@ -97,7 +97,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/DaqOutScan.c b/examples/DaqOutScan.c
@@ -87,7 +87,10 @@ int main(void)
 
 	printf("Found %d DAQ device(s)\n", numDevs);
 	for (i = 0; i < (int) numDevs; i++)
-		printf("  %s: (%s)\n", devDescriptors[i].productName, devDescriptors[i].uniqueId);
+		printf("  [%d] %s: (%s)\n", i, devDescriptors[i].productName, devDescriptors[i].uniqueId);
+
+	if(numDevs > 1)
+		descriptorIndex = selectDAQDevice(numDevs);
 
 	// get a handle to the DAQ device associated with the first descriptor
 	daqDeviceHandle = ulCreateDaqDevice(devDescriptors[descriptorIndex]);

diff --git a/examples/Makefile.am b/examples/Makefile.am
@@ -8,7 +8,8 @@ DaqInScan DaqInScanWithTrigger\
 DaqOutScan\
 DIn DBitIn DInScan DOut DBitOut DOutScan\
 TmrPulseOut\
-TIn
+TIn\
+RemoteNetDiscovery
 
 AIn_SOURCES = AIn.c utility.h
 AInScan_SOURCES = AInScan.c
@@ -37,6 +38,7 @@ DOutScan_LDADD = $(LDADD) -lm
 DOutScan_SOURCES = DOutScan.c
 TmrPulseOut_SOURCES = TmrPulseOut.c
 TIn_SOURCES = TIn.c
+RemoteNetDiscovery_SOURCES = RemoteNetDiscovery.c