fix WaitForAttach when we have ever been attached (i.e. DFU -> boot)

WildernessLabs · Sep 28, 2023 · 1d10487 · 1d10487
1 parent cf59b9a
commit 1d10487
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/Source/v2/Meadow.Cli/Properties/launchSettings.json b/Source/v2/Meadow.Cli/Properties/launchSettings.json
@@ -113,7 +113,7 @@
     },
     "Firmware Write all": {
       "commandName": "Project",
-      "commandLineArgs": "firmware write runtime esp"
+      "commandLineArgs": "firmware write"
     },
     "Firmware Write version": {
       "commandName": "Project",

diff --git a/Source/v2/Meadow.Hcom/Connections/SerialConnection.ListenerProc.cs b/Source/v2/Meadow.Hcom/Connections/SerialConnection.ListenerProc.cs
@@ -18,9 +18,30 @@ public override async Task WaitForMeadowAttach(CancellationToken? cancellationTo
                 if (cancellationToken?.IsCancellationRequested ?? false) throw new TaskCanceledException();
                 if (timeout <= 0) throw new TimeoutException();
 
-                if (State == ConnectionState.MeadowAttached) return;
+                if (State == ConnectionState.MeadowAttached)
+                {
+                    if (Device == null)
+                    {
+                        // no device set - this happens when we are waiting for attach from DFU mode
+                        await Attach(cancellationToken, 5);
+                    }
+
+                    return;
+                }
 
                 await Task.Delay(500);
+
+                if (!_port.IsOpen)
+                {
+                    try
+                    {
+                        Open();
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.WriteLine($"Unable to open port: {ex.Message}");
+                    }
+                }
             }
 
             throw new TimeoutException();
@@ -64,7 +85,7 @@ private async Task ListenerProc()
 
                                 try
                                 {
-                                    _port.Open();
+                                    Open();
                                     Debug.WriteLine($"Port re-opened");
                                 }
                                 catch