Merge pull request #47 from Fluigent/version-22.1.0.0

Update SDK to version 22.1.0.0
Fluigent · Sep 26, 2022 · 5c4c295 · 5c4c295
2 parents 76d5865 + 55c870e
commit 5c4c295
Show file tree

Hide file tree

Showing 63 changed files with 35 additions and 21 deletions.
diff --git a/C#/StaticFiles/fgt_sdk_dlls/linux/arm/libfgt_SDK.so b/C#/StaticFiles/fgt_sdk_dlls/linux/arm/libfgt_SDK.so
diff --git a/C#/StaticFiles/fgt_sdk_dlls/linux/arm64/libfgt_SDK.so b/C#/StaticFiles/fgt_sdk_dlls/linux/arm64/libfgt_SDK.so
diff --git a/C#/StaticFiles/fgt_sdk_dlls/linux/x64/libfgt_SDK.so b/C#/StaticFiles/fgt_sdk_dlls/linux/x64/libfgt_SDK.so
diff --git a/C#/StaticFiles/fgt_sdk_dlls/mac/x64/libfgt_SDK.dylib b/C#/StaticFiles/fgt_sdk_dlls/mac/x64/libfgt_SDK.dylib
diff --git a/C#/StaticFiles/fgt_sdk_dlls/windows/x64/fgt_SDK.dll b/C#/StaticFiles/fgt_sdk_dlls/windows/x64/fgt_SDK.dll
diff --git a/C#/StaticFiles/fgt_sdk_dlls/windows/x64/fgt_SDK.lib b/C#/StaticFiles/fgt_sdk_dlls/windows/x64/fgt_SDK.lib
diff --git a/C#/StaticFiles/fgt_sdk_dlls/windows/x86/fgt_SDK.dll b/C#/StaticFiles/fgt_sdk_dlls/windows/x86/fgt_SDK.dll
diff --git a/C#/StaticFiles/fgt_sdk_dlls/windows/x86/fgt_SDK.lib b/C#/StaticFiles/fgt_sdk_dlls/windows/x86/fgt_SDK.lib
diff --git a/C#/fgt_sdk_csharp/fgtSdk.cs b/C#/fgt_sdk_csharp/fgtSdk.cs
@@ -16,11 +16,16 @@ namespace fgt_sdk
     public static class fgtSdk
     {
         private const string FGT_SDK = "FGT_SDK";
+        private static IntPtr _nativeLibPointer = IntPtr.Zero;
         private static IntPtr ArchResolver(string libraryName, Assembly assembly, DllImportSearchPath? searchPath)
         {
             if (libraryName != FGT_SDK)
             {
-                throw new NotSupportedException($"{libraryName} not supported");
+                return IntPtr.Zero;
+            }
+            if (_nativeLibPointer != IntPtr.Zero)
+            {
+                return _nativeLibPointer;
             }
 
             var assemblyPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName);
@@ -58,7 +63,15 @@ private static IntPtr ArchResolver(string libraryName, Assembly assembly, DllImp
             };
 
             var libPath = Path.Combine(basePath, osFolder, archFolder, libFile);
-            return NativeLibrary.Load(libPath);
+            if (!File.Exists(libPath))
+            {
+                // Native library can be placed in the root folder containing the executable that uses it
+                // When doing so, prepend "lib" on Windows to avoid a name collision with the assembly DLL
+                libPath = Path.Combine(assemblyPath, libFile.StartsWith("lib") ? libFile : "lib" + libFile);
+            }
+
+            _nativeLibPointer = NativeLibrary.Load(libPath);
+            return _nativeLibPointer;
         }
 
         #region Imported functions

diff --git a/C#/fgt_sdk_csharp/fgt_sdk.csproj b/C#/fgt_sdk_csharp/fgt_sdk.csproj
@@ -5,16 +5,16 @@
     <Authors>Fluigent</Authors>
     <Product>Fluigent Software Development Kit</Product>
     <Description>C# Software Development Kit for Fluigent instruments</Description>
