ソースを参照

add reservoir period log

chenzk 1 週間 前
コミット
e91f50bc3c
共有2 個のファイルを変更した55 個の追加25 個の削除を含む
  1. 41 11
      CyberX8_RT/Devices/Reservoir/StandardHotReservoirDevice.cs
  2. 14 14
      CyberX8_Simulator/Config/UILayout.xml

+ 41 - 11
CyberX8_RT/Devices/Reservoir/StandardHotReservoirDevice.cs

@@ -296,6 +296,10 @@ namespace CyberX8_RT.Devices.Reservoir
         {
             get { return _diReplenMaxTimeOut; }
         }
+        /// <summary>
+        /// 每隔30秒打印槽体相关的信息
+        /// </summary>
+        private DateTime _periodLogTime;
         #endregion
         /// <summary>
         /// 初始化成功清除对应的错误log
@@ -331,7 +335,7 @@ namespace CyberX8_RT.Devices.Reservoir
 
             ClearErrorLogSet(Module.ToString());//软件启动的时候也清一下ErrorLogSet
 
-      
+            _periodLogTime = DateTime.Now;
         }
         /// <summary>
         /// 定时器
@@ -339,6 +343,32 @@ namespace CyberX8_RT.Devices.Reservoir
         /// <returns></returns>
         private bool OnTimer()
         {
+            if ((DateTime.Now - _periodLogTime).TotalSeconds > 30)
+            {
+                _periodLogTime = DateTime.Now;
+
+                double temp = 0;
+                ReservoirItem reservoirItem = ReservoirItemManager.Instance.GetReservoirItem(Module.ToString());
+                if (reservoirItem != null)
+                {
+                    TemperatureController temperatureController = DEVICE.GetDevice<TemperatureController>(reservoirItem.TCID);
+                    if (temperatureController != null)
+                    {
+                        temp = temperatureController.TemperatureData.ReserviorTemperature;
+                    }
+                }
+                for (int i = 0; i < _metalDevices.Count; i++)
+                {
+                    StandardHotMetalDevice hotMetalDevice = _metalDevices[i];
+                    if (hotMetalDevice != null)
+                    {
+                        LOG.WriteLog(eEvent.INFO_METAL, hotMetalDevice.Name, $"CA Flow:{hotMetalDevice.MetalDeviceData.CellFlow} L/min");
+                    }
+                }
+                LOG.WriteLog(eEvent.INFO_RESERVOIR, Module, $"{Module} PH :{_reservoirData.PHValue},  " +
+                                $"Temp:{temp}C  " +
+                                $"CALevel = {_reservoirData.Level}L  ");
+            }
 
             //计算AN/CA level的平均值
             if (ReservoirData != null)
@@ -404,11 +434,11 @@ namespace CyberX8_RT.Devices.Reservoir
                             if (result)
                             {
                                 //补水完成打印日志
-                                LOG.WriteLog(eEvent.INFO_RESERVOIR, Module, $"{Module} CADIReplen State :False," +
-                                $"SetPoint ={Recipe.CAFlowSetPoint}" +
-                                $"Level = {_reservoirData.Level}" +
-                                $"HighLimit={Recipe.CALevelErrorHigh}" +
-                                $"LowLimit={Recipe.CALevelErrorLow}");
+                                LOG.WriteLog(eEvent.INFO_RESERVOIR, Module, $"{Module} CADIReplen State :False,  " +
+                                $"SetPoint = {Recipe.CAFlowSetPoint}  " +
+                                $"Level = {_reservoirData.Level}  " +
+                                $"HighLimit = {Recipe.CALevelErrorHigh}  " +
+                                $"LowLimit = {Recipe.CALevelErrorLow}  ");
                                 _currentOperation = ReservoirOperation.None;
                             }
                         }
@@ -1485,11 +1515,11 @@ namespace CyberX8_RT.Devices.Reservoir
             bool result = DIReplenOn(false);
             if (result)
             {
-                LOG.WriteLog(eEvent.INFO_RESERVOIR, Module, $"{Module} CADIReplen State :True," +
-                $"SetPoint ={Recipe.CAFlowSetPoint}" +
-                $"Level = {_reservoirData.Level}" +
-                $"HighLimit={Recipe.CALevelErrorHigh}" +
-                $"LowLimit={Recipe.CALevelErrorLow}");
+                LOG.WriteLog(eEvent.INFO_RESERVOIR, Module, $"{Module} CADIReplen State :True,  " +
+                $"SetPoint = {Recipe.CAFlowSetPoint}  " +
+                $"Level = {_reservoirData.Level}  " +
+                $"HighLimit = {Recipe.CALevelErrorHigh}  " +
+                $"LowLimit = {Recipe.CALevelErrorLow}  ");
                 _currentOperation = ReservoirOperation.AutoDiReplen;
                 _persistentValue.DiReplenTime = DateTime.Now;
             }

+ 14 - 14
CyberX8_Simulator/Config/UILayout.xml

@@ -31,20 +31,20 @@
 	
 	<Navigation Id="Power" Name="Power" >		
 		<SubView Id="Power1" Name="Power1" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="820"/>
-		<SubView Id="Power2" Name="Power2" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8211"/>
-		<SubView Id="Power3" Name="Power3" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8221"/>
-		<SubView Id="Power4" Name="Power4" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8231"/>
-		<SubView Id="Power5" Name="Power5" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8241"/>
-		<SubView Id="Power6" Name="Power6" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8251"/>
-		<SubView Id="Power7" Name="Power7" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8261"/>
-		<SubView Id="Power8" Name="Power8" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8271"/>
-		<SubView Id="Power9" Name="Power9" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8281"/>
-		<SubView Id="Power10" Name="Power10" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8291"/>
-		<SubView Id="Power11" Name="Power11" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8311"/>
-		<SubView Id="Power12" Name="Power12" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8321"/>
-		<SubView Id="Power13" Name="Power13" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8331"/>
-		<SubView Id="Power14" Name="Power14" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8341"/>
-		<SubView Id="CMMPower1" Name="CMMPower1" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="8351"/>
+		<SubView Id="Power2" Name="Power2" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="821"/>
+		<SubView Id="Power3" Name="Power3" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="822"/>
+		<SubView Id="Power4" Name="Power4" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="823"/>
+		<SubView Id="Power5" Name="Power5" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="824"/>
+		<SubView Id="Power6" Name="Power6" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="825"/>
+		<SubView Id="Power7" Name="Power7" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="826"/>
+		<SubView Id="Power8" Name="Power8" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="827"/>
+		<SubView Id="Power9" Name="Power9" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="828"/>
+		<SubView Id="Power10" Name="Power10" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="829"/>
+		<SubView Id="Power11" Name="Power11" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="831"/>
+		<SubView Id="Power12" Name="Power12" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="832"/>
+		<SubView Id="Power13" Name="Power13" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="833"/>
+		<SubView Id="Power14" Name="Power14" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="834"/>
+		<SubView Id="CMMPower1" Name="CMMPower1" ViewClass="CyberX8_Simulator.Views.PowerSupplierView" Assembly="CyberX8_Simulator" Port="835"/>
 	</Navigation>
 
 	<Navigation Id="Temperature" Name="Temperature" >