From 39e8459840e909aafc9d95f4d6492c6c770cb871 Mon Sep 17 00:00:00 2001
From: Ash <quarktheawesome@gmail.com>
Date: Thu, 13 Apr 2017 13:00:35 +1000
Subject: [PATCH] Show VID/PIDs to user

---
 .../HIDToVPADNetworkClient/controller/HidController.java    | 6 +++---
 .../controller/LinuxDevInputController.java                 | 2 +-
 .../controller/XInput13Controller.java                      | 2 +-
 .../controller/XInput14Controller.java                      | 2 +-
 .../HIDToVPADNetworkClient/controller/XInputController.java | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/net/ash/HIDToVPADNetworkClient/controller/HidController.java b/src/net/ash/HIDToVPADNetworkClient/controller/HidController.java
index 36912fb..6ff2724 100644
--- a/src/net/ash/HIDToVPADNetworkClient/controller/HidController.java
+++ b/src/net/ash/HIDToVPADNetworkClient/controller/HidController.java
@@ -113,13 +113,13 @@ public class HidController extends Controller {
         // TODO: own class for joycons
         if (getVID() == 0x57e) {
             if (getPID() == 0x2006) {
-                return "Joy-Con (L) on " + getIdentifier();
+                return "Joy-Con (L) (57e:2006) on " + getIdentifier();
             } else if (getPID() == 0x2007) {
-                return "Joy-Con (R) on " + getIdentifier();
+                return "Joy-Con (R) (57e:2007) on " + getIdentifier();
             }
         }
 
         String name = getHidDevice().getProductString();
-        return ((name != null) ? name : "USB HID") + " on " + getIdentifier();
+        return ((name != null) ? name : "USB HID") + " (" + Integer.toHexString((int)getVID() & 0xFFFF) + ":" + Integer.toHexString((int)getPID() & 0xFFFF) + ") on " + getIdentifier();
     }
 }
\ No newline at end of file
diff --git a/src/net/ash/HIDToVPADNetworkClient/controller/LinuxDevInputController.java b/src/net/ash/HIDToVPADNetworkClient/controller/LinuxDevInputController.java
index 1bd515e..3fa31f8 100644
--- a/src/net/ash/HIDToVPADNetworkClient/controller/LinuxDevInputController.java
+++ b/src/net/ash/HIDToVPADNetworkClient/controller/LinuxDevInputController.java
@@ -195,6 +195,6 @@ public class LinuxDevInputController extends Controller implements Runnable {
 
     @Override
     public String getInfoText() {
-        return ((name != null) ? name : "Linux controller") + " on " + getIdentifier();    
+        return ((name != null) ? name : "Linux controller") + " (" + Integer.toHexString((int)getVID() & 0xFFFF) + ":" + Integer.toHexString((int)getPID() & 0xFFFF) + ") on " + getIdentifier();    
     }
 }
diff --git a/src/net/ash/HIDToVPADNetworkClient/controller/XInput13Controller.java b/src/net/ash/HIDToVPADNetworkClient/controller/XInput13Controller.java
index 3890613..ca6ec70 100644
--- a/src/net/ash/HIDToVPADNetworkClient/controller/XInput13Controller.java
+++ b/src/net/ash/HIDToVPADNetworkClient/controller/XInput13Controller.java
@@ -30,6 +30,6 @@ public class XInput13Controller extends XInputController {
 
     @Override
     public String getInfoText() {
-        return "XInput 1.3 on " + getIdentifier();
+        return "XInput 1.3 (" + Integer.toHexString((int)getVID() & 0xFFFF) + ":" + Integer.toHexString((int)getPID() & 0xFFFF) + ") on " + getIdentifier();
     }
 }
diff --git a/src/net/ash/HIDToVPADNetworkClient/controller/XInput14Controller.java b/src/net/ash/HIDToVPADNetworkClient/controller/XInput14Controller.java
index 5559f29..e2674f5 100644
--- a/src/net/ash/HIDToVPADNetworkClient/controller/XInput14Controller.java
+++ b/src/net/ash/HIDToVPADNetworkClient/controller/XInput14Controller.java
@@ -30,6 +30,6 @@ public class XInput14Controller extends XInputController {
 
     @Override
     public String getInfoText() {
-        return "XInput 1.4 on " + getIdentifier();
+        return "XInput 1.4 (" + Integer.toHexString((int)getVID() & 0xFFFF) + ":" + Integer.toHexString((int)getPID() & 0xFFFF) + ") on " + getIdentifier();
     }
 }
diff --git a/src/net/ash/HIDToVPADNetworkClient/controller/XInputController.java b/src/net/ash/HIDToVPADNetworkClient/controller/XInputController.java
index ba970d2..efba649 100644
--- a/src/net/ash/HIDToVPADNetworkClient/controller/XInputController.java
+++ b/src/net/ash/HIDToVPADNetworkClient/controller/XInputController.java
@@ -139,6 +139,6 @@ public class XInputController extends Controller {
 
     @Override
     public String getInfoText() {
-        return "XInput on " + getIdentifier();
+        return "XInput (" + Integer.toHexString((int)getVID() & 0xFFFF) + ":" + Integer.toHexString((int)getPID() & 0xFFFF) + ") on " + getIdentifier();
     }
 }