Merge pull request #6275 from ZappoMan/mappingTweaks

Mapping tweaks to match Controllers spec

interface/resources/controllers/hydra.json

@@ -13,17 +13,12 @@
         { "from": "Hydra.RB", "to": "Standard.RB" }, 
         { "from": "Hydra.RS", "to": "Standard.RS" },
 
-        { "from": "Hydra.L0", "to": "Standard.Back" }, 
+        { "from": [ "Hydra.L3", "Hydra.L4" ], "to": "Standard.LeftPrimaryThumb" },
-        { "from": "Hydra.L1", "to": "Standard.DL" },
+        { "from": [ "Hydra.L1", "Hydra.L2" ], "to": "Standard.LeftSecondaryThumb" },
-        { "from": "Hydra.L2", "to": "Standard.DD" }, 
+
-        { "from": "Hydra.L3", "to": "Standard.DR" }, 
+        { "from": [ "Hydra.R3", "Hydra.R4" ], "to": "Standard.RightPrimaryThumb" },
-        { "from": "Hydra.L4", "to": "Standard.DU" },
+        { "from": [ "Hydra.R1", "Hydra.R2" ], "to": "Standard.RightSecondaryThumb" },
 
-        { "from": "Hydra.R0", "to": "Standard.Start" }, 
-        { "from": "Hydra.R1", "to": "Standard.X" },
-        { "from": "Hydra.R2", "to": "Standard.A" }, 
-        { "from": "Hydra.R3", "to": "Standard.B" }, 
-        { "from": "Hydra.R4", "to": "Standard.Y" },
 
         { "from": "Hydra.LeftHand", "to": "Standard.LeftHand" }, 
         { "from": "Hydra.RightHand", "to": "Standard.RightHand" }

interface/resources/controllers/standard.json

@@ -2,9 +2,8 @@
     "name": "Standard to Action",
     "channels": [
         { "from": "Standard.LY", "to": "Actions.TranslateZ" },
-        { "from": "Standard.LX", "to": "Actions.TranslateX" },
 
-        { "from": "Standard.RX",
+        { "from": "Standard.LX",
           "when": [ "Application.InHMD", "Application.ComfortMode" ],
           "to": "Actions.StepYaw",
           "filters":
@@ -14,8 +13,9 @@
             ]
         },
 
+        { "from": "Standard.LX", "to": "Actions.Yaw" },
 
-        { "from": "Standard.RX", "to": "Actions.Yaw" },
+        { "from": "Standard.RX", "to": "Actions.TranslateX" },
         { "from": "Standard.RY", "filters": "invert", "to": "Actions.TranslateY" }, 
 
 

libraries/controllers/src/controllers/StandardController.cpp

@@ -55,6 +55,9 @@ Input::NamedVector StandardController::getAvailableInputs() const {
         makePair(LS, "LS"),
         makePair(RS, "RS"),
 
+        makePair(LS_TOUCH, "LSTouch"),
+        makePair(RS_TOUCH, "RSTouch"),
+
         // Center buttons
         makePair(START, "Start"),
         makePair(BACK, "Back"),
@@ -69,26 +72,41 @@ Input::NamedVector StandardController::getAvailableInputs() const {
         makePair(LT, "LT"),
         makePair(RT, "RT"),
 
-
         // Finger abstractions
         makePair(LEFT_PRIMARY_THUMB, "LeftPrimaryThumb"),
         makePair(LEFT_SECONDARY_THUMB, "LeftSecondaryThumb"),
+        makePair(LEFT_THUMB_UP, "LeftThumbUp"),
         makePair(RIGHT_PRIMARY_THUMB, "RightPrimaryThumb"),
         makePair(RIGHT_SECONDARY_THUMB, "RightSecondaryThumb"),
+        makePair(RIGHT_THUMB_UP, "RightThumbUp"),
+
+        makePair(LEFT_PRIMARY_THUMB_TOUCH, "LeftPrimaryThumbTouch"),
+        makePair(LEFT_SECONDARY_THUMB_TOUCH, "LeftSecondaryThumbTouch"),
+        makePair(RIGHT_PRIMARY_THUMB_TOUCH, "RightPrimaryThumbTouch"),
+        makePair(RIGHT_SECONDARY_THUMB_TOUCH, "RightSecondaryThumbTouch"),
+
+        makePair(LEFT_INDEX_POINT, "LeftIndexPoint"),
+        makePair(RIGHT_INDEX_POINT, "RightIndexPoint"),
 
         makePair(LEFT_PRIMARY_INDEX, "LeftPrimaryIndex"),
         makePair(LEFT_SECONDARY_INDEX, "LeftSecondaryIndex"),
         makePair(RIGHT_PRIMARY_INDEX, "RightPrimaryIndex"),
         makePair(RIGHT_SECONDARY_INDEX, "RightSecondaryIndex"),
 
+        makePair(LEFT_PRIMARY_INDEX_TOUCH, "LeftPrimaryIndexTouch"),
+        makePair(LEFT_SECONDARY_INDEX_TOUCH, "LeftSecondaryIndexTouch"),
+        makePair(RIGHT_PRIMARY_INDEX_TOUCH, "RightPrimaryIndexTouch"),
+        makePair(RIGHT_SECONDARY_INDEX_TOUCH, "RightSecondaryIndexTouch"),
+
         makePair(LEFT_GRIP, "LeftGrip"),
+        makePair(LEFT_GRIP_TOUCH, "LeftGripTouch"),
         makePair(RIGHT_GRIP, "RightGrip"),
+        makePair(RIGHT_GRIP_TOUCH, "RightGripTouch"),
 
         // Poses
         makePair(LEFT_HAND, "LeftHand"),
         makePair(RIGHT_HAND, "RightHand"),
 
-
         // Aliases, PlayStation style names
         makePair(LB, "L1"),
         makePair(RB, "R1"),

libraries/controllers/src/controllers/StandardControls.h

@@ -39,16 +39,33 @@ namespace controller {
         // These don't map to SDL types
         LEFT_PRIMARY_THUMB,
         LEFT_SECONDARY_THUMB,
+        LEFT_PRIMARY_THUMB_TOUCH,
+        LEFT_SECONDARY_THUMB_TOUCH,
+        LS_TOUCH,
+        LEFT_THUMB_UP,
+
         RIGHT_PRIMARY_THUMB,
         RIGHT_SECONDARY_THUMB,
+        RIGHT_PRIMARY_THUMB_TOUCH,
+        RIGHT_SECONDARY_THUMB_TOUCH,
+        RS_TOUCH,
+        RIGHT_THUMB_UP,
 
         LEFT_PRIMARY_INDEX,
         LEFT_SECONDARY_INDEX,
+        LEFT_PRIMARY_INDEX_TOUCH,
+        LEFT_SECONDARY_INDEX_TOUCH,
+        LEFT_INDEX_POINT,
         RIGHT_PRIMARY_INDEX,
         RIGHT_SECONDARY_INDEX,
+        RIGHT_PRIMARY_INDEX_TOUCH,
+        RIGHT_SECONDARY_INDEX_TOUCH,
+        RIGHT_INDEX_POINT,
 
         LEFT_GRIP,
+        LEFT_GRIP_TOUCH,
         RIGHT_GRIP,
+        RIGHT_GRIP_TOUCH,
 
         NUM_STANDARD_BUTTONS
     };