|
@@ -19,6 +19,7 @@ using Venus_Unity;
|
|
using MECF.Framework.Common.CommonData.DeviceData;
|
|
using MECF.Framework.Common.CommonData.DeviceData;
|
|
using System.Windows.Shapes;
|
|
using System.Windows.Shapes;
|
|
using Path = System.IO.Path;
|
|
using Path = System.IO.Path;
|
|
|
|
+using MECF.Framework.Common.Equipment;
|
|
|
|
|
|
namespace Venus_MainPages.ViewModels
|
|
namespace Venus_MainPages.ViewModels
|
|
{
|
|
{
|
|
@@ -138,12 +139,23 @@ namespace Venus_MainPages.ViewModels
|
|
private string m_SelectedRecipe;
|
|
private string m_SelectedRecipe;
|
|
|
|
|
|
private float m_ChillerTempSetpoint;
|
|
private float m_ChillerTempSetpoint;
|
|
|
|
+
|
|
|
|
+ private float m_InnerChillerTempSetpoint;
|
|
|
|
+ private float m_OuterChillerTempSetpoint;
|
|
|
|
+ private float m_TopChillerTempSetpoint;
|
|
|
|
+
|
|
private float m_WallTempSetpoint;
|
|
private float m_WallTempSetpoint;
|
|
|
|
|
|
private bool m_HeIsPressureMode=true;
|
|
private bool m_HeIsPressureMode=true;
|
|
|
|
|
|
private bool m_ChillerIsOn;
|
|
private bool m_ChillerIsOn;
|
|
|
|
|
|
|
|
+ private bool m_InnerChillerIsOn;
|
|
|
|
+ private bool m_OuterChillerIsOn;
|
|
|
|
+ private bool m_TopChillerIsOn;
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
private float m_ProcessHighPressure;
|
|
private float m_ProcessHighPressure;
|
|
private float m_ProcessLowPressure;
|
|
private float m_ProcessLowPressure;
|
|
private float m_ForelinePressurePressure;
|
|
private float m_ForelinePressurePressure;
|
|
@@ -161,6 +173,11 @@ namespace Venus_MainPages.ViewModels
|
|
private bool m_IsLidClosed;
|
|
private bool m_IsLidClosed;
|
|
|
|
|
|
private float m_ChillerTemperature;
|
|
private float m_ChillerTemperature;
|
|
|
|
+
|
|
|
|
+ private float m_InnerTemperature;
|
|
|
|
+ private float m_OuterTemperature;
|
|
|
|
+ private float m_TopTemperature;
|
|
|
|
+
|
|
//private float m_HVTemperature;
|
|
//private float m_HVTemperature;
|
|
|
|
|
|
|
|
|
|
@@ -308,6 +325,30 @@ namespace Venus_MainPages.ViewModels
|
|
SetProperty(ref m_ChillerTemperature, value);
|
|
SetProperty(ref m_ChillerTemperature, value);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ public float InnerTemperature
|
|
|
|
+ {
|
|
|
|
+ get { return m_InnerTemperature; }
|
|
|
|
+ set
|
|
|
|
+ {
|
|
|
|
+ SetProperty(ref m_InnerTemperature, value);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ public float OuterTemperature
|
|
|
|
+ {
|
|
|
|
+ get { return m_OuterTemperature; }
|
|
|
|
+ set
|
|
|
|
+ {
|
|
|
|
+ SetProperty(ref m_OuterTemperature, value);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ public float TopTemperature
|
|
|
|
+ {
|
|
|
|
+ get { return m_TopTemperature; }
|
|
|
|
+ set
|
|
|
|
+ {
|
|
|
|
+ SetProperty(ref m_TopTemperature, value);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
//public float HVTemperature
|
|
//public float HVTemperature
|
|
//{
|
|
//{
|
|
// get { return m_HVTemperature; }
|
|
// get { return m_HVTemperature; }
|
|
@@ -849,6 +890,22 @@ namespace Venus_MainPages.ViewModels
|
|
set { SetProperty(ref m_ChillerTempSetpoint, value); }
|
|
set { SetProperty(ref m_ChillerTempSetpoint, value); }
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public float InnerChillerTempSetpoint
|
|
|
|
+ {
|
|
|
|
+ get { return m_InnerChillerTempSetpoint; }
|
|
|
|
+ set { SetProperty(ref m_InnerChillerTempSetpoint, value); }
|
|
|
|
+ }
|
|
|
|
+ public float OuterChillerTempSetpoint
|
|
|
|
+ {
|
|
|
|
+ get { return m_OuterChillerTempSetpoint; }
|
|
|
|
+ set { SetProperty(ref m_OuterChillerTempSetpoint, value); }
|
|
|
|
+ }
|
|
|
|
+ public float TopChillerTempSetpoint
|
|
|
|
+ {
|
|
|
|
+ get { return m_TopChillerTempSetpoint; }
|
|
|
|
+ set { SetProperty(ref m_TopChillerTempSetpoint, value); }
|
|
|
|
+ }
|
|
|
|
+
|
|
public float WallTempSetpoint
|
|
public float WallTempSetpoint
|
|
{
|
|
{
|
|
get { return m_WallTempSetpoint; }
|
|
get { return m_WallTempSetpoint; }
|
|
@@ -1367,8 +1424,7 @@ namespace Venus_MainPages.ViewModels
|
|
{
|
|
{
|
|
AITHeaterData heaterData = obj as AITHeaterData;
|
|
AITHeaterData heaterData = obj as AITHeaterData;
|
|
var _mainWindow = Application.Current.Windows.Cast<Window>().FirstOrDefault(window => window is Window) as Window;
|
|
var _mainWindow = Application.Current.Windows.Cast<Window>().FirstOrDefault(window => window is Window) as Window;
|
|
-
|
|
|
|
- heaterView = new HeaterView(heaterData);
|
|
|
|
|
|
+ heaterView = new HeaterView(heaterData, ModuleName);
|
|
heaterView.WindowStartupLocation = WindowStartupLocation.CenterScreen;
|
|
heaterView.WindowStartupLocation = WindowStartupLocation.CenterScreen;
|
|
heaterView.Owner = _mainWindow;
|
|
heaterView.Owner = _mainWindow;
|
|
heaterView.Show();
|
|
heaterView.Show();
|
|
@@ -1502,6 +1558,11 @@ namespace Venus_MainPages.ViewModels
|
|
|
|
|
|
ChillerTemperature = float.Parse(RtDataValues[$"{ModuleName}.Chiller.Temp"].ToString());
|
|
ChillerTemperature = float.Parse(RtDataValues[$"{ModuleName}.Chiller.Temp"].ToString());
|
|
|
|
|
|
|
|
+ InnerTemperature = float.Parse(RtDataValues[$"{ModuleName}.ChillerInnerTemp"].ToString());
|
|
|
|
+ OuterTemperature = float.Parse(RtDataValues[$"{ModuleName}.ChillerOuterTemp"].ToString());
|
|
|
|
+ TopTemperature = float.Parse(RtDataValues[$"{ModuleName}.ChillerTopTemp"].ToString());
|
|
|
|
+
|
|
|
|
+
|
|
//HVTemperature = float.Parse(RtDataValues[$"{ModuleName}.{VenusDevice.ESCHV}.Temp"].ToString());
|
|
//HVTemperature = float.Parse(RtDataValues[$"{ModuleName}.{VenusDevice.ESCHV}.Temp"].ToString());
|
|
|
|
|
|
|
|
|
|
@@ -1670,6 +1731,12 @@ namespace Venus_MainPages.ViewModels
|
|
m_RtDataKeys.Add($"{ModuleName}.HasWafer");
|
|
m_RtDataKeys.Add($"{ModuleName}.HasWafer");
|
|
m_RtDataKeys.Add($"{ModuleName}.CurrentRecipeResult");
|
|
m_RtDataKeys.Add($"{ModuleName}.CurrentRecipeResult");
|
|
|
|
|
|
|
|
+ m_RtDataKeys.Add($"{ModuleName}.ChillerInnerTemp");
|
|
|
|
+ m_RtDataKeys.Add($"{ModuleName}.ChillerOuterTemp");
|
|
|
|
+ m_RtDataKeys.Add($"{ModuleName}.ChillerTopTemp");
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
}
|
|
}
|
|
#endregion
|
|
#endregion
|