Initial support for T5.

Author: davelopez01

README

@@ -1,10 +1,10 @@
 Exodriver: Linux (kernel 2.6+) and Mac OS X low-level LabJack U12, U3, U6, UE9,
-Digit, T4, and T7 USB library 2.0 and C examples
+Digit, T4, T5, and T7 USB library 2.06 and C examples
 04/01/2014
 [email protected]
 
-This package contains the liblabjackusb 2.0 USB library for low-level U3, U6,
-UE9, Digit, T4, and T7 USB communications and C examples for select LabJack
+This package contains the liblabjackusb 2.06 USB library for low-level U3, U6,
+UE9, Digit, T4, T5, and T7 USB communications and C examples for select LabJack
 devices.
 
 Refer to the INSTALL.Linux or INSTALL.MacOSX file for library requirements,
@@ -15,7 +15,7 @@ Library source code files are located in the liblabjackusb directory.
 
 C examples are provided for the LabJack U12, U3, U6, and UE9 in the examples
 directory. They demonstrate basic open/write/read/close operations using
-the liblabjackusb library and low-level function command/responses. Low-level
+the liblabjackusb library and low-level function command-response. Low-level
 function documentation can be found in Section 5 of the LabJack U12, U3, U6,
 and UE9 User Guides. The u3.h/u6.h/ue9.h, and u3.c/u6.h/ue9.c files contain
 helpful functions for opening/closing USB connections, calculate checksums,
@@ -24,13 +24,13 @@ functions (eAIN, eDAC, eDI, eDO, eTCConfig and eTCValues) that are similar to
 our Windows LabJackUD driver's "easy" functions. All other .c files are
 examples.
 
-USB command/response times for the U3, U6 and UE9 can be found in section 3.1
+USB command-response times for the U3, U6 and UE9 can be found in section 3.1
 of their User's Guide and were tested with the Feedback low-level function. USB
 Stream times are in Section 3.2. These times were measured in Windows and are
-similar in Linux and Mac OS X. 
+similar in Linux and Mac OS X.
 
-Examples are not provided for Digit, T4, or T7 devices in this package. Please
-refer to the LJM library package and documentation for their API.
+Examples are not provided for Digit, T4, T5, or T7 devices in this package.
+Please refer to the LJM library package and documentation for their API.
 
 The U12 also has a high-level library, which requires this library
 (liblabjackusb), that provides the same API as the U12 Windows driver. It can

liblabjackusb/labjackusb.c

@@ -2,7 +2,7 @@
 //
 //  labjackusb.c
 //
-//    Library for accessing U3, U6, UE9, SkyMote bridge, T4, T7, and Digit
+//    Library for accessing U3, U6, UE9, SkyMote bridge, T4, T5, T7, and Digit
 //    devices over USB.
 //
 //  [email protected]
@@ -455,6 +455,8 @@ static bool LJUSB_isMinFirmware(HANDLE hDevice, unsigned long ProductID)
         return true;
     case T4_PRODUCT_ID:
         return true;
+    case T5_PRODUCT_ID:
+        return true;
     case T7_PRODUCT_ID:
         return true;
     case DIGIT_PRODUCT_ID:
@@ -886,6 +888,23 @@ static unsigned long LJUSB_SetupTransfer(HANDLE hDevice, BYTE *pBuff, unsigned l
             return 0;
         }
         break;
