From 11774d86089197d33596a2d1eb3904ae500026f2 Mon Sep 17 00:00:00 2001
From: Jello <abrajuka@pegasusaero.ca>
Date: Wed, 4 Feb 2026 11:11:10 -0500
Subject: [PATCH 1/2] auto enable joystick setting added checkbox in planner
 configs to auto enable joysticks when connected joystick loop checks the auto
 enable setting and enables the joystick if available joystick setup
 enable/disable button is greyed out when auto enable is turned on

---
 .../ConfigPlanner.Designer.cs                 |  10 +
 GCSViews/ConfigurationView/ConfigPlanner.cs   |   6 +
 GCSViews/ConfigurationView/ConfigPlanner.resx | 216 ++++++++++--------
 Joystick/JoystickSetup.cs                     |  78 +++----
 MainV2.cs                                     |  30 +++
 5 files changed, 208 insertions(+), 132 deletions(-)

diff --git a/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs b/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs
index d168c8790b..f353891d10 100644
--- a/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs
+++ b/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs
@@ -123,6 +123,7 @@ private void InitializeComponent()
             this.label13 = new System.Windows.Forms.Label();
             this.BUT_mapCacheDir = new MissionPlanner.Controls.MyButton();
             this.CHK_rtsresetesp32 = new System.Windows.Forms.CheckBox();
+            this.CHK_joystickautoenable = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.NUM_tracklength)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.num_gcsid)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.num_linelength)).BeginInit();
@@ -891,9 +892,17 @@ private void InitializeComponent()
             this.CHK_rtsresetesp32.UseVisualStyleBackColor = true;
             this.CHK_rtsresetesp32.CheckedChanged += new System.EventHandler(this.CHK_rtsresetesp32_CheckedChanged);
             // 
+            // CHK_joystickautoenable
+            // 
+            resources.ApplyResources(this.CHK_joystickautoenable, "CHK_joystickautoenable");
+            this.CHK_joystickautoenable.Name = "CHK_joystickautoenable";
+            this.CHK_joystickautoenable.UseVisualStyleBackColor = true;
+            this.CHK_joystickautoenable.CheckedChanged += new System.EventHandler(this.CHK_joystickautoenable_CheckedChanged);
+            // 
             // ConfigPlanner
             // 
             resources.ApplyResources(this, "$this");
+            this.Controls.Add(this.CHK_joystickautoenable);
             this.Controls.Add(this.CHK_rtsresetesp32);
             this.Controls.Add(this.label10);
             this.Controls.Add(this.cmb_secondarydisplaystyle);
@@ -1094,5 +1103,6 @@ private void InitializeComponent()
         public System.Windows.Forms.ComboBox CMB_mapCache;
         private Controls.MyButton BUT_mapCacheDir;
         private System.Windows.Forms.CheckBox CHK_rtsresetesp32;
+        private System.Windows.Forms.CheckBox CHK_joystickautoenable;
     }
 }
diff --git a/GCSViews/ConfigurationView/ConfigPlanner.cs b/GCSViews/ConfigurationView/ConfigPlanner.cs
index 4770d7bef9..6ca7c20a04 100644
--- a/GCSViews/ConfigurationView/ConfigPlanner.cs
+++ b/GCSViews/ConfigurationView/ConfigPlanner.cs
@@ -174,6 +174,7 @@ public void Activate()
             // setup other config state
             SetCheckboxFromConfig("CHK_resetapmonconnect", CHK_resetapmonconnect);
             SetCheckboxFromConfig("CHK_rtsresetesp32", CHK_rtsresetesp32);
+            SetCheckboxFromConfig("CHK_Joystick_AutoEnable", CHK_joystickautoenable);
 
             CMB_rateattitude.Text = MainV2.comPort.MAV.cs.rateattitude.ToString();
             CMB_rateposition.Text = MainV2.comPort.MAV.cs.rateposition.ToString();
@@ -1190,5 +1191,10 @@ private void BUT_mapCacheDir_Click(object sender, EventArgs e)
             {
             }
         }
