diff --git a/HandheldCompanion/Extensions/GlyphExtensions.cs b/HandheldCompanion/Extensions/GlyphExtensions.cs index 028abff47..90dd3099f 100644 --- a/HandheldCompanion/Extensions/GlyphExtensions.cs +++ b/HandheldCompanion/Extensions/GlyphExtensions.cs @@ -15,8 +15,10 @@ public static string ToGlyph(this MotionInput motionInput) return "\uF119"; case MotionInput.WorldSpace: return "\uE714"; + /* case MotionInput.AutoRollYawSwap: return "\uE7F8"; + */ case MotionInput.JoystickSteering: return "\uEC47"; } diff --git a/HandheldCompanion/Misc/Profile.cs b/HandheldCompanion/Misc/Profile.cs index e2e5daebe..5584163d7 100644 --- a/HandheldCompanion/Misc/Profile.cs +++ b/HandheldCompanion/Misc/Profile.cs @@ -35,7 +35,7 @@ public enum SteeringAxis { Roll = 0, Yaw = 1, - Combined = 2, // unused + Auto = 2, // unused } [Serializable] diff --git a/HandheldCompanion/Properties/Resources.Designer.cs b/HandheldCompanion/Properties/Resources.Designer.cs index e4c0cbf77..f0db7f3b8 100644 --- a/HandheldCompanion/Properties/Resources.Designer.cs +++ b/HandheldCompanion/Properties/Resources.Designer.cs @@ -5868,15 +5868,6 @@ public static string ProfilesPage_Cancel { } } - /// - /// Looks up a localized string similar to Roll/Yaw. - /// - public static string ProfilesPage_Combined { - get { - return ResourceManager.GetString("ProfilesPage_Combined", resourceCulture); - } - } - /// /// Looks up a localized string similar to Controller layout. /// @@ -6543,6 +6534,15 @@ public static string ProfilesPage_Roll { } } + /// + /// Looks up a localized string similar to Auto. + /// + public static string ProfilesPage_RollYawAuto { + get { + return ResourceManager.GetString("ProfilesPage_RollYawAuto", resourceCulture); + } + } + /// /// Looks up a localized string similar to Radeon Super Resolution. /// diff --git a/HandheldCompanion/Properties/Resources.resx b/HandheldCompanion/Properties/Resources.resx index 27ac9c2f6..06b43f3df 100644 --- a/HandheldCompanion/Properties/Resources.resx +++ b/HandheldCompanion/Properties/Resources.resx @@ -2961,8 +2961,8 @@ Motion input toggle: press selected button(s) to switch motion state. Xbox 360 - - Roll/Yaw + + Auto MSI Center is running diff --git a/HandheldCompanion/Utils/InputUtils.cs b/HandheldCompanion/Utils/InputUtils.cs index 6994c294e..0567dc2eb 100644 --- a/HandheldCompanion/Utils/InputUtils.cs +++ b/HandheldCompanion/Utils/InputUtils.cs @@ -32,8 +32,7 @@ public enum MotionInput /// While more intuitive, world space controls are challenging to implement and less suitable for handheld devices. /// WorldSpace = 2, - AutoRollYawSwap = 3, - JoystickSteering = 4 + JoystickSteering = 3 } public enum MotionOuput diff --git a/HandheldCompanion/Views/Pages/ProfilesPage.xaml b/HandheldCompanion/Views/Pages/ProfilesPage.xaml index 2f8a9502e..e5abbddc1 100644 --- a/HandheldCompanion/Views/Pages/ProfilesPage.xaml +++ b/HandheldCompanion/Views/Pages/ProfilesPage.xaml @@ -958,12 +958,12 @@