minor change for simulator.

Venus/Venus_Simulator/Devices/AdTecGeneratorMockPMA.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading;
+using System.Threading.Tasks;
 using MECF.Framework.Simulator.Core.Driver;
 
 namespace Venus_Simulator.Devices
@@ -25,7 +26,7 @@ namespace Venus_Simulator.Devices
             _simGeneratorStatus = GeneratorStatus.Unknown;
         }
 
-        protected override void ProcessUnsplitMessage(string message)
+        protected override  void ProcessUnsplitMessage(string message)
         {
             if (string.IsNullOrEmpty(message))
                 throw new ArgumentException("Hardware command message is invalid");
@@ -64,9 +65,7 @@ namespace Venus_Simulator.Devices
                         break;
                 }
 
-                //string[] strs = message.Split(MSG_DELIMITER);
-
-                //Thread.Sleep(2 * 1000);
+                Thread.Sleep(200);
 
                 sRes += "\r";
                 OnWriteMessage(sRes);

Venus/Venus_Simulator/Devices/AdTecGeneratorMockPMB.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading;
+using System.Threading.Tasks;
 using MECF.Framework.Simulator.Core.Driver;
 
 namespace Venus_Simulator.Devices
@@ -24,7 +25,7 @@ namespace Venus_Simulator.Devices
             _simGeneratorStatus = GeneratorStatus.Unknown;
         }
 
-        protected override void ProcessUnsplitMessage(string message)
+        protected override  void ProcessUnsplitMessage(string message)
         {
             if (string.IsNullOrEmpty(message))
                 throw new ArgumentException("Hardware command message is invalid");
@@ -36,34 +37,36 @@ namespace Venus_Simulator.Devices
                 message = message.Remove(message.Length - 1);
             }
 
-            switch (message)
+            string[] msgs = message.Split('\r');
+            foreach (string msg in msgs)
             {
-                case "Q":
-                    if (_simGeneratorStatus == GeneratorStatus.ON)
-                    {
-                        sRes = "2010000 12345 00900 00100 45678\r";
-                    }
-                    else if (_simGeneratorStatus == GeneratorStatus.OFF)
-                    {
-                        sRes = "2000000 12345 00000 00000 45678\r";
-                    }
-                    break;
-                case "G":
-                    _simGeneratorStatus = GeneratorStatus.ON;
-                    sRes = "\r";
-                    break;
-                case "S":
-                    _simGeneratorStatus = GeneratorStatus.OFF;
-                    sRes = "\r";
-                    break;
-                default:
-                    break;
-            }
-
 
-            //string[] strs = message.Split(MSG_DELIMITER);
+                switch(msg)
+                {
+                    case "Q":
+                        if (_simGeneratorStatus == GeneratorStatus.ON)
+                        {
+                            sRes = "2010000 12345 00900 00100 45678\r";
+                        }
+                        else if (_simGeneratorStatus == GeneratorStatus.OFF)
+                        {
+                            sRes = "2000000 12345 00000 00000 45678\r";
+                        }
+                        break;
+                    case "G":
+                        _simGeneratorStatus = GeneratorStatus.ON;
+                        sRes = "\r";
+                        break;
+                    case "S":
+                        _simGeneratorStatus = GeneratorStatus.OFF;
+                        sRes = "\r";
+                        break;
+                    default:
+                        break;
+                }
+            }
 
-            //Thread.Sleep(2 * 1000);
+            Thread.Sleep(200);
 
             sRes += "\r";
             OnWriteMessage(sRes);

Venus/Venus_Simulator/Devices/AdTecGeneratorMockPMC.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading;
+using System.Threading.Tasks;
 using MECF.Framework.Simulator.Core.Driver;
 
 namespace Venus_Simulator.Devices
@@ -24,7 +25,7 @@ namespace Venus_Simulator.Devices
             _simGeneratorStatus = GeneratorStatus.Unknown;
         }
 
-        protected override void ProcessUnsplitMessage(string message)
+        protected override  void ProcessUnsplitMessage(string message)
         {
             if (string.IsNullOrEmpty(message))
                 throw new ArgumentException("Hardware command message is invalid");
@@ -36,34 +37,36 @@ namespace Venus_Simulator.Devices
                 message = message.Remove(message.Length - 1);
             }
 
