Merge pull request #589 from WildernessLabs/aggressive_reconnect

Aggressively poll for serial port connections when attaching
WildernessLabs · Aug 8, 2024 · f743031 · f743031
2 parents 20cbb9c + d4a46b4
commit f743031
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/Source/v2/Meadow.Cli/Meadow.CLI.csproj b/Source/v2/Meadow.Cli/Meadow.CLI.csproj
@@ -10,7 +10,7 @@
     <Authors>Wilderness Labs, Inc</Authors>
     <Company>Wilderness Labs, Inc</Company>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageVersion>2.0.55.0</PackageVersion>
+    <PackageVersion>2.0.56.0</PackageVersion>
     <Platforms>AnyCPU</Platforms>
     <PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.CLI/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/WildernessLabs/Meadow.CLI</RepositoryUrl>

diff --git a/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs b/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs
@@ -6,5 +6,5 @@ namespace Meadow.CLI;
 
 public static class Constants
 {
-    public const string CLI_VERSION = "2.0.55.0";
+    public const string CLI_VERSION = "2.0.56.0";
 }
diff --git a/Source/v2/Meadow.Hcom/Connections/SerialConnection.ListenerProc.cs b/Source/v2/Meadow.Hcom/Connections/SerialConnection.ListenerProc.cs
@@ -8,7 +8,7 @@ public partial class SerialConnection
 
         public override async Task WaitForMeadowAttach(CancellationToken? cancellationToken)
         {
-            var timeout = 20;
+            var timeout = 500;
 
             while (timeout-- > 0)
             {
@@ -26,7 +26,7 @@ public override async Task WaitForMeadowAttach(CancellationToken? cancellationTo
                     return;
                 }
 
-                await Task.Delay(500);
+                await Task.Delay(20);
 
                 if (!_port.IsOpen)
                 {

diff --git a/Source/v2/Meadow.Hcom/Connections/SerialConnection.cs b/Source/v2/Meadow.Hcom/Connections/SerialConnection.cs
@@ -202,7 +202,7 @@ public override void Detach()
             _port.DiscardInBuffer();
 
             // wait for a response
-            var timeout = timeoutSeconds * 2;
+            var timeout = timeoutSeconds * 50;
             var dataReceived = false;
 
             // local function so we can unsubscribe
@@ -222,7 +222,7 @@ public override void Detach()
                     break;
                 }
 
-                await Task.Delay(500);
+                await Task.Delay(20);
             }
 
             // if HCOM fails, check for DFU/bootloader mode?  only if we're doing an OS thing, so maybe no
@@ -1259,8 +1259,6 @@ public override async Task<DebuggingServer> StartDebuggingSession(int port, ILog
         logger?.LogDebug($"Start Debugging on port: {port}");
         await Device.StartDebugging(port, logger, cancellationToken);
 
-        await WaitForMeadowAttach(cancellationToken);
-
         return debuggingServer;
     }