|
@@ -968,15 +968,11 @@ namespace Venus_MainPages.ViewModels
|
|
#region 构造函数
|
|
#region 构造函数
|
|
public OverViewModel()
|
|
public OverViewModel()
|
|
{
|
|
{
|
|
- //RTData.init();
|
|
|
|
- //m_RtConfigKeys = new List<string>();
|
|
|
|
m_RtDataKeys = new List<string>();
|
|
m_RtDataKeys = new List<string>();
|
|
|
|
|
|
m_IsATM = true;
|
|
m_IsATM = true;
|
|
|
|
|
|
ModuleName = "PMA";
|
|
ModuleName = "PMA";
|
|
- //addConfigKeys();
|
|
|
|
- //addDataKeys();
|
|
|
|
|
|
|
|
CurrentModuleRecipes = GetFilesNames(Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", ModuleName)).ToList();
|
|
CurrentModuleRecipes = GetFilesNames(Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", ModuleName)).ToList();
|
|
|
|
|
|
@@ -1005,12 +1001,6 @@ namespace Venus_MainPages.ViewModels
|
|
{
|
|
{
|
|
await Task.Run(async () =>
|
|
await Task.Run(async () =>
|
|
{
|
|
{
|
|
- //if (GasIsFlowing==true)
|
|
|
|
- //{
|
|
|
|
- // InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{RtOperation.Abort}");
|
|
|
|
- //}
|
|
|
|
- //else
|
|
|
|
- //{
|
|
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas1.SetPoint", MFC1SetPoint);
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas1.SetPoint", MFC1SetPoint);
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas2.SetPoint", MFC2SetPoint);
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas2.SetPoint", MFC2SetPoint);
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas3.SetPoint", MFC3SetPoint);
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas3.SetPoint", MFC3SetPoint);
|
|
@@ -1023,10 +1013,7 @@ namespace Venus_MainPages.ViewModels
|
|
await Task.Delay(1000);
|
|
await Task.Delay(1000);
|
|
object[] mfc = new object[8];
|
|
object[] mfc = new object[8];
|
|
string[] mfcSetPoint = new string[8];
|
|
string[] mfcSetPoint = new string[8];
|
|
- //for (int index = 0; index < mfc.Length; index++)
|
|
|
|
- //{
|
|
|
|
- // mfc[index] = RtDataValues[$"{ModuleName}.MfcGas{index + 1}.SetPoint"];
|
|
|
|
- //}
|
|
|
|
|
|
+
|
|
mfc[0] = MFC1Data.SetPoint;
|
|
mfc[0] = MFC1Data.SetPoint;
|
|
mfc[1] = MFC2Data.SetPoint;
|
|
mfc[1] = MFC2Data.SetPoint;
|
|
mfc[2] = MFC3Data.SetPoint;
|
|
mfc[2] = MFC3Data.SetPoint;
|
|
@@ -1036,16 +1023,8 @@ namespace Venus_MainPages.ViewModels
|
|
mfc[6] = MFC7Data.SetPoint;
|
|
mfc[6] = MFC7Data.SetPoint;
|
|
mfc[7] = MFC8Data.SetPoint;
|
|
mfc[7] = MFC8Data.SetPoint;
|
|
|
|
|
|
- //if (((Math.Abs((double)mfc[0] - (double)_oldmfc[0]) < 0.01) && (Math.Abs((double)mfc[1] - (double)_oldmfc[1]) < 0.01) && (Math.Abs((double)mfc[2] - (double)_oldmfc[2])) < 0.01)
|
|
|
|
- // || ((Math.Abs((double)mfc[0]) <= 0.01 && Math.Abs((double)mfc[1]) <= 0.01 && Math.Abs((double)mfc[2]) <= 0.01)))
|
|
|
|
- //{
|
|
|
|
- // InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{RtOperation.Abort}");
|
|
|
|
- // return;
|
|
|
|
- //}
|
|
|
|
-
|
|
|
|
- //_oldmfc = mfc;
|
|
|
|
- InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{RtOperation.GasFlow}", mfc);
|
|
|
|
- //}
|
|
|
|
|
|
+ InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{RtOperation.GasFlow}", mfc);
|
|
|
|
+
|
|
});
|
|
});
|
|
|
|
|
|
|
|
|
|
@@ -1234,7 +1213,6 @@ namespace Venus_MainPages.ViewModels
|
|
|
|
|
|
private async void OnSetSRf()
|
|
private async void OnSetSRf()
|
|
{
|
|
{
|
|
- //if (!GasIsFlowing == true) return;
|
|
|
|
|
|
|
|
if (SRFIsOn == true)
|
|
if (SRFIsOn == true)
|
|
{
|
|
{
|
|
@@ -1243,19 +1221,12 @@ namespace Venus_MainPages.ViewModels
|
|
else
|
|
else
|
|
{
|
|
{
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{VenusDevice.Match}.{AITRfOperation.SetMatchPosition}", SRFMatchC1, SRFMatchC2);
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{VenusDevice.Match}.{AITRfOperation.SetMatchPosition}", SRFMatchC1, SRFMatchC2);
|
|
- //InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{VenusDevice.Match}.{AITRfOperation.SetMatchPositionC2}", SRFMatchC2);
|
|
|
|
- var t = Task.Run(async delegate
|
|
|
|
- {
|
|
|
|
- await Task.Delay(100);
|
|
|
|
- return 42;
|
|
|
|
- });
|
|
|
|
- await t;
|
|
|
|
|
|
+ await Task.Delay(100);
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetSRf", SRFFwdPowerSetpoint, true);
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetSRf", SRFFwdPowerSetpoint, true);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
private async void OnSetBRf()
|
|
private async void OnSetBRf()
|
|
{
|
|
{
|
|
- //if (!GasIsFlowing == true) return;
|
|
|
|
|
|
|
|
if (BRFIsOn == true)
|
|
if (BRFIsOn == true)
|
|
{
|
|
{
|
|
@@ -1265,14 +1236,7 @@ namespace Venus_MainPages.ViewModels
|
|
else
|
|
else
|
|
{
|
|
{
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{VenusDevice.BiasMatch}.{AITRfOperation.SetMatchPosition}", BRFMatchC1,BRFMatchC2);
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{VenusDevice.BiasMatch}.{AITRfOperation.SetMatchPosition}", BRFMatchC1,BRFMatchC2);
|
|
- //InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{VenusDevice.BiasMatch}.{AITRfOperation.SetMatchPositionC2}", BRFMatchC2);
|
|
|
|
- //Thread.Sleep(100);
|
|
|
|
- var t = Task.Run(async delegate
|
|
|
|
- {
|
|
|
|
- await Task.Delay(100);
|
|
|
|
- return 42;
|
|
|
|
- });
|
|
|
|
- await t;
|
|
|
|
|
|
+ await Task.Delay(100);
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetBRf", BRFFwdPowerSetpoint, true);
|
|
InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetBRf", BRFFwdPowerSetpoint, true);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1328,24 +1292,6 @@ namespace Venus_MainPages.ViewModels
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- //private void OnSetMatchMode(object obj)
|
|
|
|
- //{
|
|
|
|
- // switch (obj.ToString())
|
|
|
|
- // {
|
|
|
|
- // case "SRFManual":
|
|
|
|
- // InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{VenusDevice.Match.ToString()}.{AITRfOperation.SetMatchProcessMode}", EnumRfMatchTuneMode.Manual.ToString());
|
|
|
|
- // break;
|
|
|
|
- // case "SRFAuto":
|
|
|
|
- // InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{VenusDevice.Match.ToString()}.{AITRfOperation.SetMatchProcessMode}", EnumRfMatchTuneMode.Auto.ToString());
|
|
|
|
- // break;
|
|
|
|
- // case "BRFManual":
|
|
|
|
- // InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{VenusDevice.BiasMatch.ToString()}.{AITRfOperation.SetMatchProcessMode}", EnumRfMatchTuneMode.Manual.ToString());
|
|
|
|
- // break;
|
|
|
|
- // case "BRFAuto":
|
|
|
|
- // InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{VenusDevice.BiasMatch.ToString()}.{AITRfOperation.SetMatchProcessMode}", EnumRfMatchTuneMode.Auto.ToString());
|
|
|
|
- // break;
|
|
|
|
- // }
|
|
|
|
- //}
|
|
|
|
|
|
|
|
private void OnRunRecipe(object obj)
|
|
private void OnRunRecipe(object obj)
|
|
{
|
|
{
|
|
@@ -1430,42 +1376,37 @@ namespace Venus_MainPages.ViewModels
|
|
MFC6ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveMfc6.IsOpen");
|
|
MFC6ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveMfc6.IsOpen");
|
|
MFC7ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveMfc7.IsOpen");
|
|
MFC7ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveMfc7.IsOpen");
|
|
MFC8ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveMfc8.IsOpen");
|
|
MFC8ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveMfc8.IsOpen");
|
|
- N2ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveN2.IsOpen");
|
|
|
|
- SoftPumpValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveSoftPump.IsOpen"];
|
|
|
|
- FastPumpValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveFastPump.IsOpen"];
|
|
|
|
- GuageValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveGuage.IsOpen"];
|
|
|
|
- PVHe1ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVHe1.IsOpen"];
|
|
|
|
- PVHe2ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVHe2.IsOpen"];
|
|
|
|
- PVN21ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVN21.IsOpen"];
|
|
|
|
- PVN22ValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValvePVN22.IsOpen"];
|
|
|
|
- TurboPumpPumpingValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveTurboPumpPumping.IsOpen"];
|
|
|
|
- TurboPumpPurgeValveIsOpen = (bool)RtDataValues[$"{ModuleName}.ValveTurboPumpPurge.IsOpen"];
|
|
|
|
-
|
|
|
|
- HVIsOn = (bool)RtDataValues[$"{ModuleName}.ESCHV.IsOn"];
|
|
|
|
-
|
|
|
|
- PumpIsOpen = (bool)RtDataValues[$"{ModuleName}.PumpIsRunning"];
|
|
|
|
- TurboIsOpen = (bool)RtDataValues[$"{ModuleName}.TurboPumpIsRunning"];
|
|
|
|
-
|
|
|
|
- //BRFIsOn = (bool)RtDataValues[$"{ModuleName}.BRfIsOn"];
|
|
|
|
- //SRFIsOn = (bool)RtDataValues[$"{ModuleName}.SRfIsOn"];
|
|
|
|
- LiftPinIsUp= (bool)RtDataValues[$"{ModuleName}.LiftPinIsUp"];
|
|
|
|
- IsSlitDoorClosed = (bool)RtDataValues[$"{ModuleName}.IsSlitDoorClosed"];
|
|
|
|
- IsLidClosed = (bool)RtDataValues[$"{ModuleName}.IsLidClosed"];
|
|
|
|
|
|
+ N2ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveN2.IsOpen");
|
|
|
|
+ SoftPumpValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveSoftPump.IsOpen");
|
|
|
|
+ FastPumpValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveFastPump.IsOpen");
|
|
|
|
+ GuageValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveGuage.IsOpen");
|
|
|
|
+ PVHe1ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValvePVHe1.IsOpen");
|
|
|
|
+ PVHe2ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValvePVHe2.IsOpen");
|
|
|
|
+ PVN21ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValvePVN21.IsOpen");
|
|
|
|
+ PVN22ValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValvePVN22.IsOpen");
|
|
|
|
+ TurboPumpPumpingValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveTurboPumpPumping.IsOpen");
|
|
|
|
+ TurboPumpPurgeValveIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ValveTurboPumpPurge.IsOpen");
|
|
|
|
+
|
|
|
|
+ HVIsOn = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.ESCHV.IsOn");
|
|
|
|
+
|
|
|
|
+ PumpIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.PumpIsRunning");
|
|
|
|
+ TurboIsOpen = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.TurboPumpIsRunning");
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ LiftPinIsUp= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.LiftPinIsUp");
|
|
|
|
+ IsSlitDoorClosed = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsSlitDoorClosed");
|
|
|
|
+ IsLidClosed = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsLidClosed");
|
|
|
|
|
|
PendulumValvePosition = CommonFunction.GetValue<float>(RtDataValues,$"{ModuleName}.GetPVPosition");
|
|
PendulumValvePosition = CommonFunction.GetValue<float>(RtDataValues,$"{ModuleName}.GetPVPosition");
|
|
TurboPumpRotationalSpeed = Convert.ToInt32( RtDataValues[$"{ModuleName}.TurboPumpRotationalSpeed"].ToString());
|
|
TurboPumpRotationalSpeed = Convert.ToInt32( RtDataValues[$"{ModuleName}.TurboPumpRotationalSpeed"].ToString());
|
|
|
|
|
|
PositionValue = -((int)((PendulumValvePosition) * 0.09));
|
|
PositionValue = -((int)((PendulumValvePosition) * 0.09));
|
|
|
|
|
|
-
|
|
|
|
- PMState currentState = (PMState)Enum.Parse(typeof(PMState), RtDataValues[$"{ModuleName}.FsmState"].ToString());
|
|
|
|
- if (PMCurrentState != currentState)
|
|
|
|
- {
|
|
|
|
- PMCurrentState = currentState;
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
+ PMCurrentState = (PMState)Enum.Parse(typeof(PMState), RtDataValues[$"{ModuleName}.FsmState"].ToString());
|
|
|
|
+
|
|
GasIsFlowing = PMCurrentState == PMState.GasFlowing;
|
|
GasIsFlowing = PMCurrentState == PMState.GasFlowing;
|
|
|
|
|
|
- //MFC1Data = (AITMfcData)RtDataValues[$"{ModuleName}.MfcGas1"];
|
|
|
|
MFC1Data = CommonFunction.GetValue<AITMfcData>(RtDataValues, $"{ModuleName}.MfcGas1");
|
|
MFC1Data = CommonFunction.GetValue<AITMfcData>(RtDataValues, $"{ModuleName}.MfcGas1");
|
|
MFC2Data = CommonFunction.GetValue<AITMfcData>(RtDataValues, $"{ModuleName}.MfcGas2");
|
|
MFC2Data = CommonFunction.GetValue<AITMfcData>(RtDataValues, $"{ModuleName}.MfcGas2");
|
|
MFC3Data = CommonFunction.GetValue<AITMfcData>(RtDataValues, $"{ModuleName}.MfcGas3");
|
|
MFC3Data = CommonFunction.GetValue<AITMfcData>(RtDataValues, $"{ModuleName}.MfcGas3");
|
|
@@ -1495,50 +1436,30 @@ namespace Venus_MainPages.ViewModels
|
|
ChillerTemperature = float.Parse(RtDataValues[$"{ModuleName}.Chiller.Temp"].ToString());
|
|
ChillerTemperature = float.Parse(RtDataValues[$"{ModuleName}.Chiller.Temp"].ToString());
|
|
|
|
|
|
|
|
|
|
|
|
+ ChillerIsOn = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.Chiller.IsOn");
|
|
|
|
|
|
- //PendulumValveIsOpen = (bool)RtDataValues[$"{ModuleName}.PendulumValve.IsOpen"];
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- ChillerIsOn = (bool)RtDataValues[$"{ModuleName}.Chiller.IsOn"];
|
|
|
|
-
|
|
|
|
- SourceRFFanInterlock= (bool)RtDataValues[$"{ModuleName}.SourceRFFanInterlock"];
|
|
|
|
- IsWLK= (bool)RtDataValues[$"{ModuleName}.IsWLK"];
|
|
|
|
- IsWaterFlowOk= (bool)RtDataValues[$"{ModuleName}.IsWaterFlowOk"];
|
|
|
|
- IsTurboPumpInterlock= (bool)RtDataValues[$"{ModuleName}.IsTurboPumpInterlock"];
|
|
|
|
- IsCDAOK= (bool)RtDataValues[$"{ModuleName}.IsCDA_OK"];
|
|
|
|
- SensorGasBoxDoor= (bool)RtDataValues[$"{ModuleName}.GasBoxDoorSW.Value"];
|
|
|
|
- SensorGasBoxPressure= (bool)RtDataValues[$"{ModuleName}.GasBoxPressureSW.Value"];
|
|
|
|
-
|
|
|
|
- IsATM= (bool)RtDataValues[$"{ModuleName}.IsATM"];
|
|
|
|
- IsVAC = (bool)RtDataValues[$"{ModuleName}.IsVAC"];
|
|
|
|
-
|
|
|
|
- ESCHVOutputVoltage= (int)RtDataValues[$"{ModuleName}.ESCHV.OutputVoltage"];
|
|
|
|
-
|
|
|
|
- //SRfReflectPower= float.Parse(RtDataValues[$"{ModuleName}.SRfReflectPower"].ToString());
|
|
|
|
- //SRfReflectPower = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.SRfReflectPower");
|
|
|
|
- //SRfForwardPowerFeedBack = float.Parse(RtDataValues[$"{ModuleName}.SRfForwardPowerFeedBack"].ToString());
|
|
|
|
- //SRfForwardPowerFeedBack= CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.SRfForwardPowerFeedBack");
|
|
|
|
|
|
+ SourceRFFanInterlock= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.SourceRFFanInterlock");
|
|
|
|
+ IsWLK= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsWLK");
|
|
|
|
+ IsWaterFlowOk= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsWaterFlowOk");
|
|
|
|
+ IsTurboPumpInterlock= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsTurboPumpInterlock");
|
|
|
|
+ IsCDAOK= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsCDA_OK");
|
|
|
|
+ SensorGasBoxDoor= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.GasBoxDoorSW.Value");
|
|
|
|
+ SensorGasBoxPressure= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.GasBoxPressureSW.Value");
|
|
|
|
|
|
- //BRfReflectPower = float.Parse(RtDataValues[$"{ModuleName}.BRfReflectPower"].ToString());
|
|
|
|
- //BRfForwardPowerFeedBack = float.Parse(RtDataValues[$"{ModuleName}.BRfForwardPowerFeedBack"].ToString());
|
|
|
|
|
|
+ IsATM= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsATM");
|
|
|
|
+ IsVAC = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsVAC");
|
|
|
|
|
|
|
|
+ ESCHVOutputVoltage= CommonFunction.GetValue<int>(RtDataValues, $"{ModuleName}.ESCHV.OutputVoltage");
|
|
|
|
|
|
- //MatchWorkMode=RtDataValues.Keys.Contains($"{ModuleName}.{VenusDevice.Match}.WorkMode") ? (int)RtDataValues[$"{ModuleName}.{VenusDevice.Match}.WorkMode"] : 0;
|
|
|
|
- //BiasMatchWorkMode = RtDataValues.Keys.Contains($"{ModuleName}.{VenusDevice.BiasMatch}.WorkMode") ? (int)RtDataValues[$"{ ModuleName}.{VenusDevice.BiasMatch}.WorkMode"]:0;
|
|
|
|
-
|
|
|
|
- //MatchC1= RtDataValues.Keys.Contains($"{ModuleName}.{VenusDevice.Match}.C1") ? float.Parse(RtDataValues[$"{ModuleName}.{VenusDevice.Match}.C1"].ToString()):0;
|
|
|
|
- //MatchC2 = RtDataValues.Keys.Contains($"{ModuleName}.{VenusDevice.Match}.C2") ? float.Parse(RtDataValues[$"{ModuleName}.{VenusDevice.Match}.C2"].ToString()) : 0;
|
|
|
|
|
|
+
|
|
MatchC1 = CommonFunction.GetValue<float>(RtDataValues,$"{ModuleName}.{VenusDevice.Match}.C1");
|
|
MatchC1 = CommonFunction.GetValue<float>(RtDataValues,$"{ModuleName}.{VenusDevice.Match}.C1");
|
|
MatchC2 = CommonFunction.GetValue<float>(RtDataValues,$"{ModuleName}.{VenusDevice.Match}.C2");
|
|
MatchC2 = CommonFunction.GetValue<float>(RtDataValues,$"{ModuleName}.{VenusDevice.Match}.C2");
|
|
-
|
|
|
|
-
|
|
|
|
- //BiasMatchC1 = RtDataValues.Keys.Contains($"{ModuleName}.{VenusDevice.BiasMatch}.C1") ? float.Parse(RtDataValues[$"{ModuleName}.{VenusDevice.BiasMatch}.C1"].ToString()):0;
|
|
|
|
- //BiasMatchC2 = RtDataValues.Keys.Contains($"{ModuleName}.{VenusDevice.BiasMatch}.C2") ? float.Parse(RtDataValues[$"{ModuleName}.{VenusDevice.BiasMatch}.C2"].ToString()) : 0;
|
|
|
|
|
|
+
|
|
BiasMatchC1 = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.{VenusDevice.BiasMatch}.C1");
|
|
BiasMatchC1 = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.{VenusDevice.BiasMatch}.C1");
|
|
BiasMatchC2 = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.{VenusDevice.BiasMatch}.C2");
|
|
BiasMatchC2 = CommonFunction.GetValue<float>(RtDataValues, $"{ModuleName}.{VenusDevice.BiasMatch}.C2");
|
|
- TurboPumpWaterFlowSwitch = (bool)(RtDataValues[$"{ModuleName}.TurboPumpWaterFlowSwitch.Value"]);
|
|
|
|
- IsTurboPumpAtSpeed = (bool)RtDataValues[$"{ModuleName}.IsTurboPumpAtSpeed"];
|
|
|
|
- IsHasWafer= (bool)RtDataValues[$"{ModuleName}.HasWafer"];
|
|
|
|
|
|
+ TurboPumpWaterFlowSwitch = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.TurboPumpWaterFlowSwitch.Value");
|
|
|
|
+ IsTurboPumpAtSpeed = CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.IsTurboPumpAtSpeed");
|
|
|
|
+ IsHasWafer= CommonFunction.GetValue<bool>(RtDataValues, $"{ModuleName}.HasWafer");
|
|
|
|
|
|
|
|
|
|
if (PMCurrentState == PMState.Processing)
|
|
if (PMCurrentState == PMState.Processing)
|
|
@@ -1563,9 +1484,7 @@ namespace Venus_MainPages.ViewModels
|
|
{
|
|
{
|
|
ChamberPressureFeedBack = ProcessHighPressure;
|
|
ChamberPressureFeedBack = ProcessHighPressure;
|
|
}
|
|
}
|
|
- }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ }
|
|
public void addDataKeys()
|
|
public void addDataKeys()
|
|
{
|
|
{
|
|
m_RtDataKeys.Clear();
|
|
m_RtDataKeys.Clear();
|