解决冲突，合并代码

# Conflicts:
#	Venus/Venus_RT/Modules/PMs/PMProcessRoutine.cs

Venus/Framework/Common/DBCore/ProcessDataRecorder.cs

@@ -139,14 +139,15 @@ namespace MECF.Framework.Common.DBCore
             }
         }
 
-        public static void RecordPrecess(string guid, DateTime startTime, DateTime endTime, string recipeName, string waferDataGuid, string processIn, string lotID, string slotID)
+        public static void RecordPrecess(string guid, DateTime startTime, DateTime endTime, string recipeName,string status, string waferDataGuid, string processIn, string lotID, string slotID)
         {
             string sql = string.Format(
-                "INSERT INTO \"process_data\"(\"guid\", \"process_begin_time\",\"process_end_time\", \"recipe_name\" , \"wafer_data_guid\", \"process_in\", \"lot_id\", \"slot_id\" )VALUES ('{0}', '{1}', '{2}', '{3}', '{4}', '{5}', '{6}','{7}' );",
+                "INSERT INTO \"process_data\"(\"guid\", \"process_begin_time\",\"process_end_time\", \"recipe_name\" ,\"process_status\", \"wafer_data_guid\", \"process_in\", \"lot_id\", \"slot_id\" )VALUES ('{0}', '{1}', '{2}', '{3}', '{4}', '{5}', '{6}','{7}' ,'{8}');",
                 guid,
                 startTime.ToString("yyyy/MM/dd HH:mm:ss.fff"),
                 endTime.ToString("yyyy/MM/dd HH:mm:ss.fff"),
                 recipeName,
+                status,
                 waferDataGuid,
                 processIn,
                 lotID,

Venus/Venus_Core/ProcessUnitDefine.cs

@@ -58,14 +58,14 @@ namespace Venus_Core
 
         public PressureUnitMode PressureUnitMode { get; set; }
 
-        public int StartValue { get; set; } = 10;
+        public int StartValue { get; set; }
 
 
-        public int ValvePositionPreset { get; set; } = 10;
+        public int ValvePositionPreset { get; set; }
 
         public bool EnableRamp { get; set; }
-        public int HoldTime { get; set; } = 1000;
-        public int TargetValue { get; set; } = 100;
+        public int HoldTime { get; set; }
+        public int TargetValue { get; set; }
 
 
 
@@ -85,9 +85,9 @@ namespace Venus_Core
     {
         public string UnitName { get; set; } = "PressureByValveModeUnit";
         public bool EnableRamp { get; set; }
-        public int StartPosition { get; set; } = 10;
-        public int TargetPosition { get; set; } = 100;
-        public int HoldTime { get; set; }= 10000;
+        public int StartPosition { get; set; }
+        public int TargetPosition { get; set; }
+        public int HoldTime { get; set; }
 
     }
 
@@ -95,13 +95,13 @@ namespace Venus_Core
     {
         public string UnitName { get; set; } = "HeaterUnit";
 
-        public int HeaterPressure { get; set; } = 10;
-        public int HeaterTemp { get; set; } = 10;
+        public int HeaterPressure { get; set; }
+        public int HeaterTemp { get; set; }
 
-        public int HeaterRatio { get; set; } = 10;
+        public int HeaterRatio { get; set; }
         public Suspect SuspectPosition { get; set; } = Suspect.Home;
 
-        public int PositionOffset { get; set; } = 1;
+        public int PositionOffset { get; set; }
 
     }
     public class TCPUnit : ProcessUnitBase
@@ -113,10 +113,10 @@ namespace Venus_Core
             set { m_UnitName = value; }
         }
 
-        public int RFPower { get; set; } = 10;
-        public int TuneCapPreset { get; set; } = 10;
-        public int LoadCapPreset { get; set; } = 10;
-        public int MaxReflectedPower { get; set; } = 100;
+        public int RFPower { get; set; }
+        public int TuneCapPreset { get; set; }
+        public int LoadCapPreset { get; set; }
+        public int MaxReflectedPower { get; set; }
 
 
         private bool m_EnableRamp;
@@ -126,9 +126,9 @@ namespace Venus_Core
             set { m_EnableRamp = value; }
         }
         
