Browse Source

Remove the toleranceChecker in SMCChiler && SMCShareChiller

zhouhr 1 year ago
parent
commit
41c5b8a615
2 changed files with 45 additions and 45 deletions
  1. 24 24
      Venus/Venus_RT/Devices/SMCChiller.cs
  2. 21 21
      Venus/Venus_RT/Devices/SMCShareChiller.cs

+ 24 - 24
Venus/Venus_RT/Devices/SMCChiller.cs

@@ -246,10 +246,10 @@ namespace Venus_RT.Devices
             }
         }
 
-        private SCConfigItem _scAlarmRange;
-        private SCConfigItem _scEnableAlarm;
-        private SCConfigItem _scAlarmTime;
-        private ToleranceChecker _toleranceChecker = new ToleranceChecker();
+        //private SCConfigItem _scAlarmRange;
+        //private SCConfigItem _scEnableAlarm;
+        //private SCConfigItem _scAlarmTime;
+        //private ToleranceChecker _toleranceChecker = new ToleranceChecker();
 
         // --------------------------Constructor-----------------------
         //
@@ -261,9 +261,9 @@ namespace Venus_RT.Devices
             _scSetPointLimitMin = SC.GetValue<double>($"{Module}.{Name}.SetPointLimitMin");
             StatusSMC = SMCChillerState.Unknown;
 
-            _scEnableAlarm = SC.GetConfigItem($"{Module}.{Name}.EnableToleranceAlarm");
-            _scAlarmRange = SC.GetConfigItem($"{Module}.{Name}.ToleranceAlarmRange");
-            _scAlarmTime = SC.GetConfigItem($"{Module}.{Name}.ToleranceAlarmTime");
+            //_scEnableAlarm = SC.GetConfigItem($"{Module}.{Name}.EnableToleranceAlarm");
+            //_scAlarmRange = SC.GetConfigItem($"{Module}.{Name}.ToleranceAlarmRange");
+            //_scAlarmTime = SC.GetConfigItem($"{Module}.{Name}.ToleranceAlarmTime");
 
             _serial = new AsyncSerialPort(_PortNum, 9600, 7, System.IO.Ports.Parity.Even, System.IO.Ports.StopBits.One, "\r\n", true);
             //jetChamber = (JetChamber)((JetChamber)Enum.Parse(typeof(JetChamber), SC.GetStringValue($"{Module.ToString()}.ChamberType")));//Venus or Kepler
@@ -442,22 +442,22 @@ namespace Venus_RT.Devices
                     LastAlarmflag[i] = Alarmflag[i];
                 }
 
-                if (IsRunning && _scEnableAlarm!=null && _scEnableAlarm.BoolValue)
-                {
-                    var range = _scAlarmRange.IntValue;
-                    var time = _scAlarmTime.IntValue;
-                    _toleranceChecker.Monitor(_controlTcFeedback, _controlTcSetPoint - Math.Abs(range), _controlTcSetPoint + Math.Abs(range), time);
-
-                    if (_toleranceChecker.Trig)
-                    {
-                        LOG.Write(eEvent.ERR_DEVICE_CHILLER, Module, Display + $" temperature out of tolerance in {time:0} seconds");
-                    }
-                }
-
-                else
-                {
-                    _toleranceChecker.RST = true;
-                }
+                //if (IsRunning && _scEnableAlarm!=null && _scEnableAlarm.BoolValue)
+                //{
+                //    var range = _scAlarmRange.IntValue;
+                //    var time = _scAlarmTime.IntValue;
+                //    //_toleranceChecker.Monitor(_controlTcFeedback, _controlTcSetPoint - Math.Abs(range), _controlTcSetPoint + Math.Abs(range), time);
+                //    //
+                //    //if (_toleranceChecker.Trig)
+                //    //{
+                //    //    LOG.Write(eEvent.ERR_DEVICE_CHILLER, Module, Display + $" temperature out of tolerance in {time:0} seconds");
+                //    //}
+                //}
+                //
+                //else
+                //{
+                //    //_toleranceChecker.RST = true;
+                //}
 
             }
             catch (Exception ex)
