diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs index c58ac29..0e88975 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/DeviceDetailEntity.cs @@ -548,6 +548,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public ThreeWayValve DV2PCP11 { get; set; } public ThreeWayValve DV2PCP12 { get; set; } public ThreeWayValve DV2PCP13 { get; set; } + public ThreeWayValve DV2PCP14 { get; set; } } public class DeviceDetailEntity diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs index 172a646..b079f49 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/Entity/PlcReadTempEntity.cs @@ -462,6 +462,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public bool DV2PCP11_SetL { get; set; } public bool DV2PCP12_SetL { get; set; } public bool DV2PCP13_SetL { get; set; } + public bool DV2PCP14_SetL { get; set; } public bool DV2PCP01_SetR { get; set; } public bool DV2PCP02_SetR { get; set; } @@ -476,6 +477,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public bool DV2PCP11_SetR { get; set; } public bool DV2PCP12_SetR { get; set; } public bool DV2PCP13_SetR { get; set; } + public bool DV2PCP14_SetR { get; set; } public bool DV2PCP01_AlarmL { get; set; } public bool DV2PCP02_AlarmL { get; set; } @@ -490,6 +492,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public bool DV2PCP11_AlarmL { get; set; } public bool DV2PCP12_AlarmL { get; set; } public bool DV2PCP13_AlarmL { get; set; } + public bool DV2PCP14_AlarmL { get; set; } public bool DV2PCP01_AlarmR { get; set; } public bool DV2PCP02_AlarmR { get; set; } @@ -504,6 +507,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl.Entity public bool DV2PCP11_AlarmR { get; set; } public bool DV2PCP12_AlarmR { get; set; } public bool DV2PCP13_AlarmR { get; set; } + public bool DV2PCP14_AlarmR { get; set; } } } diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index 47de1fa..4ebbd94 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -856,6 +856,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl PlcReadTemp.DV2PCP11_SetL = DB2102.DV2PCP11.LeftPosition; PlcReadTemp.DV2PCP12_SetL = DB2102.DV2PCP12.LeftPosition; PlcReadTemp.DV2PCP13_SetL = DB2102.DV2PCP13.LeftPosition; + PlcReadTemp.DV2PCP14_SetL = DB2102.DV2PCP14.LeftPosition; PlcReadTemp.DV2PCP01_SetR = DB2102.DV2PCP01.RightPosition; PlcReadTemp.DV2PCP02_SetR = DB2102.DV2PCP02.RightPosition; @@ -870,6 +871,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl PlcReadTemp.DV2PCP11_SetR = DB2102.DV2PCP11.RightPosition; PlcReadTemp.DV2PCP12_SetR = DB2102.DV2PCP12.RightPosition; PlcReadTemp.DV2PCP13_SetR = DB2102.DV2PCP13.RightPosition; + PlcReadTemp.DV2PCP14_SetR = DB2102.DV2PCP14.RightPosition; PlcReadTemp.DV2PCP01_AlarmL = DB2102.DV2PCP01.AlarmLeftPosition; PlcReadTemp.DV2PCP02_AlarmL = DB2102.DV2PCP02.AlarmLeftPosition; @@ -884,6 +886,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl PlcReadTemp.DV2PCP11_AlarmL = DB2102.DV2PCP11.AlarmLeftPosition; PlcReadTemp.DV2PCP12_AlarmL = DB2102.DV2PCP12.AlarmLeftPosition; PlcReadTemp.DV2PCP13_AlarmL = DB2102.DV2PCP13.AlarmLeftPosition; + PlcReadTemp.DV2PCP14_AlarmL = DB2102.DV2PCP14.AlarmLeftPosition; PlcReadTemp.DV2PCP01_AlarmR = DB2102.DV2PCP01.AlarmRightPosition; PlcReadTemp.DV2PCP02_AlarmR = DB2102.DV2PCP02.AlarmRightPosition; @@ -898,6 +901,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl PlcReadTemp.DV2PCP11_AlarmR = DB2102.DV2PCP11.AlarmRightPosition; PlcReadTemp.DV2PCP12_AlarmR = DB2102.DV2PCP12.AlarmRightPosition; PlcReadTemp.DV2PCP13_AlarmR = DB2102.DV2PCP13.AlarmRightPosition; + PlcReadTemp.DV2PCP14_AlarmR = DB2102.DV2PCP14.AlarmRightPosition; ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP01, PlcReadTemp.DV2PCP01_AlarmR, PlcReadTemp.DV2PCP01_SetR, PlcReadTemp.DV2PCP01_AlarmL, PlcReadTemp.DV2PCP01_SetL, 0); @@ -913,6 +917,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP11, PlcReadTemp.DV2PCP11_AlarmR, PlcReadTemp.DV2PCP11_SetR, PlcReadTemp.DV2PCP11_AlarmL, PlcReadTemp.DV2PCP11_SetL, 0); ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP12, PlcReadTemp.DV2PCP12_AlarmR, PlcReadTemp.DV2PCP12_SetR, PlcReadTemp.DV2PCP12_AlarmL, PlcReadTemp.DV2PCP12_SetL, 0); ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP13, PlcReadTemp.DV2PCP13_AlarmR, PlcReadTemp.DV2PCP13_SetR, PlcReadTemp.DV2PCP13_AlarmL, PlcReadTemp.DV2PCP13_SetL, 0); + ControlsHelper.SetThreeWayValve(ThreeValveE.DV2PCP14, PlcReadTemp.DV2PCP14_AlarmR, PlcReadTemp.DV2PCP14_SetR, PlcReadTemp.DV2PCP14_AlarmL, PlcReadTemp.DV2PCP14_SetL, 0); ControlsHelper.SetLjSwith(SwithE.BU1ASF01, PlcReadTemp.BU1ASF01_Set, PlcReadTemp.BU1ASF01_Alarm); ControlsHelper.SetLjSwith(SwithE.BU1BSF01, PlcReadTemp.BU1BSF01_Set, PlcReadTemp.BU1BSF01_Alarm); diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index 85b7c71..b09fc4c 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -8251,13 +8251,13 @@ Xie1 24, 8 - + 1668, 117 - ThreeWayValve14 + DV2PCP14 22, 12