-        public int StartPower { get; set; } = 10;
-        public int TargetPower { get; set; } = 100;
-        public int HoldTime { get; set; } = 1000;
+        public int StartPower { get; set; }
+        public int TargetPower { get; set; }
+        public int HoldTime { get; set; }
         
 
     }
@@ -136,8 +136,8 @@ namespace Venus_Core
     public class Kepler2200RFUnit : ProcessUnitBase
     {
         public string UnitName { get; set; } = "RFUnit";
-        public int TuneCapPreset { get; set; } = 10;
-        public int LoadCapPreset { get; set; } = 10;
+        public int TuneCapPreset { get; set; }
+        public int LoadCapPreset { get; set; }
          
 
         
@@ -148,57 +148,57 @@ namespace Venus_Core
     {
         public string UnitName { get; set; } = "BiasUnit";
 
-        public int BiasRFPower { get; set; } = 10;
-        public int BiasTuneCapPreset { get; set; } = 10;
-        public int BiasLoadCapPreset { get; set; } = 10;
-        public int BiasMaxReflectedPower { get; set; } = 1000;
+        public int BiasRFPower { get; set; }
+        public int BiasTuneCapPreset { get; set; }
+        public int BiasLoadCapPreset { get; set; }
+        public int BiasMaxReflectedPower { get; set; }
         public bool EnableRamp { get; set; }
         
-        public int StartBiasRFPower { get; set; } = 10;
-        public int TargetBiasRFPower { get; set; } = 100;
-        public int BiasRFHoldTime { get; set; } = 1000;
+        public int StartBiasRFPower { get; set; } 
+        public int TargetBiasRFPower { get; set; }
+        public int BiasRFHoldTime { get; set; }
        
         [JsonConverter(typeof(StringEnumConverter))]
         public GeneratorMode BiasGeneratorMode { get; set; }
-        public int PulseRateFreq { get; set; } = 10;
-        public int PulseDutyCycle { get; set; } = 10;
+        public int PulseRateFreq { get; set; }
+        public int PulseDutyCycle { get; set; }
 
     }
 
     public class GasControlUnit : ProcessUnitBase
     {
         public string UnitName { get; set; } = "GasControlUnit";
-        public int Gas1 { get; set; } = 10;
-        public int Gas2 { get; set; } = 10;
-        public int Gas3 { get; set; } = 10;
-        public int Gas4 { get; set; } = 10;
-        public int Gas5 { get; set; } = 10;
-        public int Gas6 { get; set; } = 100;
-        public int Gas7 { get; set; } = 100;
-        public int Gas8 { get; set; } = 100;
+        public int Gas1 { get; set; } 
+        public int Gas2 { get; set; }
+        public int Gas3 { get; set; }
+        public int Gas4 { get; set; }
+        public int Gas5 { get; set; }
+        public int Gas6 { get; set; }
+        public int Gas7 { get; set; }
+        public int Gas8 { get; set; }
 
         public bool EnableRamp { get; set; }
-        public int Gas1Target { get; set; } = 100;
-        public int Gas2Target { get; set; }= 100;
-        public int Gas3Target { get; set; }=100;
-        public int Gas4Target { get; set; } = 100;
-        public int Gas5Target { get; set; } = 100;
-        public int Gas6Target { get; set; } = 10;
-        public int Gas7Target { get; set; } = 10;
-        public int Gas8Target { get; set; } = 10;
-        public int FlowRatie { get; set; } = 100;
+        public int Gas1Target { get; set; }
+        public int Gas2Target { get; set; }
+        public int Gas3Target { get; set; }
+        public int Gas4Target { get; set; }
+        public int Gas5Target { get; set; }
+        public int Gas6Target { get; set; } 
+        public int Gas7Target { get; set; } 
+        public int Gas8Target { get; set; }
+        public int FlowRatie { get; set; }
     }
 
 
     public class Kepler2200GasControlUnit : ProcessUnitBase
     {
         public string UnitName { get; set; } = "GasUnit";
-        public int Gas1 { get; set; } = 100;
-        public int Gas2 { get; set; } = 100;
-        public int Gas3 { get; set; } = 100;
-        public int Gas4 { get; set; } = 100;
-        public int Gas5 { get; set; } = 100;
-        public int Gas6 { get; set; } = 100;
+        public int Gas1 { get; set; }
+        public int Gas2 { get; set; }
+        public int Gas3 { get; set; }
+        public int Gas4 { get; set; } 
+        public int Gas5 { get; set; }
+        public int Gas6 { get; set; }
     }
 
 
@@ -206,11 +206,11 @@ namespace Venus_Core
     {
         public string UnitName { get; set; } = "ESCHVUnit";
 
-        public int BacksideHelum { get; set; } = 10;
-        public int MinHeFlow { get; set; } = 10;
-        public int MaxHeFlow { get; set; } = 100;
-        public int ESCClampValtage { get; set; } = 10;
-        public int Temperature { get; set; } = 20;
+        public int BacksideHelum { get; set; } 
+        public int MinHeFlow { get; set; } 
+        public int MaxHeFlow { get; set; } 
+        public int ESCClampValtage { get; set; }
+        public int Temperature { get; set; }
     }
 
     public class ProcessKitUnit : ProcessUnitBase

Venus/Venus_MainPages/ViewModels/GasLeakCheckViewModel.cs

@@ -90,6 +90,8 @@ namespace Venus_MainPages.ViewModels
 
         private List<string> m_RtDataKeys=new List<string> ();
         private Dictionary<string, object> m_RtDataValues=new Dictionary<string, object> ();
+        private string m_currentStep;
+        public int? m_stepTime;
         #endregion
 
         #region  属性
@@ -244,6 +246,26 @@ namespace Venus_MainPages.ViewModels
                 SetProperty(ref m_PMCurrentState, value);
             }
         }
