fixed vButton for shift initialisation

Author: FloH

MobiFlight/Joysticks/Octavi/OctaviHandler.cs

@@ -6,6 +6,8 @@ namespace MobiFlight.Joysticks.Octavi
 {
     internal class OctaviHandler
     {
+        private const string Unshift_VButton_Name = "Button_UNSHIFT_SW";
+
         private bool isInShiftMode = false;
         private OctaviReport lastReport = new OctaviReport();
         private readonly List<string> buttons = new List<string>();
@@ -70,7 +72,7 @@ public OctaviHandler(JoystickDefinition definition = null)
                 if (!definition.Inputs.Any(JoystickInput => JoystickInput.Id == (int) context.state))
                 {
                     buttonMappings.Add((context.state, context.isShifted, OctaviReport.OctaviButtons.HID_ENC_SW), ToButton($"Button_{context.name}_CRSR"));
-                    buttonMappings.Add((context.state, context.isShifted, OctaviReport.OctaviButtons.HID_ENC_SW), ToButton($"Button_UNSHIFT_SW"));
+                    //buttonMappings.Add((context.state, context.isShifted, OctaviReport.OctaviButtons.HID_ENC_SW), ToButton(Unshift_VButton_Name));
                 }
                 else
                 {
@@ -81,7 +83,7 @@ public OctaviHandler(JoystickDefinition definition = null)
                     * (i.e. not a variable that will be toggled when a single button is pressed can be used)
                     * States that do not support a shift mode will always be "unshifted".
                     */
-                    buttonMappings.Add((context.state, context.isShifted, OctaviReport.OctaviButtons.HID_ENC_SW), ToButton($"Button_{(context.isShifted ? "" : "UN")}SHIFT_SW"));
+                    buttonMappings.Add((context.state, context.isShifted, OctaviReport.OctaviButtons.HID_ENC_SW), ToButton(context.isShifted ? Shift_VButton_Name : Unshift_VButton_Name));
                 }
 
                 // DCT, MENU, CLR, ENT, CDI, OBS, MSG, FLP, VNAV, PROC
@@ -121,6 +123,12 @@ public OctaviHandler(JoystickDefinition definition = null)
                 }
             }
 
+            if (buttons.IndexOf(Unshift_VButton_Name) < 0)
+            {
+                /* create at least the Button index for the virtual unshift event on context change. */
+                _ = ToButton(Unshift_VButton_Name);
+            }
+
             JoystickButtonNames = buttons.AsReadOnly();
         }
 
@@ -153,17 +161,20 @@ private int ToButton(string buttonName)
             // "Shift Mode" for supported contexts
             if (report.contextState != lastReport.contextState)
             {
-                // reset shift mode on context changes (and synthesize unshift press)
-                if (buttonMappings.TryGetValue((lastReport.contextState, false, OctaviReport.OctaviButtons.HID_ENC_SW), out int buttonIndex))
+                // reset shift mode on context changes (and synthesize unshift press/release)
+                int unshift_vButton = buttons.IndexOf(Unshift_VButton_Name);
+
+                if (unshift_vButton >= 0)
                 {
-                    var inputEvent = pressed.HasFlag(OctaviReport.OctaviButtons.HID_ENC_SW) ? MobiFlightButton.InputEvent.PRESS : MobiFlightButton.InputEvent.RELEASE;
-                    buttonEvents.Add((buttonIndex, inputEvent));
+                    buttonEvents.Add((unshift_vButton, MobiFlightButton.InputEvent.PRESS));
+                    buttonEvents.Add((unshift_vButton, MobiFlightButton.InputEvent.RELEASE));
                 }
 
                 isInShiftMode = false;
             }
             else if (pressed.HasFlag(OctaviReport.OctaviButtons.HID_ENC_SW) && this.definition.Inputs.Any(JoystickInput => JoystickInput.Id == (int)report.contextState))
             {
+                /* Button events will be generated by finding the corrensponding ButtonMapping in the loop at the end. */
                 isInShiftMode = !isInShiftMode;
             }