+
+        private void CHK_joystickautoenable_CheckedChanged(object sender, EventArgs e)
+        {
+            Settings.Instance["CHK_Joystick_AutoEnable"] = CHK_joystickautoenable.Checked.ToString();
+        }
     }
 }
\ No newline at end of file
diff --git a/GCSViews/ConfigurationView/ConfigPlanner.resx b/GCSViews/ConfigurationView/ConfigPlanner.resx
index 86448cb9e4..ce8165f040 100644
--- a/GCSViews/ConfigurationView/ConfigPlanner.resx
+++ b/GCSViews/ConfigurationView/ConfigPlanner.resx
@@ -145,7 +145,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label33.ZOrder" xml:space="preserve">
-    <value>43</value>
+    <value>44</value>
   </data>
   <data name="CMB_ratesensors.Items" xml:space="preserve">
     <value>-1</value>
@@ -211,7 +211,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_ratesensors.ZOrder" xml:space="preserve">
-    <value>44</value>
+    <value>45</value>
   </data>
   <data name="label26.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -241,7 +241,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label26.ZOrder" xml:space="preserve">
-    <value>45</value>
+    <value>46</value>
   </data>
   <data name="CMB_videoresolutions.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 35</value>
@@ -262,7 +262,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_videoresolutions.ZOrder" xml:space="preserve">
-    <value>46</value>
+    <value>47</value>
   </data>
   <data name="label12.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -292,7 +292,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
-    <value>48</value>
+    <value>49</value>
   </data>
   <data name="CHK_GDIPlus.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -319,7 +319,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_GDIPlus.ZOrder" xml:space="preserve">
-    <value>49</value>
+    <value>50</value>
   </data>
   <data name="label24.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -349,7 +349,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label24.ZOrder" xml:space="preserve">
-    <value>50</value>
+    <value>51</value>
   </data>
   <data name="CHK_loadwponconnect.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -376,7 +376,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_loadwponconnect.ZOrder" xml:space="preserve">
-    <value>51</value>
+    <value>52</value>
   </data>
   <data name="label23.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -406,7 +406,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label23.ZOrder" xml:space="preserve">
-    <value>52</value>
+    <value>53</value>
   </data>
   <data name="NUM_tracklength.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 300</value>
@@ -427,7 +427,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;NUM_tracklength.ZOrder" xml:space="preserve">
-    <value>54</value>
+    <value>55</value>
   </data>
   <data name="CHK_speechaltwarning.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -460,7 +460,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speechaltwarning.ZOrder" xml:space="preserve">
-    <value>55</value>
+    <value>56</value>
   </data>
   <data name="label108.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -490,7 +490,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label108.ZOrder" xml:space="preserve">
-    <value>56</value>
+    <value>57</value>
   </data>
   <data name="CHK_resetapmonconnect.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -517,7 +517,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_resetapmonconnect.ZOrder" xml:space="preserve">
-    <value>57</value>
+    <value>58</value>
   </data>
   <data name="CHK_mavdebug.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -547,7 +547,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_mavdebug.ZOrder" xml:space="preserve">
-    <value>58</value>
+    <value>59</value>
   </data>
   <data name="label107.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -574,7 +574,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label107.ZOrder" xml:space="preserve">
-    <value>59</value>
+    <value>60</value>
   </data>
   <data name="CMB_raterc.Items" xml:space="preserve">
     <value>-1</value>
@@ -640,7 +640,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_raterc.ZOrder" xml:space="preserve">
-    <value>60</value>
+    <value>61</value>
   </data>
   <data name="label104.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -667,7 +667,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label104.ZOrder" xml:space="preserve">
-    <value>61</value>
+    <value>62</value>
   </data>
   <data name="label103.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -694,7 +694,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label103.ZOrder" xml:space="preserve">
-    <value>62</value>
+    <value>63</value>
   </data>
   <data name="label102.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -721,7 +721,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label102.ZOrder" xml:space="preserve">
-    <value>63</value>
+    <value>64</value>
   </data>
   <data name="label101.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -751,7 +751,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label101.ZOrder" xml:space="preserve">
-    <value>64</value>
+    <value>65</value>
   </data>
   <data name="CMB_ratestatus.Items" xml:space="preserve">
     <value>-1</value>
