From ffd2b39874d1c40447ab89bc5d5c95e1839f1c62 Mon Sep 17 00:00:00 2001
From: AlessandroSigna <alesigna92@gmail.com>
Date: Thu, 29 Oct 2015 13:18:37 -0700
Subject: [PATCH] Fix vive controller - update to new input plugin register

---
 interface/resources/controllers/vive.json                    | 5 ++++-
 .../src/input-plugins/ViveControllerManager.cpp              | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/interface/resources/controllers/vive.json b/interface/resources/controllers/vive.json
index f51f908813..bcf4943ff8 100644
--- a/interface/resources/controllers/vive.json
+++ b/interface/resources/controllers/vive.json
@@ -17,6 +17,9 @@
         { "from": "Vive.Start", "to": "Standard.Start" }, 
         
         { "from": "Vive.A", "to": "Standard.A" }, 
-        { "from": "Vive.B", "to": "Standard.B" }
+        { "from": "Vive.B", "to": "Standard.B" },
+
+        { "from": "Vive.LeftHand", "to": "Standard.LeftHand" },
+        { "from": "Vive.RightHand", "to": "Standard.RightHand" }
     ]
 }
diff --git a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
index 6d1534958a..c63d47b681 100644
--- a/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
+++ b/libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
@@ -424,6 +424,11 @@ controller::Input::NamedVector ViveControllerManager::getAvailableInputs() const
         makePair(RS, "RS"),
         makePair(LEFT_HAND, "LeftHand"),
         makePair(RIGHT_HAND, "RightHand"),
+
+        makePair(A, "A"),
+        makePair(B, "B"),
+        makePair(BACK, "Back"),
+        makePair(START, "Start"),
     };
 
     //availableInputs.append(Input::NamedPair(makeInput(BUTTON_A, 0), "Left Button A"));