ソースを参照

1 revise platingcell overflow

chenzk 7 時間 前
コミット
a1656db3e7

+ 0 - 1
PunkHPX8_RT/Config/System.sccfg

@@ -361,7 +361,6 @@
 		<config default="1000" name="ReclaimJerk" nameView="ReclaimJerk" description="Reclaim Jerk" max="10000" min="0" paramter="" tag="" unit="mm/s^3" type="Integer"></config>
 		<config default="false" name="PostProcessCurrentEnable" nameView="PostProcessCurrentEnable" description="Post Process Current Enable" max="" min="" paramter="" tag="" unit="" type="Bool"/>
 		<config default="0.1" name="PostProcessCurrentSetPoint" nameView="PostProcessCurrentSetPoint" description="Post Process Current SetPoint" max="10" min="0" paramter="" tag="A" unit="" type="Double"></config>
-	    <config default="12.76,4,0" name="OverFlowLevelCurve" nameView="OverFlowLevelCurve" description="OverFlow Level Curve " max="" min="" paramter="" tag="" unit="" type="String" />
 		<configs name="CSR" nameView="CSR">
 			<config default="true" name="CSREnable" nameView="CSREnable" description="CSR Enabled" max="" min="" paramter="" tag="" unit="" type="Bool"/>
 			<config default="80" name="RinseSpeed" nameView="RinseSpeed" description="Rinse Speed" max="1000" min="0" paramter="" tag="" unit="rpm" type="Integer"></config>

+ 1 - 3
PunkHPX8_RT/Devices/PlatingCell/PlatingCellDevice.cs

@@ -383,9 +383,7 @@ namespace PunkHPX8_RT.Devices.PlatingCell
                 property.SetValue(_platingCellData, value);
                 if (variable == OVERFLOW_LEVEL)
                 {
-                    string LevelCurve = SC.GetStringValue($"PlatingCell.OverFlowLevelCurve");
-                    double waterLevel = PlatingCellOverflowLevelCurve.Instance.CalculateLevelByCurrent(Convert.ToDouble(value), LevelCurve);
-                    //double waterLevel = CurrentToWaterLevel(Convert.ToDouble(value));
+                    double waterLevel = Convert.ToDouble(value);
                     _platingCellData.OverFlowLevel = waterLevel;
                     if (_platingCellData.OverFlowLevel >= _overflowLevelHigh)
                     {

+ 0 - 36
PunkHPX8_RT/Devices/PlatingCell/PlatingCellOverflowLevelCurve.cs

@@ -1,36 +0,0 @@
-using Aitex.Core.Util;
-using PunkHPX8_RT.Devices.Reservoir;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PunkHPX8_RT.Devices.PlatingCell
-{
-    public class PlatingCellOverflowLevelCurve : Singleton<PlatingCellOverflowLevelCurve>
-    {
-        /// <summary>
-        /// 计算Level
-        /// </summary>
-        /// <param name="current"></param>
-        /// <param name="levelCurve"></param>
-        /// <returns></returns>
-        public double CalculateLevelByCurrent(double current, string levelCurve)
-        {
-            string[] strAry = levelCurve.Split(',', ',');
-            if (strAry.Length >= 3)
-            {
-                double.TryParse(strAry[strAry.Length - 1], out double c);
-                double.TryParse(strAry[strAry.Length - 2], out double b);
-                double.TryParse(strAry[strAry.Length - 3], out double a);
-
-                return a * (current - b) + c;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-    }
-}