@@ -817,7 +817,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_ratestatus.ZOrder" xml:space="preserve">
-    <value>65</value>
+    <value>66</value>
   </data>
   <data name="CMB_rateposition.Items" xml:space="preserve">
     <value>-1</value>
@@ -883,7 +883,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_rateposition.ZOrder" xml:space="preserve">
-    <value>66</value>
+    <value>67</value>
   </data>
   <data name="CMB_rateattitude.Items" xml:space="preserve">
     <value>-1</value>
@@ -946,7 +946,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_rateattitude.ZOrder" xml:space="preserve">
-    <value>67</value>
+    <value>68</value>
   </data>
   <data name="label99.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -974,7 +974,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label99.ZOrder" xml:space="preserve">
-    <value>68</value>
+    <value>69</value>
   </data>
   <data name="label98.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1004,7 +1004,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label98.ZOrder" xml:space="preserve">
-    <value>69</value>
+    <value>70</value>
   </data>
   <data name="label97.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1034,7 +1034,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label97.ZOrder" xml:space="preserve">
-    <value>70</value>
+    <value>71</value>
   </data>
   <data name="CMB_speedunits.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 222</value>
@@ -1055,7 +1055,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_speedunits.ZOrder" xml:space="preserve">
-    <value>71</value>
+    <value>72</value>
   </data>
   <data name="CMB_distunits.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 195</value>
@@ -1076,7 +1076,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_distunits.ZOrder" xml:space="preserve">
-    <value>72</value>
+    <value>73</value>
   </data>
   <data name="label96.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1106,7 +1106,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label96.ZOrder" xml:space="preserve">
-    <value>73</value>
+    <value>74</value>
   </data>
   <data name="label95.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1136,7 +1136,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label95.ZOrder" xml:space="preserve">
-    <value>74</value>
+    <value>75</value>
   </data>
   <data name="CHK_speechbattery.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1169,7 +1169,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speechbattery.ZOrder" xml:space="preserve">
-    <value>75</value>
+    <value>76</value>
   </data>
   <data name="CHK_speechcustom.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1202,7 +1202,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speechcustom.ZOrder" xml:space="preserve">
-    <value>76</value>
+    <value>77</value>
   </data>
   <data name="CHK_speechmode.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1235,7 +1235,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speechmode.ZOrder" xml:space="preserve">
-    <value>77</value>
+    <value>78</value>
   </data>
   <data name="CHK_speechwaypoint.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1268,7 +1268,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speechwaypoint.ZOrder" xml:space="preserve">
-    <value>78</value>
+    <value>79</value>
   </data>
   <data name="label94.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1298,7 +1298,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label94.ZOrder" xml:space="preserve">
-    <value>79</value>
+    <value>80</value>
   </data>
   <data name="CMB_osdcolor.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 62</value>
@@ -1319,7 +1319,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_osdcolor.ZOrder" xml:space="preserve">
-    <value>80</value>
+    <value>81</value>
   </data>
   <data name="CMB_severity.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 111</value>
@@ -1340,7 +1340,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_severity.ZOrder" xml:space="preserve">
-    <value>81</value>
+    <value>82</value>
   </data>
   <data name="CMB_language.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 139</value>
@@ -1361,7 +1361,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_language.ZOrder" xml:space="preserve">
-    <value>82</value>
+    <value>83</value>
   </data>
   <data name="label93.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1391,7 +1391,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label93.ZOrder" xml:space="preserve">
-    <value>83</value>
+    <value>84</value>
   </data>
   <data name="CHK_enablespeech.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1421,7 +1421,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_enablespeech.ZOrder" xml:space="preserve">
-    <value>84</value>
+    <value>85</value>
   </data>
   <data name="CHK_hudshow.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1448,7 +1448,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_hudshow.ZOrder" xml:space="preserve">
-    <value>85</value>
+    <value>86</value>
   </data>
   <data name="label92.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1478,7 +1478,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label92.ZOrder" xml:space="preserve">
-    <value>86</value>
+    <value>87</value>
   </data>
   <data name="CMB_videosources.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 8</value>
