revise reservoir low level

CyberX8_MainPages/ViewModels/StandardHotReservoirsViewModel.cs

@@ -794,6 +794,7 @@ namespace CyberX8_MainPages.ViewModels
             CMMAnodeLifeTimeAHrs = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMAnodeLifeTimeAHrs"));
             CMMCathodeLifeTimeAHrs = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMCathodeLifeTimeAHrs"));
             _reservoirHighLevel = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.HighLevel"));
+            _reservoirLowLevel = Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.LowLevel"));
             _cmmAnodeTotalAmpHoursWarningLimit = (double)Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMAnodeTotalAmpHoursWarningLimit"));
             _cmmAnodeTotalAmpHoursFaultLimit = (double)Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMAnodeTotalAmpHoursFaultLimit"));
             _cmmCathodeTotalAmpHoursWarningLimit = (double)Convert.ToDouble(QueryDataClient.Instance.Service.GetConfig($"Reservoir.{Module}.CMMCathodeTotalAmpHoursWarningLimit"));
@@ -1138,7 +1139,7 @@ namespace CyberX8_MainPages.ViewModels
                         //High Level报警灯
                         IsHighLevel = (ReservoirData.WaterLevel > _reservoirHighLevel) ? true : false;
                         //Low Level报警灯
-                        IsLowLevel = ReservoirData.LowLevel;
+                        IsLowLevel = (ReservoirData.WaterLevel < _reservoirLowLevel) ? true : false;
                         //HighSafety
                         IsHighSafety = ReservoirData.SafetyHighLevel;
                         //HedFlow管流

CyberX8_MainPages/Views/StandardHotReservoirsView.xaml

@@ -521,7 +521,7 @@ Visibility="{Binding IsError,Converter={StaticResource boolToVisibility2}}" Canv
             </Grid>
             <Grid Grid.Row="5" Grid.Column="0">
                 <Label Content="Low" FontSize="12" FontWeight="Bold" HorizontalContentAlignment="Left" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,25,0"/>
-                <Ellipse Margin="80,2,20,2"  Width="16" Height="16"  Fill="{Binding IsLowLevel, Converter={StaticResource boolToGreenRedColor}}"   Stroke="Gray"/>
+                <Ellipse Margin="80,2,20,2"  Width="16" Height="16"  Fill="{Binding IsLowLevel, Converter={StaticResource boolToRedGreenColor}}"   Stroke="Gray"/>
 
             </Grid>
             <Grid Grid.Row="6" Grid.Column="0">

CyberX8_RT/Config/Devices/WagoControllerCfg-Simulator.xml

@@ -268,10 +268,10 @@
 			</DOGroup>
 			<DOGroup Name="28">
 				<DO Name="c_METAL4_PUMP_ON"  Address="550" Invert="false"/>
-				<DO Name="DO39"  Address="551" Invert="false"/>
+				<DO Name="c_RES1_POWER_ON"  Address="551" Invert="false"/>
 			</DOGroup>
 			<DOGroup Name="29">
-				<DO Name="c_RES1_POWER_ON"  Address="552" Invert="false"/>
+				<DO Name="DO40"  Address="552" Invert="false"/>
 				<DO Name="DO41"  Address="553" Invert="false"/>
 			</DOGroup>
 		</Dig_Out>
@@ -295,15 +295,15 @@
 				<AI Name="r_DI_WATER_PRESSURE"  Address="11" Scaling="0=0, 100=32767" DataType="short"/>
 			</AIGroup>
 			<AIGroup Name="4">
-				<AI Name="r_PUMP1_FLOW"  Address="12" Scaling="0=3276.7,40=16383.5" DataType="short"/>
+				<AI Name="r_PUMP1_FLOW"  Address="12" Scaling="0=0,40=32767" DataType="short"/>
 				<AI Name="AI13"  Address="13" Scaling="0=3276.7,40=16383.5" DataType="short"/>
-				<AI Name="r_PUMP2_FLOW"  Address="14" Scaling="0=3276.7,40=16383.5" DataType="short"/>
+				<AI Name="r_PUMP2_FLOW"  Address="14" Scaling="0=0,40=32767" DataType="short"/>
 				<AI Name="AI15"  Address="15" Scaling="0=3276.7,40=16383.5" DataType="short"/>
 			</AIGroup>
 			<AIGroup Name="5">
