Changeset 20172

Timestamp:

05/08/07 09:03:17 (2 years ago)

Author:

patrick

Message:

Merges from the trunk:

r19966: 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.

r19968: Added the config definintion for the noDNA X-IST hardware. This was

submitted by Damien Touraine.

r19976: Fixed compile errors that I caused.

r19977: Get this [X-ISTStandalone.cpp] to compile on Linux.

r19978: The ftd2xx library for Linux requires libusb.

r20154: Connect the noDNA X-IST data glove driver to the Windows build.

Files:

• juggler/branches/2.2/README-WINDOWS.html (modified) (1 diff)
• juggler/branches/2.2/build_windows.py (modified) (2 diffs)
• juggler/branches/2.2/modules/gadgeteer/drivers/Makefile.in (modified) (1 diff)
• juggler/branches/2.2/modules/gadgeteer/drivers/configure.ac (modified) (9 diffs)
• juggler/branches/2.2/modules/gadgeteer/drivers/noDNA (copied) (copied from juggler/trunk/modules/gadgeteer/drivers/noDNA)
• juggler/branches/2.2/modules/gadgeteer/drivers/noDNA/X-IST/X-IST.cpp (modified) (2 diffs)
• juggler/branches/2.2/modules/gadgeteer/drivers/noDNA/X-IST/X-ISTStandalone.cpp (modified) (6 diffs)
• juggler/branches/2.2/modules/gadgeteer/drivers/noDNA/X-IST/X-ISTStandalone.h (modified) (1 diff)
• juggler/branches/2.2/modules/vrjuggler/data/definitions/x_ist_glove.jdef (copied) (copied from juggler/trunk/modules/vrjuggler/data/definitions/x_ist_glove.jdef)
• juggler/branches/2.2/vc7/Gadgeteer/X-IST (copied) (copied from juggler/trunk/vc7/Gadgeteer/X-IST)
• juggler/branches/2.2/vc7/Juggler.sln (modified) (2 diffs)
• juggler/branches/2.2/vc8/Gadgeteer/X-IST (copied) (copied from juggler/trunk/vc8/Gadgeteer/X-IST)
• juggler/branches/2.2/vc8/Juggler.sln (modified) (2 diffs)

juggler/branches/2.2/README-WINDOWS.html

@@ -291 +291 @@
-    <tt>&lt;trackdAPI_CC.h&gt;</tt>.
-  </dd>
+  <dt><tt>FTD2XX_ROOT</tt></dt>
+  <dd>
+    The root directory of an
+    <a href="http://www.ftdichip.com/Drivers/D2XX.htm">FTD2XX SDK</a>
+    installation. This is required to build the driver for the
+    <a href="http://www.x-ist.de/noDNA_X-IST.394.0.html?&L=1">noDNA X-IST</a>
+    data glove.
+  </dd>
+  <dt><tt>DOOZER_ROOT</tt></dt>
+  <dd>
+    The root directory of a <a href="http://">Doozer 2.1</a> installation.
+  </dd>
-</dl>
-

juggler/branches/2.2/build_windows.py

@@ -273 +273 @@
-   optional.append(BuildOption('TRACKD_API_ROOT',
-                               'TrackdAPI installation directory', '',
+                               required = False))
+   optional.append(BuildOption('FTD2XX_ROOT',
+                               'FTD2XX SDK installation directory', '',
-                               required = False))
-   optional.append(BuildOption('DOOZER_ROOT',
@@ -1425 +1428 @@
-              'Fastrak', 'Flock', 'IBox', 'IntersenseAPI', 'IS900',
-              'MotionStar', 'MSFTSpeechRecognition', 'PinchGlove',
-
+
+
-
-   for d in drivers:
-      srcdir = os.path.join(srcroot, d)
-      installLibs(srcdir, destdir, extensions = ['.dll'])
+
+   srcdir = os.environ['FTD2XX_ROOT']
+   if srcdir != "":
+      printStatus("Installing FTD2XX DLL")
+      destdir = os.path.join(prefix, 'bin')
+
+      ftd2xx_dll = os.path.join(srcdir, 'FTD2XX.dll')
+      if os.path.exists(ftd2xx_dll):
+         smartCopy(ftd2xx_dll, destdir)
-
-def installGadgeteerPlugins(prefix, buildDir):

juggler/branches/2.2/modules/gadgeteer/drivers/Makefile.in

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

juggler/branches/2.2/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 -lusb"
+
+   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'], [-lusb])
+
+   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)
@@ -724 +788 @@
-   VirtualTechnologies/Makefile
-   VirtualTechnologies/CyberGlove/Makefile
+   noDNA/Makefile
+   noDNA/X-IST/Makefile
-   VARS.pl
-   ])

juggler/branches/2.2/modules/gadgeteer/drivers/noDNA/X-IST/X-IST.cpp