@@ -1499,7 +1499,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_videosources.ZOrder" xml:space="preserve">
-    <value>87</value>
+    <value>88</value>
   </data>
   <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1529,7 +1529,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>41</value>
+    <value>42</value>
   </data>
   <data name="CHK_maprotation.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1556,7 +1556,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_maprotation.ZOrder" xml:space="preserve">
-    <value>42</value>
+    <value>43</value>
   </data>
   <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1583,7 +1583,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>39</value>
+    <value>40</value>
   </data>
   <data name="CHK_disttohomeflightdata.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1610,7 +1610,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_disttohomeflightdata.ZOrder" xml:space="preserve">
-    <value>40</value>
+    <value>41</value>
   </data>
   <data name="BUT_Joystick.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1637,7 +1637,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;BUT_Joystick.ZOrder" xml:space="preserve">
-    <value>88</value>
+    <value>89</value>
   </data>
   <data name="BUT_videostop.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1664,7 +1664,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;BUT_videostop.ZOrder" xml:space="preserve">
-    <value>89</value>
+    <value>90</value>
   </data>
   <data name="BUT_videostart.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1691,7 +1691,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;BUT_videostart.ZOrder" xml:space="preserve">
-    <value>90</value>
+    <value>91</value>
   </data>
   <data name="label3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1721,7 +1721,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>38</value>
+    <value>39</value>
   </data>
   <data name="txt_log_dir.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 395</value>
@@ -1742,7 +1742,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;txt_log_dir.ZOrder" xml:space="preserve">
-    <value>37</value>
+    <value>38</value>
   </data>
   <data name="BUT_logdirbrowse.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1769,7 +1769,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;BUT_logdirbrowse.ZOrder" xml:space="preserve">
-    <value>36</value>
+    <value>37</value>
   </data>
   <data name="label4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1799,7 +1799,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>35</value>
+    <value>36</value>
   </data>
   <data name="CMB_theme.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 421</value>
@@ -1820,7 +1820,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_theme.ZOrder" xml:space="preserve">
-    <value>34</value>
+    <value>35</value>
   </data>
   <data name="BUT_themecustom.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1847,7 +1847,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;BUT_themecustom.ZOrder" xml:space="preserve">
-    <value>33</value>
+    <value>34</value>
   </data>
   <data name="CHK_speecharmdisarm.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1880,7 +1880,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speecharmdisarm.ZOrder" xml:space="preserve">
-    <value>32</value>
+    <value>33</value>
   </data>
   <data name="BUT_Vario.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -1907,7 +1907,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;BUT_Vario.ZOrder" xml:space="preserve">
-    <value>31</value>
+    <value>32</value>
   </data>
   <data name="chk_analytics.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1937,7 +1937,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_analytics.ZOrder" xml:space="preserve">
-    <value>30</value>
+    <value>31</value>
   </data>
   <data name="CHK_beta.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1967,7 +1967,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_beta.ZOrder" xml:space="preserve">
-    <value>29</value>
+    <value>30</value>
   </data>
   <data name="CHK_Password.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1997,7 +1997,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_Password.ZOrder" xml:space="preserve">
-    <value>28</value>
+    <value>29</value>
   </data>
   <data name="CHK_speechlowspeed.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2030,7 +2030,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speechlowspeed.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>22</value>
   </data>
   <data name="CHK_showairports.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2060,7 +2060,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_showairports.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>21</value>
   </data>
   <data name="chk_ADSB.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2090,7 +2090,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_ADSB.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>20</value>
   </data>
   <data name="chk_tfr.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2120,7 +2120,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_tfr.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>19</value>
   </data>
   <data name="chk_temp.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -2150,7 +2150,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_temp.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>18</value>
   </data>
   <data name="chk_norcreceiver.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2180,7 +2180,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_norcreceiver.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>17</value>
   </data>
   <data name="CMB_Layout.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 448</value>
