Merged Eureka Branch !!!

1 files changed, 7 insertions, 2 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
index c7c8335f0..511733984 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -21,6 +21,8 @@ namespace Tango.MachineStudio.UI.ViewModels
     /// <seealso cref="Tango.MachineStudio.Common.Notifications.DialogViewVM" />
     public class MachineConnectionViewVM : DialogViewVM
     {
+        private ExternalBridgeTcpFirmwareClient _firmwareTcpClient;
+
         private static ExternalBridgeScanner _scanner;
         public ExternalBridgeScanner Scanner
         {
@@ -107,7 +109,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// <summary>
         /// Called when the dialog has been shown.
         /// </summary>
-        public override void OnShow()
+        public async override void OnShow()
         {
             base.OnShow();
 
@@ -123,9 +125,12 @@ namespace Tango.MachineStudio.UI.ViewModels
                         _emulator.Disconnect();
                     }
                     _emulator = new EmulatorExternalBridge();
+                    _scanner.AvailableMachines.Add(_emulator);
                 }
 
-                _scanner.AvailableMachines.Add(_emulator);
+                _firmwareTcpClient = new ExternalBridgeTcpFirmwareClient();
+                _scanner.AvailableMachines.Add(_firmwareTcpClient);
+
                 _scanner.Start();
             }
             catch (Exception ex)