From d1da2f5aab07ec445cdbbce323b6ed139e2b5375 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 22 Oct 2015 15:51:09 -0700
Subject: [PATCH] Adding more items to the standard controller abstraction

---
 .../src/controllers/StandardController.cpp    | 20 +++++++++++++++----
 .../src/controllers/StandardControls.h        |  8 ++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/libraries/controllers/src/controllers/StandardController.cpp b/libraries/controllers/src/controllers/StandardController.cpp
index 5734174284..fc62f85b81 100644
--- a/libraries/controllers/src/controllers/StandardController.cpp
+++ b/libraries/controllers/src/controllers/StandardController.cpp
@@ -73,10 +73,26 @@ void StandardController::buildDeviceProxy(DeviceProxy::Pointer proxy) {
         availableInputs.append(makePair(LT, "LT"));
         availableInputs.append(makePair(RT, "RT"));
 
+
+        // Finger abstractions
+        availableInputs.append(makePair(LEFT_PRIMARY_THUMB, "LeftPrimaryThumb"));
+        availableInputs.append(makePair(LEFT_SECONDARY_THUMB, "LeftSecondaryThumb"));
+        availableInputs.append(makePair(RIGHT_PRIMARY_THUMB, "RightPrimaryThumb"));
+        availableInputs.append(makePair(RIGHT_SECONDARY_THUMB, "RightSecondaryThumb"));
+
+        availableInputs.append(makePair(LEFT_PRIMARY_INDEX, "LeftPrimaryIndex"));
+        availableInputs.append(makePair(LEFT_SECONDARY_INDEX, "LeftSecondaryIndex"));
+        availableInputs.append(makePair(RIGHT_PRIMARY_INDEX, "RightPrimaryIndex"));
+        availableInputs.append(makePair(RIGHT_SECONDARY_INDEX, "RightSecondaryIndex"));
+
+        availableInputs.append(makePair(LEFT_GRIP, "LeftGrip"));
+        availableInputs.append(makePair(RIGHT_GRIP, "RightGrip"));
+
         // Poses
         availableInputs.append(makePair(LEFT_HAND, "LeftHand"));
         availableInputs.append(makePair(RIGHT_HAND, "RightHand"));
 
+
         // Aliases, PlayStation style names
         availableInputs.append(makePair(LB, "L1"));
         availableInputs.append(makePair(RB, "R1"));
@@ -95,10 +111,6 @@ void StandardController::buildDeviceProxy(DeviceProxy::Pointer proxy) {
         availableInputs.append(makePair(DR, "Right"));
 
 
-        availableInputs.append(makePair(LEFT_PRIMARY_THUMB, "LeftPrimaryThumb"));
-        availableInputs.append(makePair(LEFT_SECONDARY_THUMB, "LeftSecondaryThumb"));
-        availableInputs.append(makePair(RIGHT_PRIMARY_THUMB, "RightPrimaryThumb"));
-        availableInputs.append(makePair(RIGHT_SECONDARY_THUMB, "RightSecondaryThumb"));
 
         return availableInputs;
     };
diff --git a/libraries/controllers/src/controllers/StandardControls.h b/libraries/controllers/src/controllers/StandardControls.h
index b051f68c13..066a3e5e60 100644
--- a/libraries/controllers/src/controllers/StandardControls.h
+++ b/libraries/controllers/src/controllers/StandardControls.h
@@ -42,6 +42,14 @@ namespace controller {
         RIGHT_PRIMARY_THUMB,
         RIGHT_SECONDARY_THUMB,
 
+        LEFT_PRIMARY_INDEX,
+        LEFT_SECONDARY_INDEX,
+        RIGHT_PRIMARY_INDEX,
+        RIGHT_SECONDARY_INDEX,
+
+        LEFT_GRIP,
+        RIGHT_GRIP,
+
         NUM_STANDARD_BUTTONS
     };