@@ -2201,7 +2201,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_Layout.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>16</value>
   </data>
   <data name="label5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2231,7 +2231,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>15</value>
   </data>
   <data name="CHK_AutoParamCommit.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2258,7 +2258,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_AutoParamCommit.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>14</value>
   </data>
   <data name="chk_shownofly.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2288,7 +2288,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_shownofly.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>13</value>
   </data>
   <data name="label6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2318,7 +2318,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
   </data>
   <data name="CMB_altunits.Location" type="System.Drawing.Point, System.Drawing">
     <value>320, 195</value>
@@ -2339,7 +2339,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_altunits.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>12</value>
   </data>
   <data name="num_gcsid.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 475</value>
@@ -2360,7 +2360,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;num_gcsid.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="label7.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2390,7 +2390,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>9</value>
   </data>
   <data name="CHK_params_bg.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2420,7 +2420,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_params_bg.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
   </data>
   <data name="chk_slowMachine.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2450,7 +2450,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_slowMachine.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="CHK_speechArmedOnly.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2483,7 +2483,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_speechArmedOnly.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="label8.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -2510,7 +2510,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="label9.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2540,7 +2540,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label9.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="cmb_secondarydisplaystyle.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 524</value>
@@ -2561,7 +2561,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cmb_secondarydisplaystyle.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="chk_displaycog.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2591,7 +2591,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_displaycog.ZOrder" xml:space="preserve">
-    <value>27</value>
+    <value>28</value>
   </data>
   <data name="label10.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2621,7 +2621,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="chk_displayheading.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2651,7 +2651,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_displayheading.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>26</value>
   </data>
   <data name="chk_displaynavbearing.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2681,7 +2681,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_displaynavbearing.ZOrder" xml:space="preserve">
-    <value>24</value>
+    <value>25</value>
   </data>
   <data name="chk_displayradius.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2711,7 +2711,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_displayradius.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>24</value>
   </data>
   <data name="chk_displaytarget.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2741,7 +2741,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_displaytarget.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>23</value>
   </data>
   <data name="num_linelength.Location" type="System.Drawing.Point, System.Drawing">
     <value>768, 500</value>
@@ -2762,7 +2762,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;num_linelength.ZOrder" xml:space="preserve">
-    <value>53</value>
+    <value>54</value>
   </data>
   <data name="label11.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2792,7 +2792,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label11.ZOrder" xml:space="preserve">
-    <value>47</value>
+    <value>48</value>
   </data>
   <data name="chk_displaytooltip.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2822,7 +2822,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chk_displaytooltip.ZOrder" xml:space="preserve">
-    <value>26</value>
+    <value>27</value>
   </data>
   <data name="CMB_mapCache.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, 653</value>
@@ -2843,7 +2843,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CMB_mapCache.ZOrder" xml:space="preserve">
-    <value>92</value>
+    <value>93</value>
   </data>
   <data name="label13.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -2873,7 +2873,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
-    <value>91</value>
+    <value>92</value>
   </data>
   <data name="BUT_mapCacheDir.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -2900,7 +2900,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;BUT_mapCacheDir.ZOrder" xml:space="preserve">
-    <value>93</value>
+    <value>94</value>
   </data>
   <data name="CHK_rtsresetesp32.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -2927,6 +2927,36 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;CHK_rtsresetesp32.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="CHK_joystickautoenable.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="CHK_joystickautoenable.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="CHK_joystickautoenable.Location" type="System.Drawing.Point, System.Drawing">
+    <value>212, 170</value>
+  </data>
+  <data name="CHK_joystickautoenable.Size" type="System.Drawing.Size, System.Drawing">
+    <value>130, 17</value>
+  </data>
+  <data name="CHK_joystickautoenable.TabIndex" type="System.Int32, mscorlib">
+    <value>132</value>
+  </data>
+  <data name="CHK_joystickautoenable.Text" xml:space="preserve">
+    <value>Auto Enable Joysticks</value>
+  </data>
+  <data name="&gt;&gt;CHK_joystickautoenable.Name" xml:space="preserve">
+    <value>CHK_joystickautoenable</value>
+  </data>
+  <data name="&gt;&gt;CHK_joystickautoenable.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;CHK_joystickautoenable.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;CHK_joystickautoenable.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
diff --git a/Joystick/JoystickSetup.cs b/Joystick/JoystickSetup.cs
index 4baff5bf98..971987669b 100644
--- a/Joystick/JoystickSetup.cs
+++ b/Joystick/JoystickSetup.cs
@@ -8,7 +8,7 @@
 
 
 namespace MissionPlanner.Joystick
-{
+{
     public partial class JoystickSetup : MyUserControl, IDeactivate
     {
         bool startup = true;
@@ -94,17 +94,17 @@ private void Joystick_Load(object sender, EventArgs e)
                 {
                     return (short)MainV2.comPort.MAV.cs.GetType().GetField("rcoverridech" + ax.ChannelNo)
                         .GetValue(MainV2.comPort.MAV.cs);
-                };
-                ax.Expo = () =>
-                {
-                    if (int.TryParse(ax.ExpoValue, out int expoValue))
-                    {
-                        MainV2.joystick?.setExpo(ax.ChannelNo, expoValue);
-                    }
-                };
-
-                Controls.Add(ax);
-
+                };
+                ax.Expo = () =>
+                {
+                    if (int.TryParse(ax.ExpoValue, out int expoValue))
+                    {
+                        MainV2.joystick?.setExpo(ax.ChannelNo, expoValue);
+                    }
+                };
+
+                Controls.Add(ax);
+
                 y += ax.Height;
 
 
@@ -115,6 +115,8 @@ private void Joystick_Load(object sender, EventArgs e)
                     this.Width = ax.Right;
             }
 
+            BUT_enable.Enabled = !Settings.Instance.GetBoolean("CHK_Joystick_AutoEnable");
+
             this.ResumeLayout();
 
             if (MainV2.joystick != null && MainV2.joystick.enabled)
@@ -178,8 +180,6 @@ private void BUT_enable_Click(object sender, EventArgs e)
 
                 MainV2.joystick.clearRCOverride();
 
-                MainV2.joystick = null;
-
 
                 //timer1.Stop();
 
@@ -299,8 +299,8 @@ private void timer1_Tick(object sender, EventArgs e)
 
                     var items = this.Controls.Find("hbar" + name, false);
 
-                    if (items.Length > 0)
-                        ((HorizontalProgressBar)items[0]).Value =
+                    if (items.Length > 0)
+                        ((HorizontalProgressBar)items[0]).Value =
                             MainV2.joystick.isButtonPressed(f) ? 100 : 0;
                 }
             }
@@ -372,20 +372,20 @@ void doButtontoUI(string name, int x, int y)
             butnumberlist.Location = new Point(butlabel.Right, y);
             butnumberlist.Size = new Size(70, 21);
             //butnumberlist.DataSource = getButtonNumbers();
-
-            butnumberlist.Items.AddRange(getButtonNumbers().Select(item => item.ToString()).ToArray());
-            butnumberlist.SelectedIndex = 0;
-
-
+
+            butnumberlist.Items.AddRange(getButtonNumbers().Select(item => item.ToString()).ToArray());
+            butnumberlist.SelectedIndex = 0;
+
+
             butnumberlist.DropDownStyle = ComboBoxStyle.DropDownList;
-            butnumberlist.Name = "cmbbutton" + name;
-
-            //butnumberlist.SelectedItem = "-1";
+            butnumberlist.Name = "cmbbutton" + name;
+
+            //butnumberlist.SelectedItem = "-1";
             butnumberlist.SelectedItem = config.buttonno.ToString();
 
-            //if (Settings.Instance["butno" + name] != null)
+            //if (Settings.Instance["butno" + name] != null)
             //    butnumberlist.Text = (Settings.Instance["butno" + name].ToString());
-            //if (config.buttonno != -1)
+            //if (config.buttonno != -1)
 
             //butnumberlist.Text = config.buttonno.ToString();
 
@@ -406,13 +406,13 @@ void doButtontoUI(string name, int x, int y)
             cmbaction.Location = new Point(hbar.Right + 5, y);
             cmbaction.Size = new Size(100, 21);
 