+        public string CurrentStep
+        {
+            get { return m_currentStep; }
+            set
+            {
+                if (value != m_currentStep)
+                {
+                    StepTime = 0;
+                }
+                SetProperty(ref m_currentStep, value);
+            }
+        }
+        public int? StepTime
+        {
+            get { return m_stepTime; }
+            set
+            {
+                SetProperty(ref m_stepTime, value);
+            }
+        }
         #region 阀
         public bool GasFinalValveIsOpen
         {
@@ -570,6 +592,21 @@ namespace Venus_MainPages.ViewModels
 
             GasIsFlowing = (PMState)RtDataValues[$"{ModuleName}.FsmState"] == PMState.GasFlowing;
             IsAutoMode = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsOnline");
+            if ((PMState)RtDataValues[$"{ModuleName}.FsmState"] == PMState.GasBoxLeakCheck)
+            {
+                CurrentStep = RtDataValues[$"{ModuleName}.GasLeakCheck.Step"]?.ToString();
+                StepTime += 1;
+            }
+            else if ((PMState)RtDataValues[$"{ModuleName}.FsmState"] == PMState.LeakCheck)
+            {
+                CurrentStep = RtDataValues[$"{ModuleName}.LeakCheck.Step"]?.ToString();
+                StepTime += 1;
+            }
+            else
+            {
+                CurrentStep = "";
+                StepTime = null;
+            }
         }
         public void addDataKeys()
         {
@@ -615,6 +652,11 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add($"{ModuleName}.ValvePVN22.IsOpen");
             m_RtDataKeys.Add($"{ModuleName}.ValveGuage.IsOpen");
             m_RtDataKeys.Add($"{ModuleName}.FsmState");
+            m_RtDataKeys.Add($"{ModuleName}.GasLeakCheck.Step");
+            m_RtDataKeys.Add($"{ModuleName}.LeakCheck.Step");
+
+
+
         }
         #endregion
     }

