added support for SpaceMouse Pro and 32 buttons (thanks to David Seikel)

janoc · Apr 11, 2014 · b50f264 · b50f264
1 parent b139baa
commit b50f264
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,8 +1,11 @@
- 2014-04-08  Jan Ciger  <jan.ciger (at) gmail.com>
+2014-04-12  Jan Ciger  <jan.ciger (at) gmail.com>
+        * 0.5 
+            - added support for 3Dconnexion SpaceMouse Pro & increased number of supported buttons to 32 (thanks to David Seikel)
+2014-04-08  Jan Ciger  <jan.ciger (at) gmail.com>
         * 0.4 
             - added support for 3Dconnexion SpaceBall 5000 & increased number of supported buttons to 12
             - merged change from Armin Weatherwax <Armin.Weatherwax (at) gmail.com> for 3Dconnexion SpaceExplorer
- 2010-08-10  Jan Ciger  <jan.ciger (at) gmail.com>
+2010-08-10  Jan Ciger  <jan.ciger (at) gmail.com>
         * 0.3 
             - fixed support for newer kernels - it seems that somewhere between 2.6.31 and 2.6.35 the SpaceNavigator 
             driver was changed to send EV_ABS events instead of EV_REL. Thanks to Thomax G. thomax23 (at) googlemail.com

diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@ Currently supported are the following devices (VID:PID):
   * 0x046d:0xc623   3Dconnexion SpaceTraveller (untested)
   * 0x046d:0xc603   3Dconnexion SpaceMouse (untested)
   * 0x046d:0xc627   3Dconnexion SpaceExplorer (untested - from Armin Weatherwax <Armin.Weatherwax (at) gmail.com>)
+  * 0x046d:0xc62b   3Dconnexion SpaceMouse Pro (untested - from David Seikel < http://onefang.net/ >
 
 In addition, the library supports every joystick/gamepad device supported by the SDL library.
 

diff --git a/ndofdev.c b/ndofdev.c
@@ -97,6 +97,7 @@ int ndof_init_first(NDOF_Device *in_out_dev, void *param)
             if ((ID.vendor == 0x046d) &&
                     ((ID.product == 0xc626) || // SpaceNavigators
                      (ID.product == 0xc621) || // SpaceBall 5000 
+                     (ID.product == 0xc62b) || // SpaceMousePro 
                      (ID.product == 0xc627) || // SpaceExplorer (untested)
                      (ID.product == 0xc623) || // SpaceTraveler (untested)
                      (ID.product == 0xc603)))  // SpaceMouse (untested)
@@ -116,7 +117,7 @@ int ndof_init_first(NDOF_Device *in_out_dev, void *param)
         spacenav_fd = fd;
 
         int N_AXES = 6; // FIXME: shouldn't be hardwired!
-        int N_BUTTONS = 12;
+        int N_BUTTONS = 32;
 
         in_out_dev->axes_count = N_AXES;
         in_out_dev->btn_count  = N_BUTTONS;