移除kepler2200A与Kepler2200B RT Device中的chiller

Venus/Venus_MainPages/ViewModels/OverKepler2200AViewModel.cs

@@ -132,12 +132,12 @@ namespace Venus_MainPages.ViewModels
         private bool m_IsAutoMode;
         private string m_SelectedRecipe;
 
-        private float m_ChillerTempSetpoint;
+        //private float m_ChillerTempSetpoint;
         private float m_WallTempSetpoint;
 
         private bool m_HeIsPressureMode=true;
 
-        private bool m_ChillerIsOn;
+        //private bool m_ChillerIsOn;
 
         private float m_ProcessHighPressure;
         private float m_ProcessLowPressure;
@@ -878,11 +878,11 @@ namespace Venus_MainPages.ViewModels
             set { SetProperty(ref m_SelectedRecipe, value); }
         }
 
-        public float ChillerTempSetpoint
-        {
-            get { return m_ChillerTempSetpoint; }
-            set { SetProperty(ref m_ChillerTempSetpoint, value); }
-        }
+        //public float ChillerTempSetpoint
+        //{
+        //    get { return m_ChillerTempSetpoint; }
+        //    set { SetProperty(ref m_ChillerTempSetpoint, value); }
+        //}
 
         public float WallTempSetpoint
         {
@@ -895,11 +895,11 @@ namespace Venus_MainPages.ViewModels
             get { return m_HeIsPressureMode; }
             set { SetProperty(ref m_HeIsPressureMode, value); }
         }
-        public bool ChillerIsOn
-        {
-            get { return m_ChillerIsOn; }
-            set { SetProperty(ref m_ChillerIsOn, value); }
-        }
+        //public bool ChillerIsOn
+        //{
+        //    get { return m_ChillerIsOn; }
+        //    set { SetProperty(ref m_ChillerIsOn, value); }
+        //}
 
         public double ChamberPressureFeedBack
         {
@@ -1033,14 +1033,14 @@ namespace Venus_MainPages.ViewModels
         public DelegateCommand<object> RunRecipeCommand =>
             _RunRecipeCommand ?? (_RunRecipeCommand = new DelegateCommand<object>(OnRunRecipe));
 
-        private DelegateCommand _SetChillerTempCommand;
-        public DelegateCommand SetChillerTempCommand =>
-            _SetChillerTempCommand ?? (_SetChillerTempCommand = new DelegateCommand(OnSetChillerTemp));
+        //private DelegateCommand _SetChillerTempCommand;
+        //public DelegateCommand SetChillerTempCommand =>
+        //    _SetChillerTempCommand ?? (_SetChillerTempCommand = new DelegateCommand(OnSetChillerTemp));
 
 
-        private DelegateCommand _OnOffChillerCommand;
-        public DelegateCommand OnOffChillerCommand =>
-            _OnOffChillerCommand ?? (_OnOffChillerCommand = new DelegateCommand(OnOffChiller));
+        //private DelegateCommand _OnOffChillerCommand;
+        //public DelegateCommand OnOffChillerCommand =>
+        //    _OnOffChillerCommand ?? (_OnOffChillerCommand = new DelegateCommand(OnOffChiller));
 
 
         private DelegateCommand<object> _HeaterCommand;
@@ -1424,10 +1424,10 @@ namespace Venus_MainPages.ViewModels
 
        
 
-        private void OnOffChiller()
-        {
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.OnOffChiller", ChillerType.Chiller.ToString(),!ChillerIsOn);
-        }
+        //private void OnOffChiller()
+        //{
+        //    InvokeClient.Instance.Service.DoOperation($"{ModuleName}.OnOffChiller", ChillerType.Chiller.ToString(),!ChillerIsOn);
+        //}
 
 
         private void OnHeater(object obj)
@@ -1474,10 +1474,10 @@ namespace Venus_MainPages.ViewModels
         {
             InvokeClient.Instance.Service.DoOperation($"{ModuleName}.HighTemperatureHeater.SwitchHighTemperatureHeater", !HighTemperatureHeaterData.HighTemperatureHeaterIson);
         }
-        private void OnSetChillerTemp()
-        {
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.HighTemperatureHeater.SetHighTemperatureHeaterTemperature", HighTemperatureHeaterTemperatureSetpoint);
-        }
+        //private void OnSetChillerTemp()
+        //{
+        //    InvokeClient.Instance.Service.DoOperation($"{ModuleName}.HighTemperatureHeater.SetHighTemperatureHeaterTemperature", HighTemperatureHeaterTemperatureSetpoint);
+        //}
         private DelegateCommand _OnlineCommand;
         public DelegateCommand OnlineCommand =>
             _OnlineCommand ?? (_OnlineCommand = new DelegateCommand(OnOnline));
@@ -1637,13 +1637,13 @@ namespace Venus_MainPages.ViewModels
             ForelinePressure = float.Parse(RtDataValues[$"{ModuleName}.ForelinePressure"].ToString());
             ESCHePressure = float.Parse(RtDataValues[$"{ModuleName}.ESCHePressure"].ToString());
 
-            ChillerTemperature = float.Parse(RtDataValues[$"{ModuleName}.Chiller.Temp"].ToString());
+            //ChillerTemperature = float.Parse(RtDataValues[$"{ModuleName}.Chiller.Temp"].ToString());
 
             //HVTemperature = float.Parse(RtDataValues[$"{ModuleName}.{VenusDevice.ESCHV}.Temp"].ToString());
 
 
 
-            ChillerIsOn = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.Chiller.IsOn");
+            //ChillerIsOn = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.Chiller.IsOn");
 
             SourceRFMatchInterlock= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.SourceRFMatchInterlock");
             IsWLK= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsWLK");
@@ -1776,7 +1776,7 @@ namespace Venus_MainPages.ViewModels
 
             m_RtDataKeys.Add($"{ModuleName}.GetPVPosition");
 
-            m_RtDataKeys.Add($"{ModuleName}.Chiller.Temp");
+            //m_RtDataKeys.Add($"{ModuleName}.Chiller.Temp");
 
 
             m_RtDataKeys.Add($"{ModuleName}.IsWaterFlowOk"); 
@@ -1789,7 +1789,7 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add($"{ModuleName}.GasBoxPressureSW.Value");
 
             //m_RtDataKeys.Add($"{ModuleName}.WallTempFeedBack");
-            m_RtDataKeys.Add($"{ModuleName}.Chiller.IsOn");
+            //m_RtDataKeys.Add($"{ModuleName}.Chiller.IsOn");
 
             //m_RtDataKeys.Add($"{ModuleName}.ValveHeater.DeviceData");
             //m_RtDataKeys.Add($"{ModuleName}.ForelineHeater.DeviceData");

Venus/Venus_MainPages/ViewModels/OverKepler2200BViewModel.cs

@@ -132,12 +132,12 @@ namespace Venus_MainPages.ViewModels
         private bool m_IsAutoMode;
         private string m_SelectedRecipe;
 
-        private float m_ChillerTempSetpoint;
-        private float m_WallTempSetpoint;
+        //private float m_ChillerTempSetpoint;
+        //private float m_WallTempSetpoint;
 
         private bool m_HeIsPressureMode = true;
 
-        private bool m_ChillerIsOn;
+        //private bool m_ChillerIsOn;
 
         private float m_ProcessHighPressure;
         private float m_ProcessLowPressure;
@@ -878,28 +878,28 @@ namespace Venus_MainPages.ViewModels
             set { SetProperty(ref m_SelectedRecipe, value); }
         }
 