-				<AI Name="r_PUMP3_FLOW"  Address="16" Scaling="0=3276.7,40=16383.5" DataType="short"/>
+				<AI Name="r_PUMP3_FLOW"  Address="16" Scaling="0=0,40=32767" DataType="short"/>
 				<AI Name="AI17"  Address="17" Scaling="0=3276.7,40=16383.5" DataType="short"/>
-				<AI Name="r_PUMP4_FLOW"  Address="18" Scaling="0=3276.7,40=16383.5" DataType="short"/>
+				<AI Name="r_PUMP4_FLOW"  Address="18" Scaling="0=0,40=32767" DataType="short"/>
 				<AI Name="AI19"  Address="19" Scaling="0=3276.7,40=16383.5" DataType="short"/>
 			</AIGroup>
 			<AIGroup Name="6">
@@ -316,7 +316,7 @@
 				<AI Name="AI24"  Address="24" Scaling="0=3276.7,-757.5=16383.5" DataType="short"/>
 				<AI Name="AI25"  Address="25" Scaling="0=3276.7,-757.5=16383.5" DataType="short"/>
 				<AI Name="AI26"  Address="26" Scaling="13=0,150=32767" DataType="short"/>
-				<AI Name="r_MBS3_FLOW"  Address="27" Scaling="0=0,20=32767" DataType="short"/>
+				<AI Name="r_MBS3_FLOW"  Address="27" Scaling="0=0,40=32767" DataType="short"/>
 			</AIGroup>
 			<AIGroup Name="8">
 				<AI Name="r_QDRD1_WATER_LEVEL"  Address="28" Scaling="0=0,100=32767" DataType="short"/>

CyberX8_RT/Config/System.sccfg

@@ -475,6 +475,7 @@
 			<config default="24" name="DIValveMaxOnTimePeriod" nameView="DIValveMaxOnTimePeriod" description="DI Valve Max Time in period " max="48" min="0" paramter="" tag="" unit="hour" type="Double" />
 			<config default="10000" name="DIReplenMaxAccumulation" nameView="DIReplenMaxAccumulation" description="DI Valve Max Time in period " max="20000" min="0" paramter="" tag="" unit="mL" type="Double" />
 			<config default="95" name="HighLevel" nameView="HighLevel" description="High Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
+			<config default="30" name="LowLevel" nameView="LowLevel" description="Low Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
 			<config default="0,0,1.5022,94.782" name="LevelCurve" nameView="LevelCurve" description="Level curve" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="260" name="MaxTankVolume" nameView="MaxTankVolume" description="Maximum Tank volume" max="300" min="0" paramter="" tag="" unit="" type="Double" />
 			<config default="3" name="HEDFlowLowLimit" nameView="HEDFlowLowLimit" description="HED Flow Limit" max="30" min="0" paramter="" tag="" unit="" type="Double" />
@@ -502,6 +503,7 @@
 			<config default="24" name="DIValveMaxOnTimePeriod" nameView="DIValveMaxOnTimePeriod" description="DI Valve Max Time in period " max="48" min="0" paramter="" tag="" unit="hour" type="Double" />
 			<config default="10000" name="DIReplenMaxAccumulation" nameView="DIReplenMaxAccumulation" description="DI Valve Max Time in period " max="20000" min="0" paramter="" tag="" unit="mL" type="Double" />
 			<config default="95" name="HighLevel" nameView="HighLevel" description="High Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
+			<config default="30" name="LowLevel" nameView="LowLevel" description="Low Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
 			<config default="0,0,1.5022,94.782" name="LevelCurve" nameView="LevelCurve" description="Level curve" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="260" name="MaxTankVolume" nameView="MaxTankVolume" description="Maximum Tank volume" max="300" min="0" paramter="" tag="" unit="" type="Double" />
 			<config default="3" name="HEDFlowLowLimit" nameView="HEDFlowLowLimit" description="HED Flow Limit" max="30" min="0" paramter="" tag="" unit="" type="Double" />
