diff --git a/MECF.Framework.RT.EquipmentLibrary/Devices/IoTC.cs b/MECF.Framework.RT.EquipmentLibrary/Devices/IoTC.cs index c29a311..666be2c 100644 --- a/MECF.Framework.RT.EquipmentLibrary/Devices/IoTC.cs +++ b/MECF.Framework.RT.EquipmentLibrary/Devices/IoTC.cs @@ -1029,25 +1029,15 @@ namespace Aitex.Core.RT.Device.Devices { if (HeaterModeSetPoint == HeaterControlMode.PyroFollow) { - if(!IsFloatEqual(L2TargetOPSetPoint, L2WorkingOPFeedBack)) + if (!IsFloatEqual(L2TargetOPSetPoint, L2WorkingOPFeedBack)) L2TargetOPSetPoint = L2WorkingOPFeedBack; - if (!IsFloatEqual(ref _ssL2WorkingOPFeedBack, L2WorkingOPFeedBack) - || !IsFloatEqual(ref _ssL1RatioSetPoint, L1RatioSetPoint) - || !IsFloatEqual(ref _ssL2RatioSetPoint, L2RatioSetPoint)) - { - _ssL2WorkingOPFeedBack = L2WorkingOPFeedBack; - var l1 = L2RatioSetPoint > 0 ? L2WorkingOPFeedBack * L1RatioSetPoint / L2RatioSetPoint : 0; - L1TargetOPSetPoint = l1 > 100 ? 100 : l1; - } + var l1 = L2RatioSetPoint > 0 ? L2WorkingOPFeedBack * L1RatioSetPoint / L2RatioSetPoint : 0; + L1TargetOPSetPoint = l1 > 100 ? 100 : l1; + + var l3 = L2RatioSetPoint > 0 ? L2WorkingOPFeedBack * L3RatioSetPoint / L2RatioSetPoint : 0; + L3TargetOPSetPoint = l3 > 100 ? 100 : l3; - if (!IsFloatEqual(ref _ssL2WorkingOPFeedBack, L2WorkingOPFeedBack) - || !IsFloatEqual(ref _ssL3RatioSetPoint, L3RatioSetPoint) - || !IsFloatEqual(ref _ssL2RatioSetPoint, L2RatioSetPoint)) - { - var l3 = L2RatioSetPoint > 0 ? L2WorkingOPFeedBack * L3RatioSetPoint / L2RatioSetPoint : 0; - L3TargetOPSetPoint = l3 > 100 ? 100 : l3; - } } else //Power { @@ -1063,27 +1053,16 @@ namespace Aitex.Core.RT.Device.Devices } else if (Name == "TC2") { - if (HeaterModeSetPoint == HeaterControlMode.PyroFollow)//Pyro和TC + if (HeaterModeSetPoint == HeaterControlMode.PyroFollow) //Pyro和TC { - - if(!IsFloatEqual(L3TargetOPSetPoint, L3WorkingOPFeedBack)) + if (!IsFloatEqual(L3TargetOPSetPoint, L3WorkingOPFeedBack)) L3TargetOPSetPoint = L3WorkingOPFeedBack; - if (!IsFloatEqual(ref _ssL3WorkingOPFeedBack, L3WorkingOPFeedBack) - || !IsFloatEqual(ref _ssL1RatioSetPoint, L1RatioSetPoint) - || !IsFloatEqual(ref _ssL3RatioSetPoint, L3RatioSetPoint)) - { - var l1 = L3RatioSetPoint > 0 ? L3WorkingOPFeedBack * L1RatioSetPoint / L3RatioSetPoint : 0; - L1TargetOPSetPoint = l1 > 100 ? 100 : l1; - } + var l1 = L3RatioSetPoint > 0 ? L3WorkingOPFeedBack * L1RatioSetPoint / L3RatioSetPoint : 0; + L1TargetOPSetPoint = l1 > 100 ? 100 : l1; - if (!IsFloatEqual(ref _ssL3WorkingOPFeedBack, L3WorkingOPFeedBack) - || !IsFloatEqual(ref _ssL2RatioSetPoint, L2RatioSetPoint) - || !IsFloatEqual(ref _ssL3RatioSetPoint, L3RatioSetPoint)) - { - var l2 = L3RatioSetPoint > 0 ? L3WorkingOPFeedBack * L2RatioSetPoint / L3RatioSetPoint : 0; - L2TargetOPSetPoint = l2 > 100 ? 100 : l2; - } + var l2 = L3RatioSetPoint > 0 ? L3WorkingOPFeedBack * L2RatioSetPoint / L3RatioSetPoint : 0; + L2TargetOPSetPoint = l2 > 100 ? 100 : l2; } else //Power {