@@ -32 +32 @@
-#include <gadget/Type/DeviceConstructor.h>
-#include <gadget/gadgetParam.h>
+#include <gadget/Util/Debug.h>
-
-#include <drivers/noDNA/X-IST/X-ISTStandalone.h> /* standalone X-IST driver */
@@ -170 +171 @@
-{
-   WORD values[24];
-R
+r
-   {
-      for ( unsigned int i = 0; i < mGlove->getNumberSensors(); ++i )

juggler/branches/2.2/modules/gadgeteer/drivers/noDNA/X-IST/X-ISTStandalone.cpp

@@ -29 +29 @@
-#include <string.h>
-
+#include <vpr/vpr.h>
+
-#include <drivers/noDNA/X-IST/X-ISTStandalone.h>
-
@@ -39 +41 @@
-#ifndef OPEN_EXISTING
-#  define OPEN_EXISTING 0
+#endif
+
+#if ! defined(VPR_OS_Windows)
+#  define PURGE_TXCLEAR 0x0004
+#  define PURGE_RXCLEAR 0x0008
-#endif
-
@@ -86 +93 @@
-                             OPEN_EXISTING, FT_OPEN_BY_SERIAL_NUMBER, 0);
-
+#if defined(VPR_OS_Windows)
-   if ( mComm == (void*) INVALID_HANDLE_VALUE )
+#else
+   if ( mComm == (void*) NULL )
+#endif
-   {
-      closeGlove();
@@ -120 +131 @@
-   read(buffer, 40);
-   FT_W32_PurgeComm(mComm, PURGE_TXCLEAR | PURGE_RXCLEAR);
-f
+mF
-//   vprDEBUG(gadgetDBG_INPUT_MGR, vprDBG_CONFIG_LVL)
-f
+mF
-//      << vprDEBUG_FLUSH;
-
@@ -159 +170 @@
-      return false;
-   }
-f
+mF
-   {
-      return false;
@@ -187 +198 @@
-   values[19] = WORD (buffer[29] + (short (buffer[28] % 16) * 256));
-
-f
+mF
-   {
-      values[20] = WORD (buffer[30] + (short (buffer[31] / 16) * 256));

juggler/branches/2.2/modules/gadgeteer/drivers/noDNA/X-IST/X-ISTStandalone.h

@@ -50 +50 @@
-   unsigned int getNumberSensors() const
-   {
-f
+mF
-   }
-

juggler/branches/2.2/vc7/Juggler.sln

@@ -283 +283 @@
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VR Juggler CORBA Performance Monitoring Plug-in IDL to C++", "VRJugglerPlugins\Perf_Plugin_CXX_IDL\Perf_Plugin_CXX_IDL.vcproj", "{C2C59AA2-CD5B-49EF-B1B0-858AC44B1FD9}"
-        ProjectSection(ProjectDependencies) = postProject
+        EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Driver - noDNA X-IST Data Glove", "Gadgeteer\X-IST\X-IST.vcproj", "{D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}"
+        ProjectSection(ProjectDependencies) = postProject
+                {1AAD8712-09DC-4957-8594-AF5A49BAB4E1} = {1AAD8712-09DC-4957-8594-AF5A49BAB4E1}
+                {00C860E8-6CC8-4638-B5D1-8E5C5A34C425} = {00C860E8-6CC8-4638-B5D1-8E5C5A34C425}
+                {5A96B2F8-7000-4988-AFD5-E85181B52BCF} = {5A96B2F8-7000-4988-AFD5-E85181B52BCF}
-        EndProjectSection
-EndProject
@@ -635 +642 @@
-                {C2C59AA2-CD5B-49EF-B1B0-858AC44B1FD9}.ReleaseDLL.ActiveCfg = ReleaseDLL|Win32
-                {C2C59AA2-CD5B-49EF-B1B0-858AC44B1FD9}.ReleaseDLL.Build.0 = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Debug.ActiveCfg = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Debug.Build.0 = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.DebugDLL.ActiveCfg = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.DebugDLL.Build.0 = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Release.ActiveCfg = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Release.Build.0 = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.ReleaseDLL.ActiveCfg = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.ReleaseDLL.Build.0 = ReleaseDLL|Win32
-        EndGlobalSection
-        GlobalSection(SolutionItems) = postSolution

juggler/branches/2.2/vc8/Juggler.sln

@@ -267 +267 @@
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VR Juggler Direct3D Draw Manager", "VRJuggler\Direct3D_Draw_Manager\Direct3D_Draw_Manager.vcproj", "{927ADA64-5D2E-4066-ABDA-3D65A9CF524B}"
-        ProjectSection(ProjectDependencies) = postProject
+                {5A96B2F8-7000-4988-AFD5-E85181B52BCF} = {5A96B2F8-7000-4988-AFD5-E85181B52BCF}
+                {00C860E8-6CC8-4638-B5D1-8E5C5A34C425} = {00C860E8-6CC8-4638-B5D1-8E5C5A34C425}
+                {8CD85B68-8E87-4289-9CD3-0C0012781BF2} = {8CD85B68-8E87-4289-9CD3-0C0012781BF2}
+                {1AAD8712-09DC-4957-8594-AF5A49BAB4E1} = {1AAD8712-09DC-4957-8594-AF5A49BAB4E1}
-                {BE8A6412-F142-493F-B1BB-363F4EDAC230} = {BE8A6412-F142-493F-B1BB-363F4EDAC230}
-
-
-
-
+
+
+
+
+
+
+
-        EndProjectSection
-EndProject
@@ -961 +968 @@
-                {927ADA64-5D2E-4066-ABDA-3D65A9CF524B}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
-                {927ADA64-5D2E-4066-ABDA-3D65A9CF524B}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Debug|Win32.ActiveCfg = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Debug|Win32.Build.0 = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Debug|x64.ActiveCfg = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.DebugDLL|Win32.Build.0 = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.DebugDLL|x64.ActiveCfg = DebugDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Release|Win32.ActiveCfg = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Release|Win32.Build.0 = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.Release|x64.ActiveCfg = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32
+                {D5860FFA-8786-41CF-9DA1-D5E87D8DECEE}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|Win32
-        EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution