Fix ESP32-C3 Dronebridge Reset on First connect

ArduPilot · Jan 9, 2025 · c730084 · c730084
1 parent a4eca31
commit c730084
Show file tree

Hide file tree

Showing 5 changed files with 1,910 additions and 1,843 deletions.
diff --git a/ExtLibs/Comms/CommsSerialPort.cs b/ExtLibs/Comms/CommsSerialPort.cs
@@ -145,6 +145,10 @@ public void DiscardInBuffer()
 
         public void Open()
         {
+            if (espFix && _baseport is WinSerialPort)
+            {
+                ((WinSerialPort)_baseport).espFix = true;
+            }
             _baseport.Open();
         }
 
@@ -194,6 +198,8 @@ public void toggleDTR()
         }
 
 
+        public bool espFix = false;
+
         private static readonly object locker = new object();
 
         private static readonly Dictionary<string, string> comportnamecache = new Dictionary<string, string>();
@@ -407,6 +413,7 @@ public class WinSerialPort : System.IO.Ports.SerialPort, ICommsSerial
     {
         private static readonly ILog log = LogManager.GetLogger(typeof(WinSerialPort));
 
+        public bool espFix = false;
         public WinSerialPort()
         {
         }
@@ -471,6 +478,7 @@ protected override void Dispose(bool disposing)
             // 500ms write timeout - win32 api default
             base.WriteTimeout = 500;
 
+
             if (base.IsOpen)
                 return;
 
@@ -491,7 +499,11 @@ protected override void Dispose(bool disposing)
 
             if (PortName.StartsWith("/"))
                 if (!File.Exists(PortName))
-                    throw new Exception("No such device");
+                    throw new Exception("No such device");
+
+
+            if (espFix)
+                base.Handshake = System.IO.Ports.Handshake.RequestToSend;
 
             try
             {
@@ -509,6 +521,8 @@ protected override void Dispose(bool disposing)
 
                 throw;
             }
+            if (espFix)
+                base.Handshake = System.IO.Ports.Handshake.None;
         }
 
         public new void Close()

diff --git a/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs b/GCSViews/ConfigurationView/ConfigPlanner.Designer.cs
diff --git a/GCSViews/ConfigurationView/ConfigPlanner.cs b/GCSViews/ConfigurationView/ConfigPlanner.cs
@@ -173,6 +173,7 @@ public void Activate()
 
             // setup other config state
             SetCheckboxFromConfig("CHK_resetapmonconnect", CHK_resetapmonconnect);
+            SetCheckboxFromConfig("CHK_rtsresetesp32", CHK_rtsresetesp32);
 
             CMB_rateattitude.Text = MainV2.comPort.MAV.cs.rateattitude.ToString();
             CMB_rateposition.Text = MainV2.comPort.MAV.cs.rateposition.ToString();
@@ -620,7 +621,7 @@ private void CMB_raterc_SelectedIndexChanged(object sender, EventArgs e)
             CurrentState.ratercbackup = MainV2.comPort.MAV.cs.raterc;
 
             MainV2.comPort.requestDatastream(MAVLink.MAV_DATA_STREAM.RC_CHANNELS, MainV2.comPort.MAV.cs.raterc);
-            // request rc info 
+            // request rc info
         }
 
         private void CMB_ratesensors_SelectedIndexChanged(object sender, EventArgs e)
@@ -648,6 +649,14 @@ private void CHK_resetapmonconnect_CheckedChanged(object sender, EventArgs e)
             Settings.Instance[((CheckBox)sender).Name] = ((CheckBox)sender).Checked.ToString();
         }
 
+        private void CHK_rtsresetesp32_CheckedChanged(object sender, EventArgs e)
+        {
+            Settings.Instance[((CheckBox)sender).Name] = ((CheckBox)sender).Checked.ToString();
+        }
+
+
+
+
         private void CHK_speechaltwarning_CheckedChanged(object sender, EventArgs e)
         {
             if (startup)
@@ -1121,7 +1130,7 @@ private void chk_displaytooltip_CheckedChanged(object sender, EventArgs e)
             {
                 Settings.Instance["mapicondesc"] = "";
             }
-            
+
         }
 
         private void num_linelength_ValueChanged(object sender, EventArgs e)