Merge pull request #1053 from StephenHodgson/MRTK-2017.2-XboxFixes

Mrtk 2017.2 Xbox Controller Regression Fixes

Author: StephenHodgson

Assets/HoloToolkit-Examples/GamePad/Scenes/XboxControllerExample.unity

@@ -707,10 +707,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   DeviceRefreshInterval: 3
-  horizontalAxis: 4
-  verticalAxis: 5
-  submitButton: 9
-  cancelButton: 10
+  horizontalAxis: 3
+  verticalAxis: 4
+  submitButton: 10
+  cancelButton: 11
   mapping:
   - Type: 0
     Value: 

Assets/HoloToolkit/Input/Scripts/GamePad/XboxControllerMapping.cs

@@ -34,6 +34,8 @@ public static string GetMapping(XboxControllerMappingTypes type)
         {
             switch (type)
             {
+                case XboxControllerMappingTypes.None:
+                    return string.Empty;
                 case XboxControllerMappingTypes.XboxLeftStickHorizontal:
                     return XboxLeftStickHorizontal;
                 case XboxControllerMappingTypes.XboxLeftStickVertical:
@@ -81,6 +83,8 @@ public static void SetMapping(XboxControllerMappingTypes type, string value)
         {
             switch (type)
             {
+                case XboxControllerMappingTypes.None:
+                    return;
                 case XboxControllerMappingTypes.XboxLeftStickHorizontal:
                     XboxLeftStickHorizontal = string.IsNullOrEmpty(value) ? "CONTROLLER_LEFT_STICK_HORIZONTAL" : value;
                     break;

Assets/HoloToolkit/Input/Scripts/InputSources/XboxControllerInputSource.cs

@@ -18,7 +18,7 @@ public class XboxControllerInputSource : GamePadInputSource
         [Serializable]
         private class MappingEntry
         {
-            public XboxControllerMappingTypes Type = 0;
+            public XboxControllerMappingTypes Type = XboxControllerMappingTypes.None;
             public string Value = string.Empty;
         }