-            switch (message)
+            string[] msgs = message.Split('\r');
+            foreach (string msg in msgs)
             {
-                case "Q":
-                    if (_simGeneratorStatus == GeneratorStatus.ON)
-                    {
-                        sRes = "2010000 12345 00900 00100 45678\r";
-                    }
-                    else if (_simGeneratorStatus == GeneratorStatus.OFF)
-                    {
-                        sRes = "2000000 12345 00000 00000 45678\r";
-                    }
-                    break;
-                case "G":
-                    _simGeneratorStatus = GeneratorStatus.ON;
-                    sRes = "\r";
-                    break;
-                case "S":
-                    _simGeneratorStatus = GeneratorStatus.OFF;
-                    sRes = "\r";
-                    break;
-                default:
-                    break;
+                switch (msg)
+                {
+                    case "Q":
+                        if (_simGeneratorStatus == GeneratorStatus.ON)
+                        {
+                            sRes = "2010000 12345 00900 00100 45678\r";
+                        }
+                        else if (_simGeneratorStatus == GeneratorStatus.OFF)
+                        {
+                            sRes = "2000000 12345 00000 00000 45678\r";
+                        }
+                        break;
+                    case "G":
+                        _simGeneratorStatus = GeneratorStatus.ON;
+                        sRes = "\r";
+                        break;
+                    case "S":
+                        _simGeneratorStatus = GeneratorStatus.OFF;
+                        sRes = "\r";
+                        break;
+                    default:
+                        break;
+                }
             }
 
 
-            //string[] strs = message.Split(MSG_DELIMITER);
-
-            //Thread.Sleep(2 * 1000);
+            Thread.Sleep(200);
 
             sRes += "\r";
             OnWriteMessage(sRes);

Venus/Venus_Simulator/Devices/AdTecGeneratorMockPMD.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading;
 using MECF.Framework.Simulator.Core.Driver;
+using System.Threading.Tasks;
 
 namespace Venus_Simulator.Devices
 {
@@ -25,7 +26,7 @@ namespace Venus_Simulator.Devices
             _simGeneratorStatus = GeneratorStatus.Unknown;
         }
 
-        protected override void ProcessUnsplitMessage(string message)
+        protected  override void ProcessUnsplitMessage(string message)
         {
             if (string.IsNullOrEmpty(message))
                 throw new ArgumentException("Hardware command message is invalid");
@@ -64,12 +65,10 @@ namespace Venus_Simulator.Devices
                         break;
                 }
 
-                //string[] strs = message.Split(MSG_DELIMITER);
-
-                //Thread.Sleep(2 * 1000);
-
+                Thread.Sleep(200);
                 sRes += "\r";
                 OnWriteMessage(sRes);
+
             }
         }
     }

Venus/Venus_Simulator/Devices/EdwardsPumpMockPMA.cs

@@ -18,7 +18,7 @@ namespace Venus_Simulator.Devices
         public static SimEdwardsPumpStatus _simPumpControlStatus;
         private const string EOF = "\r\n";
         private const char MSG_DELIMITER = ' ';
-        private const string MOCKUP_PORT = "COM";
+        private const string MOCKUP_PORT = "COM102";
 
         public EdwardsPumpMockPMA() : base(MOCKUP_PORT, -1, EOF, MSG_DELIMITER)
         {

Venus/Venus_Simulator/Devices/EfemSimulator.cs

@@ -121,7 +121,7 @@ namespace Venus_Simulator.Devices
             }
         }
 
-        private async Task OnWork(string strACK)
+        private void OnWork(string strACK)
         {
             // match basic
             Match m1 = Regex.Match(strACK, SCMD);
@@ -136,7 +136,8 @@ namespace Venus_Simulator.Devices
             ushort millionSec = this.SimuOperationTime(op);
 
             // delay
-            await Task.Delay(millionSec);
+            //await Task.Delay(millionSec);
+            Thread.Sleep(millionSec);
 
             // build the INF string
             string strINF = string.Empty;

Venus/Venus_Simulator/Views/SimuSMCChillerGridPMCView.xaml.cs

@@ -25,7 +25,7 @@ namespace Venus_Simulator.Views
 
         public MockSMCChillerGridViewModelPMC() : base("SkyPumpPMCSimulator")
         {
-            Init(new SMCChillerMock("COM"));
+            Init(new SMCChillerMock("COM103"));
         }
     }
 }

Venus/Venus_Simulator/Views/SimuSMCChillerGridPMDView.xaml.cs

@@ -25,7 +25,7 @@ namespace Venus_Simulator.Views
 
         public MockSMCChillerGridViewModelPMD() : base("SkyPumpPMDSimulator")
         {
-            Init(new SMCChillerMock("COM"));
+            Init(new SMCChillerMock("COM104"));
         }
     }
 }