@@ -531,6 +533,7 @@
 			<config default="24" name="DIValveMaxOnTimePeriod" nameView="DIValveMaxOnTimePeriod" description="DI Valve Max Time in period " max="48" min="0" paramter="" tag="" unit="hour" type="Double" />
 			<config default="10000" name="DIReplenMaxAccumulation" nameView="DIReplenMaxAccumulation" description="DI Valve Max Time in period " max="20000" min="0" paramter="" tag="" unit="mL" type="Double" />
 			<config default="95" name="HighLevel" nameView="HighLevel" description="High Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
+			<config default="30" name="LowLevel" nameView="LowLevel" description="Low Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
 			<config default="0,0,1.5022,94.782" name="LevelCurve" nameView="LevelCurve" description="Level curve" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="260" name="MaxTankVolume" nameView="MaxTankVolume" description="Maximum Tank volume" max="300" min="0" paramter="" tag="" unit="" type="Double" />
 			<config default="3" name="HEDFlowLowLimit" nameView="HEDFlowLowLimit" description="HED Flow Limit" max="30" min="0" paramter="" tag="" unit="" type="Double" />
@@ -570,6 +573,7 @@
 			<config default="24" name="DIValveMaxOnTimePeriod" nameView="DIValveMaxOnTimePeriod" description="DI Valve Max Time in period " max="48" min="0" paramter="" tag="" unit="hour" type="Double" />
 			<config default="10000" name="DIReplenMaxAccumulation" nameView="DIReplenMaxAccumulation" description="DI Valve Max Time in period " max="20000" min="0" paramter="" tag="" unit="mL" type="Double" />
 			<config default="95" name="HighLevel" nameView="HighLevel" description="High Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
+			<config default="30" name="LowLevel" nameView="LowLevel" description="Low Level" max="100" min="0" paramter="" tag="" unit="" type="Double" />
 			<config default="0,0,1.5022,94.782" name="LevelCurve" nameView="LevelCurve" description="Level curve" max="" min="" paramter="" tag="" unit="" type="String" />
 			<config default="260" name="MaxTankVolume" nameView="MaxTankVolume" description="Maximum Tank volume" max="300" min="0" paramter="" tag="" unit="" type="Double" />
 			<config default="3" name="HEDFlowLowLimit" nameView="HEDFlowLowLimit" description="HED Flow Limit" max="30" min="0" paramter="" tag="" unit="" type="Double" />

CyberX8_RT/Devices/Metal/StandardHotMetalDevice.cs

@@ -217,6 +217,7 @@ namespace CyberX8_RT.Devices.Metal
         }
         public bool ClosePump(string cmd, Object[] args)
         {
+
             bool result = false;
             result = PumpOffOperation(cmd, args);
             return result;
@@ -249,7 +250,13 @@ namespace CyberX8_RT.Devices.Metal
         /// <returns></returns>
         public bool PumpOffOperation(string cmd, object[] param)
         {
-            return PumpOff();
+            bool result = true;
+            if (MetalDeviceData.CellPump)
+            {
+                result = PumpOff();
+            }
+            return result;
+            //return PumpOff();
         }
         /// <summary>
         /// Pump Off

CyberX8_RT/Devices/Reservoir/StandardHotReservoirDevice.cs

@@ -330,40 +330,11 @@ namespace CyberX8_RT.Devices.Reservoir
             {
                 device.OnTimer(_periodicJob.Interval);
             }
-
-
-            ReservoirEntity reservoirEntity = Singleton<RouteManager>.Instance.GetModule<ReservoirEntity>(Module);
-            //报错停DosingSystem
-            //if (_replenType != "" && _replenNum != 0 && reservoirEntity != null && reservoirEntity.IsError)
-            //{
-            //    for (int i = 0; i < _replenNum; i++)
-            //    {
-            //        string replenName = "Replen" + (i + 1).ToString();
-            //        if (_replenPersistentValue[replenName].IsDosingRunning)
-            //        {
-            //            _dosingSystemHelperLst[i].StopDosing();
-            //            _currentDosingOperation[i] = DosingOperation.None;
-            //        }
-            //    }
-            //}
-
             /// <summary>
             /// WaterLevelMonitor
             /// </summary>
             WaterLevelMonitor();
 
-            //触发Safetyhigh将reservoir切成error
-            SafetyDevice safetyDevice = DEVICE.GetDevice<SafetyDevice>("Safety");
-            if (safetyDevice != null && safetyDevice.SafetyData.ReservoirHighLevel && !_isSafetyHigh)
-            {
-                _isSafetyHigh = true;
-                LOG.WriteLog(eEvent.ERR_RESERVOIR, Module, $"Safety high is Activate");
-                reservoirEntity.PostMsg(ReservoirMsg.Error);
-            }
-            else
-            {
-                _isSafetyHigh = false;
-            }
             //DIReplen
             if (_direplenHelper != null)
             {
@@ -397,7 +368,7 @@ namespace CyberX8_RT.Devices.Reservoir
                     }
                 }
             }
