Added support for external emulator on PPC/Eureka over TCP.

1 files changed, 16 insertions, 7 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
index 93fde75a5..9e15abbe0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -265,16 +265,25 @@ namespace Tango.PPC.Common.Connection
                         {
                             LogManager.Log("Application in demo mode!");
 
-                            var emulator_channel_name = "emulator-" + Guid.NewGuid().ToString();
+                            if (settings.EmulatorMode == EmulatorMode.InMemory)
+                            {
+                                var emulator_channel_name = "emulator-" + Guid.NewGuid().ToString();
+                                LogManager.Log("Starting embedded emulator...");
+                                MachineEmulator emulator = new MachineEmulator(new BasicTransporter(new MemoryTransportAdapter(emulator_channel_name)));
+                                await emulator.Start();
 
-                            LogManager.Log("Starting embedded emulator...");
-                            MachineEmulator emulator = new MachineEmulator(new BasicTransporter(new MemoryTransportAdapter(emulator_channel_name)));
-                            await emulator.Start();
+                                LogManager.Log("Emulator started. Connecting to emulator...");
 
-                            LogManager.Log("Emulator started. Connecting to emulator...");
+                                MemoryTransportAdapter adapter = new MemoryTransportAdapter(emulator_channel_name);
+                                MachineOperator.Adapter = adapter;
+                            }
+                            else
+                            {
+                                LogManager.Log("Connecting to external emulator over TCP...");
+                                TcpTransportAdapter adapter = new TcpTransportAdapter("127.0.0.1", 30000);
+                                MachineOperator.Adapter = adapter;
+                            }
 
-                            MemoryTransportAdapter adapter = new MemoryTransportAdapter(emulator_channel_name);
-                            MachineOperator.Adapter = adapter;
                             MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
                             LogManager.Log("Connecting machine operator...");
                             await MachineOperator.Connect();