@@ -476,7 +476,7 @@ namespace Venus_RT.Devices
 
         public override void Reset()
         {
-            _toleranceChecker.RST = true;
+            //_toleranceChecker.RST = true;
         }
 
         public override void Terminate()

+ 21 - 21
Venus/Venus_RT/Devices/SMCShareChiller.cs

@@ -28,7 +28,7 @@ namespace Venus_RT.Devices
         bool[] LastAlarmflag = new bool[48];
         string[] AlarmMsg = new string[48];
         bool[] NeedToStop = new bool[48];
-        private ToleranceChecker _toleranceChecker = new ToleranceChecker();
+        //private ToleranceChecker _toleranceChecker = new ToleranceChecker();
         private float _controlTcSetPoint;
         private float _controlTcFeedback;
         private readonly double _scSetPointLimitMax;
@@ -161,9 +161,9 @@ namespace Venus_RT.Devices
             _driver = ChillerFactory.QuoteDrive(SC.GetStringValue($"{mod}.{Name}.Port"), _address, $"{mod}.{Name}");
             _scSetPointLimitMax = SC.GetValue<double>($"{mod}.{name}.SetPointLimitMax");
             _scSetPointLimitMin = SC.GetValue<double>($"{mod}.{name}.SetPointLimitMin");
-            _scEnableAlarm = SC.GetConfigItem($"{mod}.{name}.EnableToleranceAlarm");
-            _scAlarmRange = SC.GetConfigItem($"{mod}.{name}.ToleranceAlarmRange");
-            _scAlarmTime = SC.GetConfigItem($"{mod}.{name}.ToleranceAlarmTime");
+            //_scEnableAlarm = SC.GetConfigItem($"{mod}.{name}.EnableToleranceAlarm");
+            //_scAlarmRange = SC.GetConfigItem($"{mod}.{name}.ToleranceAlarmRange");
+            //_scAlarmTime = SC.GetConfigItem($"{mod}.{name}.ToleranceAlarmTime");
             jetChamber = (JetChamber)SC.GetValue<int>($"{mod}.ChamberType");
             message = new SMCMutiChillerMessage(_address);
             _timerQueryStatus.Start(CHK_ST_INTERVAL);
@@ -216,22 +216,22 @@ namespace Venus_RT.Devices
                     LastAlarmflag[i] = Alarmflag[i];
                 }
 
-                if (IsRunning && _scEnableAlarm != null && _scEnableAlarm.BoolValue)
-                {
-                    var range = _scAlarmRange.IntValue;
-                    var time = _scAlarmTime.IntValue;
-                    _toleranceChecker.Monitor(_controlTcFeedback, _controlTcSetPoint - Math.Abs(range), _controlTcSetPoint + Math.Abs(range), time);
-
-                    if (_toleranceChecker.Trig)
-                    {
-                        LOG.Write(eEvent.ERR_DEVICE_CHILLER, Module, Display + $" temperature out of tolerance in {time:0} seconds");
-                    }
-                }
-
-                else
-                {
-                    _toleranceChecker.RST = true;
-                }
+                //if (IsRunning && _scEnableAlarm != null && _scEnableAlarm.BoolValue)
+                //{
+                //    var range = _scAlarmRange.IntValue;
+                //    var time = _scAlarmTime.IntValue;
+                //    _toleranceChecker.Monitor(_controlTcFeedback, _controlTcSetPoint - Math.Abs(range), _controlTcSetPoint + Math.Abs(range), time);
+                //
+                //    if (_toleranceChecker.Trig)
+                //    {
+                //        LOG.Write(eEvent.ERR_DEVICE_CHILLER, Module, Display + $" temperature out of tolerance in {time:0} seconds");
+                //    }
+                //}
+                //
+                //else
+                //{
+                //    _toleranceChecker.RST = true;
+                //}
 
             }
             catch (Exception ex)
@@ -244,7 +244,7 @@ namespace Venus_RT.Devices
 
         public override void Reset()
         {
-            _toleranceChecker.RST = true;
+            //_toleranceChecker.RST = true;
         }
 
         public override void SetChillerTemp(float value, float offset)