Venus/Venus_MainPages/Views/GasLeakCheckView.xaml

@@ -562,8 +562,8 @@
                 <CheckBox x:Name="gas7CheckBox" Grid.Row="13" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" IsEnabled="{Binding LeakCheckModeSelectedIndex}"  IsChecked="{Binding GasIsCheck[7]}"/>
                 <CheckBox x:Name="gas8CheckBox" Grid.Row="14" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" IsEnabled="{Binding LeakCheckModeSelectedIndex}"  IsChecked="{Binding GasIsCheck[8]}"/>
 
-                <TextBlock Grid.Row="15" Grid.Column="1"/>
-                <TextBlock Grid.Row="16" Grid.Column="1"/>
+                <TextBlock Grid.Row="15" Grid.Column="1" Text="{Binding CurrentStep}" Padding="2,5,0,0"/>
+                <TextBlock Grid.Row="16" Grid.Column="1" Text="{Binding StepTime}" Padding="2,5,0,0"/>
                 <TextBlock Grid.Row="17" Grid.Column="1"/>
                 
             </Grid>

Venus/Venus_RT/Devices/JetVenusPM.cs

@@ -633,7 +633,7 @@ namespace Venus_RT.Devices
                 SetSlitDoor(false, out _);
             }
 
-            SetSlitDoor(true, out _);
+            SetSlitDoor(false, out _);
             //2023/03/08添加
             OpenValve(ValveType.PVN22, true);
             //2023/04/25临时添加
@@ -663,37 +663,38 @@ namespace Venus_RT.Devices
 
         public override bool SetSlitDoor(bool open, out string reason)
         {
-            if (open)
-            {
-                if (RouteManager.IsATMMode)
-                {
-                    if (!IsATM)
-                    {
-                        reason = $"{Module} is not ATM, can not open slit door";
-                        LOG.Write(eEvent.ERR_DEVICE_INFO, Module, reason);
-                        return false;
-                    }
-
-                    if (!IsTMATM)
-                    {
-                        reason = $"LoadLock is not ATM, can not open slit door";
-                        LOG.Write(eEvent.ERR_DEVICE_INFO, Module, reason);
-                        return false;
-                    }
-                }
-                else
-                {
-
-                    double maxPressureDifference = SC.GetValue<double>("System.PMTMMaxPressureDifference");
-                    if (Math.Abs(TMPressure - ChamberPressure) > maxPressureDifference)
-                    {
-                        reason = $"{Module} and TM pressure difference exceeds the max limit {maxPressureDifference}, TMPressure:{TMPressure}, {Module}Pressure:{ChamberPressure}";
-                        LOG.Write(eEvent.ERR_DEVICE_INFO, Module, reason);
-                        return false;
-                    }
-                }
-
-            }
+            //2023/09/05 Venus无TM，暂时注释
+            //if (open)
+            //{
+            //    if (RouteManager.IsATMMode)
+            //    {
+            //        if (!IsATM)
+            //        {
+            //            reason = $"{Module} is not ATM, can not open slit door";
+            //            LOG.Write(eEvent.ERR_DEVICE_INFO, Module, reason);
+            //            return false;
+            //        }
+
+            //        if (!IsTMATM)
+            //        {
+            //            reason = $"LoadLock is not ATM, can not open slit door";
+            //            LOG.Write(eEvent.ERR_DEVICE_INFO, Module, reason);
+            //            return false;
+            //        }
+            //    }
+            //    else
+            //    {
+
+            //        double maxPressureDifference = SC.GetValue<double>("System.PMTMMaxPressureDifference");
+            //        if (Math.Abs(TMPressure - ChamberPressure) > maxPressureDifference)
+            //        {
+            //            reason = $"{Module} and TM pressure difference exceeds the max limit {maxPressureDifference}, TMPressure:{TMPressure}, {Module}Pressure:{ChamberPressure}";
+            //            LOG.Write(eEvent.ERR_DEVICE_INFO, Module, reason);
+            //            return false;
+            //        }
+            //    }
+
+            //}
 
             return _slitDoor.SetCylinder(open, out reason);
         }
