Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2011-06-18 02:19:16 +0400
committerMike Erwin <significant.bit@gmail.com>2011-06-18 02:19:16 +0400
commit56e312a88e3a8da8c7c74cf69defd9f074c4b5b9 (patch)
tree94a6823571bb89987da2a18687899fdca3a0f9b5 /intern
parentd53801e8f63074ee9d9d2cd926491d70b5d62226 (diff)
filled out USB product IDs for all 3Dconnexion devices
Diffstat (limited to 'intern')
-rw-r--r--intern/ghost/intern/GHOST_NDOFManager.cpp17
1 files changed, 12 insertions, 5 deletions
diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp
index a2b9a53a51c..8cd5728601d 100644
--- a/intern/ghost/intern/GHOST_NDOFManager.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManager.cpp
@@ -26,7 +26,7 @@
#include "GHOST_EventKey.h"
#include "GHOST_WindowManager.h"
#include <string.h> // for memory functions
-#include <stdio.h> // for debug tracing
+#include <stdio.h> // for error/info reporting
#ifdef DEBUG_NDOF_BUTTONS
static const char* ndof_button_names[] = {
@@ -150,12 +150,19 @@ void GHOST_NDOFManager::setDevice(unsigned short vendor_id, unsigned short produ
{
switch (vendor_id)
{
- case 0x046d: // Logitech (3Dconnexion)
+ case 0x046D: // Logitech (3Dconnexion)
switch (product_id)
{
- case 0xc626: m_deviceType = NDOF_SpaceNavigator; break;
- case 0xc627: m_deviceType = NDOF_SpaceExplorer; break;
- case 0xc629: m_deviceType = NDOF_SpacePilotPro; break;
+ // -- current devices --
+ case 0xC626: m_deviceType = NDOF_SpaceNavigator; break;
+ case 0xC628: m_deviceType = NDOF_SpaceNavigator; /* for Notebooks */ break;
+ case 0xC627: m_deviceType = NDOF_SpaceExplorer; break;
+ case 0xC629: m_deviceType = NDOF_SpacePilotPro; break;
+
+ // -- older devices --
+ case 0xC623: puts("ndof: SpaceTraveler not supported, please file a bug report"); break;
+ case 0xC625: puts("ndof: SpacePilot not supported, please file a bug report"); break;
+
default: printf("ndof: unknown Logitech product %04hx\n", product_id);
}
break;