-    <Version>22.0.0.0</Version>
+    <Version>22.1.0.0</Version>
     <PackageTags>Microfluidics, Control</PackageTags>
     <Platforms>AnyCPU;x64;x86</Platforms>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <AssemblyVersion>22.0.0.0</AssemblyVersion>
+    <AssemblyVersion>22.1.0.0</AssemblyVersion>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <Copyright>Copyright (c) Fluigent 2022</Copyright>
     <RepositoryUrl>https://github.com/Fluigent/fgt-SDK</RepositoryUrl>
     <PackageProjectUrl>https://www.fluigent.com/</PackageProjectUrl>
-    <FileVersion>22.0.0.0</FileVersion>
+    <FileVersion>22.1.0.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/C++/fgt_SDK_Cpp/dlls/fgt_SDK.h b/C++/fgt_SDK_Cpp/dlls/fgt_SDK.h
@@ -6,8 +6,8 @@
 *                                                                            
 * Title:   fgt_SDK.h                                                         
 * Purpose: Functions API for Fluigent instruments                            
-* Version: 22.0.0.0
-* Date:	04/2022
+* Version: 22.1.0.0
+* Date:	07/2022
 *============================================================================*/
 
 #ifndef _FGT_SDK_H

diff --git a/C++/fgt_SDK_Cpp/dlls/linux/arm/libfgt_SDK.so b/C++/fgt_SDK_Cpp/dlls/linux/arm/libfgt_SDK.so
diff --git a/C++/fgt_SDK_Cpp/dlls/linux/arm64/libfgt_SDK.so b/C++/fgt_SDK_Cpp/dlls/linux/arm64/libfgt_SDK.so
diff --git a/C++/fgt_SDK_Cpp/dlls/linux/x64/libfgt_SDK.so b/C++/fgt_SDK_Cpp/dlls/linux/x64/libfgt_SDK.so
diff --git a/C++/fgt_SDK_Cpp/dlls/mac/x64/libfgt_SDK.dylib b/C++/fgt_SDK_Cpp/dlls/mac/x64/libfgt_SDK.dylib
diff --git a/C++/fgt_SDK_Cpp/dlls/windows/x64/fgt_SDK.dll b/C++/fgt_SDK_Cpp/dlls/windows/x64/fgt_SDK.dll
diff --git a/C++/fgt_SDK_Cpp/dlls/windows/x64/fgt_SDK.lib b/C++/fgt_SDK_Cpp/dlls/windows/x64/fgt_SDK.lib
diff --git a/C++/fgt_SDK_Cpp/dlls/windows/x86/fgt_SDK.dll b/C++/fgt_SDK_Cpp/dlls/windows/x86/fgt_SDK.dll
diff --git a/C++/fgt_SDK_Cpp/dlls/windows/x86/fgt_SDK.lib b/C++/fgt_SDK_Cpp/dlls/windows/x86/fgt_SDK.lib
diff --git a/C++/fgt_SDK_Cpp/fgt_SDK_Cpp.cpp b/C++/fgt_SDK_Cpp/fgt_SDK_Cpp.cpp
@@ -1,14 +1,14 @@
 /*============================================================================
 *               Fluigent Software Developement Kit for C++                  
 *----------------------------------------------------------------------------
-*         Copyright (c) Fluigent 2021.  All Rights Reserved.                 
+*         Copyright (c) Fluigent 2022.  All Rights Reserved.                 
 *----------------------------------------------------------------------------
 *                                                                            
 * Title:    fgt_SDK_Cpp.cpp                                                  
 * Purpose:  Wrapper to fgt_SDK library			                          
 *			Contains an interface to each dll function and type conversions	  
-* Version:  21.3.0.0                                                         
-* Date:	    09/2021															 
+* Version:  22.1.0.0                                                         
+* Date:	    07/2022															 
 *============================================================================*/
 
 #include <iostream>

