diff --git a/Modules/Mainframe/Config/PM/PM1/DeviceModelPM1.xml b/Modules/Mainframe/Config/PM/PM1/DeviceModelPM1.xml index 9594c61a..3c86d649 100644 --- a/Modules/Mainframe/Config/PM/PM1/DeviceModelPM1.xml +++ b/Modules/Mainframe/Config/PM/PM1/DeviceModelPM1.xml @@ -100,7 +100,7 @@ - + diff --git a/Modules/Mainframe/Config/PM/PM1/_ioDefinePM1.xml b/Modules/Mainframe/Config/PM/PM1/_ioDefinePM1.xml index 341fa1c3..01f56dc9 100644 --- a/Modules/Mainframe/Config/PM/PM1/_ioDefinePM1.xml +++ b/Modules/Mainframe/Config/PM/PM1/_ioDefinePM1.xml @@ -353,6 +353,7 @@ + diff --git a/Modules/Mainframe/Config/PM/PM2/DeviceModelPM2.xml b/Modules/Mainframe/Config/PM/PM2/DeviceModelPM2.xml index a0f18bf0..a854ae19 100644 --- a/Modules/Mainframe/Config/PM/PM2/DeviceModelPM2.xml +++ b/Modules/Mainframe/Config/PM/PM2/DeviceModelPM2.xml @@ -95,7 +95,7 @@ - + diff --git a/Modules/Mainframe/Config/PM/PM2/_ioDefinePM2.xml b/Modules/Mainframe/Config/PM/PM2/_ioDefinePM2.xml index 125c01bf..6cf74af5 100644 --- a/Modules/Mainframe/Config/PM/PM2/_ioDefinePM2.xml +++ b/Modules/Mainframe/Config/PM/PM2/_ioDefinePM2.xml @@ -352,6 +352,7 @@ + diff --git a/SicSimulator/Config/_ioDefinePM.xml b/SicSimulator/Config/_ioDefinePM.xml index fea55867..6a9ccc01 100644 --- a/SicSimulator/Config/_ioDefinePM.xml +++ b/SicSimulator/Config/_ioDefinePM.xml @@ -350,6 +350,7 @@ + diff --git a/SicUI/Models/PMs/PMOperationView.xaml b/SicUI/Models/PMs/PMOperationView.xaml index d92e1685..a1c90cad 100644 --- a/SicUI/Models/PMs/PMOperationView.xaml +++ b/SicUI/Models/PMs/PMOperationView.xaml @@ -6593,8 +6593,10 @@ Width="19" Height="17" Command="{Binding CmdTvEnable}" + CommandReset="{Binding CmdTvReset}" DeviceData="{Binding TV}" - RenderTransformOrigin="-1.667,1.222" /> + RenderTransformOrigin="-1.667,1.222" > + (PerformCmdTvEnable); + CmdTvReset = new DelegateCommand(PerformCmdTvReset); CmdTurnGasValve = new DelegateCommand(PerformCmdTurnGasValve); CmdSetMfcFlow = new DelegateCommand(PerformCmdSetMfcFlow); // @@ -1329,6 +1331,12 @@ namespace SicUI.Models.PMs var pair = (KeyValuePair)data; InvokeClient.Instance.Service.DoOperation($"{SystemName}.TV.SetTVValveEnable", pair.Value); } + + private void PerformCmdTvReset(object data) + { + InvokeClient.Instance.Service.DoOperation($"{SystemName}.TV.SetTVReset", true); + } + private void PerformCmdTurnGasValve(object data) { var pair = (KeyValuePair)data; diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll index ba45158a..363be5b3 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll index 09b77066..c5e6c0ed 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll index 391cb707..4206cf83 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll index 6d994345..7dbca47b 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll index 159816c4..cdddf8b8 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll index 27fa836a..96217201 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll differ