-        public float ChillerTempSetpoint
-        {
-            get { return m_ChillerTempSetpoint; }
-            set { SetProperty(ref m_ChillerTempSetpoint, value); }
-        }
+        //public float ChillerTempSetpoint
+        //{
+        //    get { return m_ChillerTempSetpoint; }
+        //    set { SetProperty(ref m_ChillerTempSetpoint, value); }
+        //}
 
-        public float WallTempSetpoint
-        {
-            get { return m_WallTempSetpoint; }
-            set { SetProperty(ref m_WallTempSetpoint, value); }
-        }
+        //public float WallTempSetpoint
+        //{
+        //    get { return m_WallTempSetpoint; }
+        //    set { SetProperty(ref m_WallTempSetpoint, value); }
+        //}
 
         public bool HeIsPressureMode
         {
             get { return m_HeIsPressureMode; }
             set { SetProperty(ref m_HeIsPressureMode, value); }
         }
-        public bool ChillerIsOn
-        {
-            get { return m_ChillerIsOn; }
-            set { SetProperty(ref m_ChillerIsOn, value); }
-        }
+        //public bool ChillerIsOn
+        //{
+        //    get { return m_ChillerIsOn; }
+        //    set { SetProperty(ref m_ChillerIsOn, value); }
+        //}
 
         public double ChamberPressureFeedBack
         {
@@ -1033,14 +1033,14 @@ namespace Venus_MainPages.ViewModels
         public DelegateCommand<object> RunRecipeCommand =>
             _RunRecipeCommand ?? (_RunRecipeCommand = new DelegateCommand<object>(OnRunRecipe));
 
-        private DelegateCommand _SetChillerTempCommand;
-        public DelegateCommand SetChillerTempCommand =>
-            _SetChillerTempCommand ?? (_SetChillerTempCommand = new DelegateCommand(OnSetChillerTemp));
+        //private DelegateCommand _SetChillerTempCommand;
+        //public DelegateCommand SetChillerTempCommand =>
+        //    _SetChillerTempCommand ?? (_SetChillerTempCommand = new DelegateCommand(OnSetChillerTemp));
 
 
-        private DelegateCommand _OnOffChillerCommand;
-        public DelegateCommand OnOffChillerCommand =>
-            _OnOffChillerCommand ?? (_OnOffChillerCommand = new DelegateCommand(OnOffChiller));
+        //private DelegateCommand _OnOffChillerCommand;
+        //public DelegateCommand OnOffChillerCommand =>
+        //    _OnOffChillerCommand ?? (_OnOffChillerCommand = new DelegateCommand(OnOffChiller));
 
 
         private DelegateCommand<object> _HeaterCommand;
@@ -1424,10 +1424,10 @@ namespace Venus_MainPages.ViewModels
 
 
 
-        private void OnOffChiller()
-        {
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.OnOffChiller", ChillerType.Chiller.ToString(), !ChillerIsOn);
-        }
+        //private void OnOffChiller()
+        //{
+        //    InvokeClient.Instance.Service.DoOperation($"{ModuleName}.OnOffChiller", ChillerType.Chiller.ToString(), !ChillerIsOn);
+        //}
 
 
         private void OnHeater(object obj)
@@ -1637,13 +1637,13 @@ namespace Venus_MainPages.ViewModels
             ForelinePressure = float.Parse(RtDataValues[$"{ModuleName}.ForelinePressure"].ToString());
             ESCHePressure = float.Parse(RtDataValues[$"{ModuleName}.ESCHePressure"].ToString());
 
-            ChillerTemperature = float.Parse(RtDataValues[$"{ModuleName}.Chiller.Temp"].ToString());
+            //ChillerTemperature = float.Parse(RtDataValues[$"{ModuleName}.Chiller.Temp"].ToString());
 
             //HVTemperature = float.Parse(RtDataValues[$"{ModuleName}.{VenusDevice.ESCHV}.Temp"].ToString());
 
 
 
-            ChillerIsOn = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.Chiller.IsOn");
+            //ChillerIsOn = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.Chiller.IsOn");
 
             SourceRFMatchInterlock = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.SourceRFMatchInterlock");
             IsWLK = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsWLK");
@@ -1776,7 +1776,7 @@ namespace Venus_MainPages.ViewModels
 
             m_RtDataKeys.Add($"{ModuleName}.GetPVPosition");
 
-            m_RtDataKeys.Add($"{ModuleName}.Chiller.Temp");
+            //m_RtDataKeys.Add($"{ModuleName}.Chiller.Temp");
 
 
             m_RtDataKeys.Add($"{ModuleName}.IsWaterFlowOk");
@@ -1789,7 +1789,7 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add($"{ModuleName}.GasBoxPressureSW.Value");
 
             //m_RtDataKeys.Add($"{ModuleName}.WallTempFeedBack");
-            m_RtDataKeys.Add($"{ModuleName}.Chiller.IsOn");
+            //m_RtDataKeys.Add($"{ModuleName}.Chiller.IsOn");
 
             //m_RtDataKeys.Add($"{ModuleName}.ValveHeater.DeviceData");
             //m_RtDataKeys.Add($"{ModuleName}.ForelineHeater.DeviceData");

Venus/Venus_RT/Devices/JetKepler2200APM.cs

@@ -183,10 +183,10 @@ namespace Venus_RT.Devices
         public override double ESCNegativeOutputCurrent => _ESCHV.NegativeOutputCurrent;
         public override bool IsHVOn => _ESCHV.IsOn;
 
-        public override float CoolantInletTempFB => _Chiller.CoolantInletTcFeedback;
-        public override float CoolantOutletTempFB => _Chiller.CoolantOutletTcFeedback;
+        public override float CoolantInletTempFB =>0;
+        public override float CoolantOutletTempFB => 0;
 
-        public override bool ChillerIsRunning => _Chiller.IsRunning;
+        public override bool ChillerIsRunning => false;
 
         //Loadlock_Arm
         public override bool IsLoadlockArmRetract => _LoadLockArm.OFFFeedback;

Venus/Venus_RT/Devices/JetKepler2200BPM.cs

@@ -183,10 +183,10 @@ namespace Venus_RT.Devices
         public override double ESCNegativeOutputCurrent => _ESCHV.NegativeOutputCurrent;
         public override bool IsHVOn => _ESCHV.IsOn;
 
-        public override float CoolantInletTempFB => _Chiller.CoolantInletTcFeedback;
-        public override float CoolantOutletTempFB => _Chiller.CoolantOutletTcFeedback;
+        public override float CoolantInletTempFB => 0;
+        public override float CoolantOutletTempFB => 0;
 
-        public override bool ChillerIsRunning => _Chiller.IsRunning;
+        public override bool ChillerIsRunning => false;
 
         //Loadlock_Arm
         public override bool IsLoadlockArmRetract => _LoadLockArm.OFFFeedback;