@@ -768,9 +769,15 @@ namespace Venus_RT.Devices
 
         public override async void HeatChiller(ChillerType chillerType, double value, double offset)
         {
+            //_Chiller?.SetChillerTemp((float)value, (float)offset);
+            //await Task.Delay(1000);
+            //_Chiller?.SetChillerOnOff(true);
+            if (!ChillerIsRunning)
+            {
+                _Chiller?.SetChillerOnOff(true);
+                await Task.Delay(1000);
+            }
             _Chiller?.SetChillerTemp((float)value, (float)offset);
-            await Task.Delay(1000);
-            _Chiller?.SetChillerOnOff(true);
         }
 
         public override void OnOffChiller(ChillerType chillerType, bool onoff)

Venus/Venus_RT/Modules/PMs/GasBoxLeakCheckRoutine.cs

@@ -39,6 +39,7 @@ namespace Venus_RT.Modules.PMs
         PMLeakCheckResult pMLeakCheckResult;
         Stopwatch _routineTimer = new Stopwatch();
         StringBuilder  gasLines=new StringBuilder();
+        public string CurrentStep;
         public GasBoxLeakCheckRoutine(JetPMBase chamber) : base(chamber)
         {
             Name = "GasBox Leakcheck";
@@ -50,6 +51,7 @@ namespace Venus_RT.Modules.PMs
                 CheckSlitDoor() &&
                 CheckTurboPump())
             {
+                CurrentStep = "Pump To BasePressure";
                 Reset();
 
                 _basePressure = SC.GetValue<int>($"{Module}.Pump.PumpBasePressure");
@@ -114,7 +116,8 @@ namespace Venus_RT.Modules.PMs
 
         private bool LeakCheckPumping()
         {
-            foreach(var num in _gasLineNums)
+            CurrentStep = "Check Pump";
+            foreach (var num in _gasLineNums)
             {             
                 var _MfcN2Scale = SC.GetValue<int>($"{Module}.MfcGas{num}.MfcN2Scale");
                 var _MfcScaleFactor = SC.GetValue<Double>($"{Module}.MfcGas{num}.MfcScaleFactor");
@@ -156,6 +159,7 @@ namespace Venus_RT.Modules.PMs
 
         private bool StartLeakCheck()
         {
+            CurrentStep = "Leak Check";
             _startPressure = _chamber.ChamberPressure;
             pMLeakCheckResult.StartPressure = _startPressure;
             Notify($"PM 压力开始值 {_startPressure} mt");

Venus/Venus_RT/Modules/PMs/PMEntity.cs

@@ -623,7 +623,8 @@ namespace Venus_RT.Modules.PMs
 
 
             DATA.Subscribe($"{Module}.CurrentRecipeResult", () => _processRoutine.currentRecipeResult, SubscriptionAttribute.FLAG.IgnoreSaveDB);
-            
+            DATA.Subscribe($"{Module}.LeakCheck.Step", () => _leakCheckRoutine.CurrentStep, SubscriptionAttribute.FLAG.IgnoreSaveDB);
+            DATA.Subscribe($"{Module}.GasLeakCheck.Step", () => _gasBoxLeakCheckRoutine.CurrentStep, SubscriptionAttribute.FLAG.IgnoreSaveDB);
 
 
 

Venus/Venus_RT/Modules/PMs/PMLeakCheckRoutine.cs

@@ -29,10 +29,11 @@ namespace Venus_RT.Modules.PMs
         private double _endPressure = 0;
         private double _leakRate = 30.0;
         private double _leakCheckBasePressure = 1;
+        public string CurrentStep;
 
         Stopwatch _leakCheckTimer = new Stopwatch();
         PMLeakCheckResult pMLeakCheckResult;
-        Stopwatch _routineTimer=new Stopwatch();
+        Stopwatch _routineTimer = new Stopwatch();
         public PMLeakCheckRoutine(JetPMBase chamber) : base(chamber)
         {
             Name = "PM Leakcheck";
@@ -44,9 +45,11 @@ namespace Venus_RT.Modules.PMs
                 CheckSlitDoor() &&
                 CheckTurboPump())
             {
+                CurrentStep = "Pump To BasePressure";
+
                 Reset();
 
-                 _basePressure = SC.GetValue<int>($"{Module}.Pump.PumpBasePressure");
+                _basePressure = SC.GetValue<int>($"{Module}.Pump.PumpBasePressure");
                 //_leakcheckPumpTime = SC.GetValue<int>($"{Module}.Pump.LeakCheckPumpingTime");
                 //_leakcheckHoldTime = SC.GetValue<int>($"{Module}.Pump.LeakCheckHoldTime");
                 //_leakRate = SC.GetValue<double>($"{Module}.Pump.LeakRate");
@@ -70,9 +73,9 @@ namespace Venus_RT.Modules.PMs
         public RState Monitor()
         {
             Runner.Wait((int)LeakCheckStep.kPumpToBasePressure, PumpingToBasePressure)
-                .Run((int)LeakCheckStep.kPumpingDelay,          HOFs.WrapAction(_chamber.OpenValve, ValveType.GasFinal, false),     PumpingDelay)
-                .Run((int)LeakCheckStep.kLeakCheckDelay,        StartLeakCheck,                                                     _leakcheckHoldTime * 1000)
-                .End((int)LeakCheckStep.kEnd,                   CalcLeakCheckResult,                                                _delay_50ms);
+                .Run((int)LeakCheckStep.kPumpingDelay, StartPumpDelay, PumpingDelay)
+                .Run((int)LeakCheckStep.kLeakCheckDelay, StartLeakCheck, _leakcheckHoldTime * 1000)
+                .End((int)LeakCheckStep.kEnd, CalcLeakCheckResult, _delay_50ms);
 
             return Runner.Status;
         }
@@ -95,7 +98,7 @@ namespace Venus_RT.Modules.PMs
 
         private bool PumpingDelay()
         {
-            if(_leakCheckTimer.ElapsedMilliseconds >= _leakcheckPumpTime * 1000)
+            if (_leakCheckTimer.ElapsedMilliseconds >= _leakcheckPumpTime * 1000)
             {
                 if (_chamber.ChamberPressure <= _leakCheckBasePressure)
                     return true;
@@ -107,9 +110,15 @@ namespace Venus_RT.Modules.PMs
 
             return false;
         }
-
+        private bool StartPumpDelay()
+        {
+            _chamber.OpenValve(ValveType.GasFinal, false);
+            CurrentStep = "Check Pump";
+            return true;
+        }
         private bool StartLeakCheck()
         {
+            CurrentStep = "Leak Check";
             _startPressure = _chamber.ChamberPressure;
             pMLeakCheckResult.StartPressure = _startPressure;
 
@@ -136,12 +145,12 @@ namespace Venus_RT.Modules.PMs
                 Stop($"PM Leakcheck失败， 腔体漏率 [{LeakRate}] mt/min, 高于 [{_leakRate}] mt/min");
                 pMLeakCheckResult.Result = "Fail";
             }
-            LeakCheckDataRecorder.Add(_leakcheckHoldTime, (int)_startPressure, (int)_endPressure, LeakRate, pMLeakCheckResult.Result, "ChamberOnly",_chamber.Name);
+            LeakCheckDataRecorder.Add(_leakcheckHoldTime, (int)_startPressure, (int)_endPressure, LeakRate, pMLeakCheckResult.Result, "ChamberOnly", _chamber.Name);
             _chamber.OpenValve(ValveType.GasFinal, true);
             _chamber.TurnPendulumValve(true);
             pMLeakCheckResult.LeakCheckTime = (int)_routineTimer.ElapsedMilliseconds / 1000;
 
-            
+
             //SerializeHelper.Instance.WriteToJsonFile<PMLeakCheckResult>(pMLeakCheckResult, $"LeakCheck/PM/{DateTime.Now.ToString("yyyyMMddHHmm")}.json");
             return true;
         }
@@ -153,9 +162,9 @@ namespace Venus_RT.Modules.PMs
             _chamber.OpenValve(ValveType.TurboPumpPumping, true);
             _chamber.OpenValve(ValveType.Guage, true);
             _chamber.OpenValve(ValveType.GasFinal, true);
-            
-            
-            
+
+
+
 
             _chamber.TurnPendulumValve(true);
 

Venus/Venus_RT/Modules/TM/MFLeakCheckRoutine.cs

@@ -33,6 +33,7 @@ namespace Venus_RT.Modules.TM
         private double _leakRate = 30.0;
 
         private readonly JetTM _JetTM;
+        public string CurrentStep;
 
         public MFLeakCheckRoutine(JetTM tm, ModuleName mod) : base(mod)
         {

Venus/Venus_RT/Venus_RT.csproj

@@ -150,8 +150,6 @@
     <Compile Include="Devices\JetEPDBase.cs" />
     <Compile Include="Devices\JetKepler2200APM.cs" />
     <Compile Include="Devices\JetPMBase.cs" />
-    <Compile Include="Devices\JetVenusSEPM.cs" />
-    <Compile Include="Devices\JetVenusSEPMBase.cs" />
     <Compile Include="Devices\JetVenusPM.cs" />
     <Compile Include="Devices\JetKepler2300PM.cs" />
     <Compile Include="Devices\PendulumValve.cs" />

Venus/Venus_Simulator/Devices/SMCChillerMockPMB.cs

@@ -29,28 +29,28 @@ namespace Venus_Simulator.Devices
 
         protected override void ProcessUnsplitMessage(string message)
         {
-            if (string.IsNullOrEmpty(message))
-                throw new ArgumentException("Hardware command message is invalid");
+            //if (string.IsNullOrEmpty(message))
+            //    throw new ArgumentException("Hardware command message is invalid");
 
-            string[] separatingStrings = { EOF };
-            string[] msgs = message.Trim().Split(separatingStrings, System.StringSplitOptions.RemoveEmptyEntries);
-            foreach (var msg in msgs)
-            {
-                if(msg.StartsWith(":0106000B"))
-                {
-                    int temp = Convert.ToInt32(msg.Substring(9, 8), 16);
-                    Console.WriteLine($"Chiller Set Temp: {temp}");
-                    SetTemp(temp);
-                }
-                else if(msg.StartsWith(":0106000C0001"))
-                {
-                    _simPumpStatus = SMCChillerStatus.Open;
-                }
-                else if(msg.StartsWith(":0106000C0000"))
-                {
-                    _simPumpStatus = SMCChillerStatus.Close;
-                }
-            }
+            //string[] separatingStrings = { EOF };
+            //string[] msgs = message.Trim().Split(separatingStrings, System.StringSplitOptions.RemoveEmptyEntries);
+            //foreach (var msg in msgs)
+            //{
+            //    if(msg.StartsWith(":0106000B"))
+            //    {
+            //        int temp = Convert.ToInt32(msg.Substring(9, 8), 16);
+            //        Console.WriteLine($"Chiller Set Temp: {temp}");
+            //        SetTemp(temp);
+            //    }
+            //    else if(msg.StartsWith(":0106000C0001"))
+            //    {
+            //        _simPumpStatus = SMCChillerStatus.Open;
+            //    }
+            //    else if(msg.StartsWith(":0106000C0000"))
+            //    {
+            //        _simPumpStatus = SMCChillerStatus.Close;
+            //    }
+            //}
             
         }