-
+            ReservoirEntity reservoirEntity = Singleton<RouteManager>.Instance.GetModule<ReservoirEntity>(Module);
             if (reservoirEntity == null || !reservoirEntity.IsInitialized)
             {
                 return true;
@@ -405,8 +376,6 @@ namespace CyberX8_RT.Devices.Reservoir
 
             if (_persistentValue.OperatingMode == AUTO)
             {
-                
-                
                 CAFlowRateCheck();
                 TemperatureCheck();
                 CMMPowerCheck();
@@ -516,7 +485,7 @@ namespace CyberX8_RT.Devices.Reservoir
             ReservoirEntity reservoirEntity = Singleton<RouteManager>.Instance.GetModule<ReservoirEntity>(Module);
             _isSystemAutoMode = reservoirEntity.IsAuto;
             //触发水位过高或者过低将reservoir切成error
-            if (!_reservoirData.LowLevel)
+            if (ReservoirData.WaterLevel < SC.GetValue<double>($"Reservoir.{Module}.LowLevel"))
             {
                 if (!errorLogSet.Contains($"{Module}.WaterLevel"))
                 {
@@ -1516,7 +1485,6 @@ namespace CyberX8_RT.Devices.Reservoir
         {
             ReservoirEntity reservoirEntity = Singleton<RouteManager>.Instance.GetModule<ReservoirEntity>(Module);
             ReservoirItem _reservoirItem = ReservoirItemManager.Instance.GetReservoirItem(Module.ToString());
-
             if (!string.IsNullOrEmpty(_reservoirItem.CMMSupplyID))
             {
                 CellPowerSupplier _powerSupplier = DEVICE.GetDevice<CellPowerSupplier>(_reservoirItem.CMMSupplyID);

CyberX8_Simulator/Devices/WagoSocketSimulator.cs

@@ -445,10 +445,10 @@ namespace CyberX8_Simulator.Devices
             if (DINameIndexDic.ContainsKey("r_SRD2_WAFER_PRESENT")) DIBytes[DINameIndexDic["r_SRD2_WAFER_PRESENT"]] = 1;
             if (AINameIndexDic.ContainsKey("r_SRD_SUPPLY_WATER_PRESS")) AIShorts[AINameIndexDic["r_SRD_SUPPLY_WATER_PRESS"]] = 20000;
             //Metal
-            if (AINameIndexDic.ContainsKey("r_PUMP4_FLOW")) AIShorts[AINameIndexDic["r_PUMP4_FLOW"]] = 3277;
-            if (AINameIndexDic.ContainsKey("r_PUMP3_FLOW")) AIShorts[AINameIndexDic["r_PUMP3_FLOW"]] = 3277;
-            if (AINameIndexDic.ContainsKey("r_PUMP2_FLOW")) AIShorts[AINameIndexDic["r_PUMP2_FLOW"]] = 3277;
-            if (AINameIndexDic.ContainsKey("r_PUMP1_FLOW")) AIShorts[AINameIndexDic["r_PUMP1_FLOW"]] = 3277;
+            if (AINameIndexDic.ContainsKey("r_PUMP4_FLOW")) AIShorts[AINameIndexDic["r_PUMP4_FLOW"]] = 0;
+            if (AINameIndexDic.ContainsKey("r_PUMP3_FLOW")) AIShorts[AINameIndexDic["r_PUMP3_FLOW"]] = 0;
+            if (AINameIndexDic.ContainsKey("r_PUMP2_FLOW")) AIShorts[AINameIndexDic["r_PUMP2_FLOW"]] = 0;
+            if (AINameIndexDic.ContainsKey("r_PUMP1_FLOW")) AIShorts[AINameIndexDic["r_PUMP1_FLOW"]] = 0;
 
             //Facility
             if (AINameIndexDic.ContainsKey("r_DI_WATER_PRESSURE")) AIShorts[AINameIndexDic["r_DI_WATER_PRESSURE"]] = 12000;
@@ -464,6 +464,12 @@ namespace CyberX8_Simulator.Devices
             if (AINameIndexDic.ContainsKey("r_pH3")) AIShorts[AINameIndexDic["r_pH3"]] = 15000;
             if (AINameIndexDic.ContainsKey("r_MBS3_FLOW")) AIShorts[AINameIndexDic["r_MBS3_FLOW"]] = 16000;
 
+            //Reservoie Level Law
+            if (AINameIndexDic.ContainsKey("r_RES1_LEVEL_raw")) AIShorts[AINameIndexDic["r_RES1_LEVEL_raw"]] = 10000;
+            if (AINameIndexDic.ContainsKey("r_RES2_LEVEL_raw")) AIShorts[AINameIndexDic["r_RES2_LEVEL_raw"]] = 10000;
+            if (AINameIndexDic.ContainsKey("r_RES3_LEVEL_raw")) AIShorts[AINameIndexDic["r_RES3_LEVEL_raw"]] = 10000;
+            if (AINameIndexDic.ContainsKey("r_RES4_LEVEL_raw")) AIShorts[AINameIndexDic["r_RES4_LEVEL_raw"]] = 10000;
+
         }
         #region 公共方法
         public void UpdataDOBytes(string name,int value)
@@ -882,7 +888,7 @@ namespace CyberX8_Simulator.Devices
             }
 
             //reservoir1 pump flow
-            AIShorts[AINameIndexDic["r_PUMP1_FLOW"]] = _reservoir1PumpOn ? (short)6000 : (short)3277;
+            AIShorts[AINameIndexDic["r_PUMP1_FLOW"]] = _reservoir1PumpOn ? (short)6000 : (short)0;
         
         }
         /// <summary>
@@ -896,7 +902,7 @@ namespace CyberX8_Simulator.Devices
             }
             else
             {
-                AIShorts[AINameIndexDic["r_PUMP3_FLOW"]] = 3277;
+                AIShorts[AINameIndexDic["r_PUMP3_FLOW"]] = 0;
             }
 
             if (DOBytes[DONameIndexDic["c_METAL2_PUMP_ON"]] == 1)
@@ -905,7 +911,7 @@ namespace CyberX8_Simulator.Devices
             }
             else
             {
-                AIShorts[AINameIndexDic["r_PUMP2_FLOW"]] = 3277;
+                AIShorts[AINameIndexDic["r_PUMP2_FLOW"]] = 0;
             }
 
             if (DOBytes[DONameIndexDic["c_METAL4_PUMP_ON"]] == 1)
@@ -914,7 +920,7 @@ namespace CyberX8_Simulator.Devices
             }
             else
             {
-                AIShorts[AINameIndexDic["r_PUMP4_FLOW"]] = 3277;
+                AIShorts[AINameIndexDic["r_PUMP4_FLOW"]] = 0;
             }
         }
         /// <summary>

CyberX8_UI/Config/UIMenu.json

@@ -314,8 +314,8 @@
 					},
 					{
 						"Id": "ReservoirCmmPowerSupplier02",
-						"ModuleName": "Reservoir2",
-						"Name": "Reservoir2",
+						"ModuleName": "Reservoir3",
+						"Name": "Reservoir3",
 						"IsInit": "true",
 						"IsShow": "true",
 						"View": "CMMPowerSupplierView"