+    case T5_PRODUCT_ID:
+        isBulk = true;
+        switch (operation) {
+        case LJUSB_WRITE:
+            endpoint = T5_PIPE_EP1_OUT;
+            break;
+        case LJUSB_READ:
+            endpoint = T5_PIPE_EP2_IN;
+            break;
+        case LJUSB_STREAM:
+            endpoint = T5_PIPE_EP3_IN;
+            break;
+        default:
+            errno = EINVAL;
+            return 0;
+        }
+        break;
     case T7_PRODUCT_ID:
         isBulk = true;
         switch (operation) {
@@ -1096,7 +1115,7 @@ unsigned int LJUSB_GetDevCounts(UINT *productCounts, UINT * productIds, UINT n)
     unsigned int ue9ProductCount = 0, u12ProductCount = 0;
     unsigned int bridgeProductCount = 0, t7ProductCount = 0;
     unsigned int digitProductCount = 0, t4ProductCount = 0;
-    unsigned int allProductCount = 0;
+    unsigned int t5ProductCount = 0, allProductCount = 0;
 
     if (!gIsLibUSBInitialized) {
         r = libusb_init(&gLJContext);
@@ -1147,6 +1166,9 @@ unsigned int LJUSB_GetDevCounts(UINT *productCounts, UINT * productIds, UINT n)
             case T4_PRODUCT_ID:
                 t4ProductCount++;
                 break;
+            case T5_PRODUCT_ID:
+                t5ProductCount++;
+                break;
             case T7_PRODUCT_ID:
                 t7ProductCount++;
                 break;
@@ -1200,6 +1222,11 @@ unsigned int LJUSB_GetDevCounts(UINT *productCounts, UINT * productIds, UINT n)
             productIds[i] = T4_PRODUCT_ID;
             allProductCount += t4ProductCount;
             break;
+        case 8:
+            productCounts[i] = t5ProductCount;
+            productIds[i] = T5_PRODUCT_ID;
+            allProductCount += t5ProductCount;
+            break;
         }
     }
 

liblabjackusb/labjackusb.h

@@ -66,7 +66,7 @@
 //         - libusb error prints are silenced when LJ_DEBUG is not enabled.
 //         - Added revision number to library version number. The float version
 //           number 2.0503 is equivalent to 2.5.3 (major.minor.revision).
-//  2.0600 - Initial T4 support
+//  2.0600 - Initial T4 and T5 support
 //-----------------------------------------------------------------------------
 //
 
@@ -91,6 +91,7 @@ typedef unsigned char BYTE;
 #define U12_PRODUCT_ID         1
 #define BRIDGE_PRODUCT_ID      1000
 #define T4_PRODUCT_ID          4
+#define T5_PRODUCT_ID          5
 #define T7_PRODUCT_ID          7
 #define DIGIT_PRODUCT_ID       200
 #define UNUSED_PRODUCT_ID      -1
@@ -125,6 +126,11 @@ typedef unsigned char BYTE;
 #define T4_PIPE_EP2_IN         0x82
 #define T4_PIPE_EP3_IN         0x83  //Stream Endpoint
 
+//T5 pipes to read/write through
+#define T5_PIPE_EP1_OUT        1
+#define T5_PIPE_EP2_IN         0x82
+#define T5_PIPE_EP3_IN         0x83  //Stream Endpoint
+
 //T7 pipes to read/write through
 #define T7_PIPE_EP1_OUT        1
 #define T7_PIPE_EP2_IN         0x82
@@ -156,8 +162,8 @@ unsigned int LJUSB_GetDevCounts(UINT *productCounts, UINT * productIds, UINT n);
 //   uint productCounts[10], productIds[10];
 //   r = LJUSB_GetDevCounts(productCounts, productIds, 10);
 // would return arrays that may look like
-//   {1, 2, 3, 4,    5, 6,   7, 8, 0, 0}
-//   {3, 6, 9, 1, 1000, 7, 200, 4, 0, 0}
+//   {1, 2, 3, 4,    5, 6,   7, 8, 9, 0}
+//   {3, 6, 9, 1, 1000, 7, 200, 4, 5, 0}
 // which means there are
 //   1 U3
 //   2 U6s
@@ -167,6 +173,7 @@ unsigned int LJUSB_GetDevCounts(UINT *productCounts, UINT * productIds, UINT n);
 //   6 T7s
 //   7 Digits
 //   8 T4s
+//   9 T5s
 // connected.
 
 int LJUSB_OpenAllDevices(HANDLE* devHandles, UINT* productIds, UINT maxDevices);