implement automatic Roll/Yaw swap (#229)

- if main sensor is internal/external, swap axis to Yaw. - if main sensor is controller, compare accelZ and accelY to swap axis.
Valkirie · Apr 8, 2024 · dfdd03a · dfdd03a
1 parent 56553f6
commit dfdd03a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git 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
@@ -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
diff --git 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.</value>
   <data name="OverlayPage_Xbox360Controller" xml:space="preserve">
     <value>Xbox 360</value>
   </data>
-  <data name="ProfilesPage_Combined" xml:space="preserve">
-    <value>Roll/Yaw</value>
+  <data name="ProfilesPage_RollYawAuto" xml:space="preserve">
+    <value>Auto</value>
   </data>
   <data name="Hint_MSIClawCenterCheck" xml:space="preserve">
     <value>MSI Center is running</value>

diff --git 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.
     /// </summary>
     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
@@ -958,12 +958,12 @@
                                                     <Label Content="{x:Static resx:Resources.ProfilesPage_Roll}" />
                                                 </ui:SimpleStackPanel>
                                             </ComboBoxItem>
-                                            <!--<ComboBoxItem>
+                                            <ComboBoxItem>
                                                 <ui:SimpleStackPanel Orientation="Horizontal" Spacing="6">
                                                     <ui:FontIcon Glyph="&#xE8B4;" />
-                                                    <Label Content="{x:Static resx:Resources.ProfilesPage_Combined}" />
+                                                    <Label Content="{x:Static resx:Resources.ProfilesPage_RollYawAuto}" />
                                                 </ui:SimpleStackPanel>
-                                            </ComboBoxItem>-->
+                                            </ComboBoxItem>
                                         </ComboBox>
                                     </Grid>