Skip to content

Commit

Permalink
Merge branch 'develop' into feature/local-connection
Browse files Browse the repository at this point in the history
# Conflicts:
#	Source/v2/Meadow.Cli/MeadowConnectionManager.cs
#	Source/v2/Meadow.Hcom/Connections/SerialConnection.cs
  • Loading branch information
ctacke committed Dec 5, 2023
2 parents b737570 + e59f7e1 commit 1be3659
Show file tree
Hide file tree
Showing 2 changed files with 1,278 additions and 1,277 deletions.
9 changes: 4 additions & 5 deletions Source/v2/Meadow.Cli/MeadowConnectionManager.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
using Meadow.Hcom;
using Meadow.CLI;
using Meadow.Hcom;
using Meadow.LibUsb;
using System.Diagnostics;
using System.IO.Ports;
using System.Linq;
using System.Management;
using System.Net;
using System.Runtime.InteropServices;
Expand Down Expand Up @@ -38,10 +41,6 @@ public MeadowConnectionManager(ISettingsManager settingsManager)
{
_currentConnection = new LocalConnection();
}
else if (route == "simulator")
{
_currentConnection = new SimulatorConnection();
}
else
{
string? uri = null;
Expand Down
Loading

0 comments on commit 1be3659

Please sign in to comment.