diff --git a/C++/fgt_SDK_Cpp/fgt_SDK_Cpp.h b/C++/fgt_SDK_Cpp/fgt_SDK_Cpp.h
@@ -7,8 +7,8 @@
 * Title:    fgt_SDK_Cpp.h                                                     
 * Purpose:  Wrapper to fgt_SDK library
 *			Contains an interface to each dll function and type conversions
-* Version:  22.0.0.0
-* Date:	    04/2022
+* Version:  22.1.0.0
+* Date:	    07/2022
 *============================================================================*/
 
 #ifndef _FGT_SDK_CPP_H
@@ -619,7 +619,7 @@ fgt_ERROR_CODE Fgt_set_digitalOutput(unsigned int controllerIndex, unsigned char
  * @return fgt_ERROR_CODE
  * @see fgt_get_sensorStatus
  */
-fgt_ERROR_CODE FGT_API Fgt_get_sensorAirBubbleFlag(unsigned int sensorIndex, unsigned char* detected);
+fgt_ERROR_CODE Fgt_get_sensorAirBubbleFlag(unsigned int sensorIndex, unsigned char* detected);
 
 /**
  * @Description Returns the pressure measured at the device's inlet.

diff --git a/Fluigent SDK.pdf b/Fluigent SDK.pdf
diff --git a/LabVIEW/dlls/fgt_SDK.h b/LabVIEW/dlls/fgt_SDK.h
@@ -6,8 +6,8 @@
 *                                                                            
 * Title:   fgt_SDK.h                                                         
 * Purpose: Functions API for Fluigent instruments                            
-* Version: 22.0.0.0
-* Date:	04/2022
+* Version: 22.1.0.0
+* Date:	07/2022
 *============================================================================*/
 
 #ifndef _FGT_SDK_H

diff --git a/LabVIEW/dlls/fgt_SDK_32.dll b/LabVIEW/dlls/fgt_SDK_32.dll
diff --git a/LabVIEW/dlls/fgt_SDK_64.dll b/LabVIEW/dlls/fgt_SDK_64.dll
diff --git a/LabVIEW/sourceCode/VIs/Basic functions/fgt get valve position.vi b/LabVIEW/sourceCode/VIs/Basic functions/fgt get valve position.vi
diff --git a/LabVIEW/sourceCode/VIs/Basic functions/fgt set valve position.vi b/LabVIEW/sourceCode/VIs/Basic functions/fgt set valve position.vi
diff --git a/LabVIEW/sourceCode/VIs/Channels information/fgt get valve Channel Count.vi b/LabVIEW/sourceCode/VIs/Channels information/fgt get valve Channel Count.vi
diff --git a/LabVIEW/sourceCode/VIs/Channels information/fgt get valve Channels Info.vi b/LabVIEW/sourceCode/VIs/Channels information/fgt get valve Channels Info.vi
diff --git a/LabVIEW/sourceCode/VIs/Engine/fgt create simulated instr.vi b/LabVIEW/sourceCode/VIs/Engine/fgt create simulated instr.vi
diff --git a/LabVIEW/sourceCode/VIs/Engine/fgt remove simulated instr.vi b/LabVIEW/sourceCode/VIs/Engine/fgt remove simulated instr.vi
diff --git a/LabVIEW/sourceCode/VIs/Specific functions/fgt get inlet Pressure.vi b/LabVIEW/sourceCode/VIs/Specific functions/fgt get inlet Pressure.vi
diff --git a/LabVIEW/sourceCode/VIs/Specific functions/fgt get sensor Air Bubble Flag.vi b/LabVIEW/sourceCode/VIs/Specific functions/fgt get sensor Air Bubble Flag.vi
diff --git a/LabVIEW/sourceCode/VIs/Specific functions/fgt set all Valves.vi b/LabVIEW/sourceCode/VIs/Specific functions/fgt set all Valves.vi
diff --git a/LabVIEW/sourceCode/VIs/Specific functions/fgt set digital Output.vi b/LabVIEW/sourceCode/VIs/Specific functions/fgt set digital Output.vi
diff --git a/LabVIEW/sourceCode/VIs/Status information/fgt get pressure Status.vi b/LabVIEW/sourceCode/VIs/Status information/fgt get pressure Status.vi
diff --git a/LabVIEW/sourceCode/VIs/Units calibration and limits/fgt get valve range.vi b/LabVIEW/sourceCode/VIs/Units calibration and limits/fgt get valve range.vi
diff --git a/LabVIEW/sourceCode/subvi/ErrorCodeToErrorStringConverter.vi b/LabVIEW/sourceCode/subvi/ErrorCodeToErrorStringConverter.vi
diff --git a/MATLAB/Toolbox/SDK/Fluigent/+LowLevel/private/fgt_SDK_32.dll b/MATLAB/Toolbox/SDK/Fluigent/+LowLevel/private/fgt_SDK_32.dll
diff --git a/MATLAB/Toolbox/SDK/Fluigent/+LowLevel/private/fgt_SDK_32_prototype.m b/MATLAB/Toolbox/SDK/Fluigent/+LowLevel/private/fgt_SDK_32_prototype.m
@@ -1,7 +1,7 @@
 function [methodinfo,structs,enuminfo,ThunkLibName]=fgt_SDK_32_prototype
 %FGT_SDK_32_PROTOTYPE Create structures to define interfaces found in 'fgt_SDK'.
 
-%This function was generated by loadlibrary.m parser version  on Fri Apr  1 14:11:51 2022
+%This function was generated by loadlibrary.m parser version  on Fri Jul 29 13:29:21 2022
 %perl options:'fgt_SDK.i -outfile=fgt_SDK_32_prototype.m'
 ival={cell(1,0)}; % change 0 to the actual number of functions to preallocate the data.
 structs=[];enuminfo=[];fcnNum=1;

diff --git a/MATLAB/Toolbox/SDK/Fluigent/+LowLevel/private/fgt_SDK_64.dll b/MATLAB/Toolbox/SDK/Fluigent/+LowLevel/private/fgt_SDK_64.dll
diff --git a/MATLAB/Toolbox/SDK/Fluigent/+LowLevel/private/fgt_SDK_64_prototype.m b/MATLAB/Toolbox/SDK/Fluigent/+LowLevel/private/fgt_SDK_64_prototype.m
@@ -1,7 +1,7 @@
 function [methodinfo,structs,enuminfo,ThunkLibName]=fgt_SDK_64_prototype
 %FGT_SDK_64_PROTOTYPE Create structures to define interfaces found in 'fgt_SDK'.
 
-%This function was generated by loadlibrary.m parser version  on Fri Apr  1 14:11:51 2022
+%This function was generated by loadlibrary.m parser version  on Fri Jul 29 13:29:21 2022
 %perl options:'fgt_SDK.i -outfile=fgt_SDK_64_prototype.m -thunkfile=fgt_sdk_thunk_pcwin64.c -header=fgt_SDK.h'
 ival={cell(1,0)}; % change 0 to the actual number of functions to preallocate the data.
 structs=[];enuminfo=[];fcnNum=1;

diff --git a/MATLAB/Toolbox/SDK/Fluigent/+LowLevel/private/fgt_sdk_thunk_pcwin64.dll b/MATLAB/Toolbox/SDK/Fluigent/+LowLevel/private/fgt_sdk_thunk_pcwin64.dll
diff --git a/MATLAB/Toolbox/SDK/Fluigent/+LowLevel/private/fgt_sdk_thunk_pcwin64.obj b/MATLAB/Toolbox/SDK/Fluigent/+LowLevel/private/fgt_sdk_thunk_pcwin64.obj
diff --git a/Python/Fluigent/SDK/__init__.py b/Python/Fluigent/SDK/__init__.py
@@ -5,7 +5,7 @@
 from . import low_level
 from . import exceptions
 
-__version__ = "22.0.0"
+__version__ = "22.1.0"
 
 # Enums
 class fgt_ERROR(low_level.fgt_ERROR):
@@ -718,6 +718,7 @@ def fgt_set_valvePosition(valve_index, position, direction = fgt_SWITCH_DIRECTIO
     low_level_function = low_level.fgt_set_valvePosition
     c_error, = low_level_function(valve_index, position, direction, wait)
     exceptions.manage_generic_status(low_level_function.__name__, c_error)
+    return fgt_ERROR(c_error)
 
 def fgt_get_valvePosition(valve_index, get_error = _get_error):
     """Read the position of a specific valve channel.

diff --git a/Python/Fluigent/SDK/shared/linux/arm/libfgt_SDK.so b/Python/Fluigent/SDK/shared/linux/arm/libfgt_SDK.so
diff --git a/Python/Fluigent/SDK/shared/linux/arm64/libfgt_SDK.so b/Python/Fluigent/SDK/shared/linux/arm64/libfgt_SDK.so
diff --git a/Python/Fluigent/SDK/shared/linux/x64/libfgt_SDK.so b/Python/Fluigent/SDK/shared/linux/x64/libfgt_SDK.so
diff --git a/Python/Fluigent/SDK/shared/mac/x64/libfgt_SDK.dylib b/Python/Fluigent/SDK/shared/mac/x64/libfgt_SDK.dylib
diff --git a/Python/Fluigent/SDK/shared/windows/x64/fgt_SDK.dll b/Python/Fluigent/SDK/shared/windows/x64/fgt_SDK.dll
diff --git a/Python/Fluigent/SDK/shared/windows/x86/fgt_SDK.dll b/Python/Fluigent/SDK/shared/windows/x86/fgt_SDK.dll
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Fluigent Software Developement Kit - version 22.0.0
+# Fluigent Software Developement Kit - version 22.1.0
 
 # Overview
 The Fluigent Software Development Kit (SDK) allows you to fully integrate Fluigent devices in your application;

diff --git a/Shared/fgt_SDK.h b/Shared/fgt_SDK.h
@@ -6,8 +6,8 @@
 *                                                                            
 * Title:   fgt_SDK.h                                                         
 * Purpose: Functions API for Fluigent instruments                            
-* Version: 22.0.0.0
-* Date:	04/2022
+* Version: 22.1.0.0
+* Date:	07/2022
 *============================================================================*/
 
 #ifndef _FGT_SDK_H

diff --git a/Shared/fgt_SDK_32.dll b/Shared/fgt_SDK_32.dll
diff --git a/Shared/fgt_SDK_64.dll b/Shared/fgt_SDK_64.dll
diff --git a/Shared/linux/arm/libfgt_SDK.so b/Shared/linux/arm/libfgt_SDK.so
diff --git a/Shared/linux/arm64/libfgt_SDK.so b/Shared/linux/arm64/libfgt_SDK.so
diff --git a/Shared/linux/x64/libfgt_SDK.so b/Shared/linux/x64/libfgt_SDK.so
diff --git a/Shared/mac/x64/libfgt_SDK.dylib b/Shared/mac/x64/libfgt_SDK.dylib
diff --git a/Shared/windows/x64/fgt_SDK.dll b/Shared/windows/x64/fgt_SDK.dll
diff --git a/Shared/windows/x64/fgt_SDK.lib b/Shared/windows/x64/fgt_SDK.lib
diff --git a/Shared/windows/x86/fgt_SDK.dll b/Shared/windows/x86/fgt_SDK.dll
diff --git a/Shared/windows/x86/fgt_SDK.lib b/Shared/windows/x86/fgt_SDK.lib