-            //cmbaction.DataSource = Enum.GetNames(typeof(buttonfunction));
-            cmbaction.Items.AddRange(Enum.GetNames(typeof(buttonfunction)));
-
-
-            //Common.getModesList(MainV2.comPort.MAV.cs);
-            //cmbaction.ValueMember = "Key";
-            //cmbaction.DisplayMember = "Value";
+            //cmbaction.DataSource = Enum.GetNames(typeof(buttonfunction));
+            cmbaction.Items.AddRange(Enum.GetNames(typeof(buttonfunction)));
+
+
+            //Common.getModesList(MainV2.comPort.MAV.cs);
+            //cmbaction.ValueMember = "Key";
+            //cmbaction.DisplayMember = "Value";
             cmbaction.Tag = name;
             cmbaction.DropDownStyle = ComboBoxStyle.DropDownList;
             cmbaction.Name = "cmbaction" + name;
@@ -520,17 +520,17 @@ private void CHK_elevons_CheckedChanged(object sender, EventArgs e)
         private void chk_manualcontrol_CheckedChanged(object sender, EventArgs e)
         {
             MainV2.joystick.manual_control = chk_manualcontrol.Checked;
-        }
-
-        public void Deactivate()
-        {
+        }
+
+        public void Deactivate()
+        {
             timer1.Stop();
 
             if (MainV2.joystick != null && MainV2.joystick.enabled == false)
             {
                 MainV2.joystick.UnAcquireJoyStick();
                 MainV2.joystick = null;
-            }
-        }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/MainV2.cs b/MainV2.cs
index c940ab445d..959fb65f09 100644
--- a/MainV2.cs
+++ b/MainV2.cs
@@ -2236,6 +2236,7 @@ private async void joysticksend()
             int count = 0;
 
             DateTime lastratechange = DateTime.Now;
+            DateTime start = DateTime.Now;
 
             joystickthreadrun = true;
 
@@ -2255,6 +2256,35 @@ private async void joysticksend()
                     {
                         //joystick stuff
 
+                        bool autoEnable = Settings.Instance.GetBoolean("CHK_Joystick_AutoEnable");
+
+                        if (autoEnable && (DateTime.Now - start).TotalSeconds > 0.5 )
+                        {
+                            string name = Settings.Instance["joystick_name"];
+                            if (joystick == null && name != null)
+                            {
+                                // all config is loaded from the xmls
+                                Joystick.JoystickBase joy = JoystickBase.Create(() => MainV2.comPort);
+
+                                if (!joy.start(name))
+                                {
+                                    joy.Dispose();
+                                } else
+                                {
+                                    joystick = joy;
+                                }
+                                if (Settings.Instance.ContainsKey("joy_elevons"))
+                                {
+                                    joystick.elevons = bool.Parse(Settings.Instance["joy_elevons"].ToString());
+                                }
+                            }
+                        }
+
+                        if (joystick != null && !joystick.enabled && autoEnable)
+                        {
+                            joystick.enabled = true;
+                        }
+
                         if (joystick != null && joystick.enabled)
                         {
                             if (!joystick.manual_control)

From e48f5170399e47dde3cf72829aed4ace4ca0a4e4 Mon Sep 17 00:00:00 2001
From: Angelo Brajuka <35403243+angebrajuka@users.noreply.github.com>
Date: Mon, 30 Mar 2026 12:41:55 -0400
Subject: [PATCH 2/2] dont check joystick elevons when joystick is null

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 MainV2.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/MainV2.cs b/MainV2.cs
index 959fb65f09..1c9ba04ffb 100644
--- a/MainV2.cs
+++ b/MainV2.cs
@@ -2269,13 +2269,15 @@ private async void joysticksend()
                                 if (!joy.start(name))
                                 {
                                     joy.Dispose();
-                                } else
+                                } 
+                                else
                                 {
                                     joystick = joy;
-                                }
-                                if (Settings.Instance.ContainsKey("joy_elevons"))
-                                {
-                                    joystick.elevons = bool.Parse(Settings.Instance["joy_elevons"].ToString());
+
+                                    if (Settings.Instance.ContainsKey("joy_elevons"))
+                                    {
+                                        joystick.elevons = bool.Parse(Settings.Instance["joy_elevons"].ToString());
+                                    }
                                 }
                             }
                         }