Changeset 19966

Timestamp:

04/21/07 11:10:57 (1 year ago)

Author:

patrick

Message:

Added a driver for the noDNA X-IST device. This was originally submitted by
Damien Touraine, and I modified the code to conform to the Juggler coding
standard and to use exception handling to determine if the sampling thread
spawns correctly.

NOTE: I have not tried compiling this driver yet because I need to track
down the FTD2XX software on which it depends.

Files:

• juggler/trunk/modules/gadgeteer/drivers/Makefile.in (modified) (1 diff)
• juggler/trunk/modules/gadgeteer/drivers/configure.ac (modified) (9 diffs)
• juggler/trunk/modules/gadgeteer/drivers/noDNA (added)
• juggler/trunk/modules/gadgeteer/drivers/noDNA/Makefile.in (added)
• juggler/trunk/modules/gadgeteer/drivers/noDNA/X-IST (added)
• juggler/trunk/modules/gadgeteer/drivers/noDNA/X-IST/Makefile.in (added)
• juggler/trunk/modules/gadgeteer/drivers/noDNA/X-IST/X-IST.cpp (added)
• juggler/trunk/modules/gadgeteer/drivers/noDNA/X-IST/X-IST.h (added)
• juggler/trunk/modules/gadgeteer/drivers/noDNA/X-IST/X-IST.rc (added)
• juggler/trunk/modules/gadgeteer/drivers/noDNA/X-IST/X-ISTStandalone.cpp (added)
• juggler/trunk/modules/gadgeteer/drivers/noDNA/X-IST/X-ISTStandalone.h (added)

juggler/trunk/modules/gadgeteer/drivers/Makefile.in

@@ -149 +149 @@
-        USDigital/SerialEncoder         \
-        VRCO/TrackdAPI                  \
-
+
+
-
-# =============================================================================

juggler/trunk/modules/gadgeteer/drivers/configure.ac

@@ -79 +79 @@
-            _with_vrpn="$withval", _with_vrpn='no')
-
+# Build with ftd2xx path. Then, include the X-IST drivers ...
+# There is default path.
+AC_ARG_WITH(ftd2xx, [  --with-ftd2xx=<PATH>    ftd2xx installation],
+            _with_ftd2xx="$withval", _with_ftd2xx='no')
+
-# Build with libusb path. Then, include the P5Gove drivers ...
-# There is default path.
@@ -292 +297 @@
-        _vjsave_LIBS="$LIBS"
-
- 
+
-        if test "x$ABI" = "xN32" ; then
-            bits='n32'
@@ -341 +346 @@
-
-# -----------------------------------------------------------------------------
- 
+
-# -----------------------------------------------------------------------------
-
@@ -358 +363 @@
-
-   VRPN_INCLUDES="-I$VRPNROOT/quat -I$VRPNROOT/vrpn"
-  
+
-
-   if test "x$OS_TYPE" = "xWin32" ; then
@@ -396 +401 @@
-      VRPNLIBDIR='sgi_irix'
-      if test "x$ABI" = "xN32" ; then
-  
+
-      elif test "x$ABI" = "x64" ; then
-   
+
-      fi
-
-      if test "x$ISA" = "xmips3" ; then
-        
+
-      elif test "x$ISA" = "xmips4" ; then
-        
+
-      fi
-   fi
@@ -444 +449 @@
-# include <vrpn_Button.h>
-# ],
- 
+
-#                        [ vj_have_vrpn='yes'
-#                          rm -rf ./ii_files ],
@@ -468 +473 @@
-    LDFLAGS="${_vjsave_LDFLAGS}"
-    LIBS="${_vjsave_LIBS}"
+fi
+
+# -----------------------------------------------------------------------------
+# FTD2XX
+# -----------------------------------------------------------------------------
+
+# Test for the ftd2xx library
+if test "x${_with_ftd2xx}" != "xno" ; then
+   if test "x${_with_ftd2xx}" = "xyes" ; then
+      FTD2XX_ROOT="/usr/local"
+   else
+      FTD2XX_ROOT="${_with_ftd2xx}"
+   fi
+
+   _gadget_save_CFLAGS="$CFLAGS"
+   _gadget_save_CPPFLAGS="$CPPFLAGS"
+   _gadget_save_LDFLAGS="$LDFLAGS"
+   _gadget_save_LIBS="$LIBS"
+
+   FTD2XX_LIBDIR="$FTD2XX_ROOT/lib"
+
+   FTD2XX_INCLUDES="-I$FTD2XX_ROOT/include"
+   FTD2XX_LDFLAGS="-L$FTD2XX_LIBDIR"
+   FTD2XX_LIBS="-lftd2xx"
+
+   CPPFLAGS="$FTD2XX_INCLUDES $CPPFLAGS"
+   LDFLAGS="$FTD2XX_LDFLAGS $LDFLAGS"
+
+   gadget_have_ftd2xx='no'
+
+   DPP_LANG_SAVE
+   DPP_LANG_C
+
+   CPPFLAGS="$CPPFLAGS $STDFLAGS"
+
+   AC_CHECK_LIB([ftd2xx], [FT_ListDevices],
+                [AC_CHECK_HEADER([ftd2xx.h], [gadget_have_ftd2xx='yes'],
+                                 [gadget_have_ftd2xx='no'])],
+                [gadget_have_ftd2xx='no'])
+
+   DPP_LANG_RESTORE
+
+   if test "x$gadget_have_ftd2xx" = "xyes" ; then
+      HAVE_FTD2XX='Y'
+   else
+      HAVE_FTD2XX='N'
+      AC_MSG_WARN([*** Did not find FTD2XX in $FTD2XX_ROOT ***])
+   fi
+
+   CFLAGS="${_gadget_save_CFLAGS}"
+   CPPFLAGS="${_gadget_save_CPPFLAGS}"
+   LDFLAGS="${_gadget_save_LDFLAGS}"
+   LIBS="${_gadget_save_LIBS}"
-fi
-
@@ -666 +724 @@
-AC_SUBST(VRPNROOT)
-AC_SUBST(VRPN_LDFLAGS)
+
+AC_SUBST(HAVE_FTD2XX)
+AC_SUBST(FTD2XX_ROOT)
+AC_SUBST(FTD2XX_INCLUDES)
+AC_SUBST(FTD2XX_LDFLAGS)
+AC_SUBST(FTD2XX_LIBS)
-
-AC_SUBST(HAVE_LIBUSB)
@@ -727 +791 @@
-   ])
-
+#   noDNA/Makefile
+#   noDNA/X-IST/Makefile
-AC_OUTPUT