Sic-Software
/
Sic08
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Activity

1.PM添加DO_TVReset，TV阀右键时通过控制DO来进行复位 

2.PM主界面添加按钮事件触发TVReset
This commit is contained in:
Han Qiang Qiang 2023-12-28 11:07:22 +08:00
parent f99d64a376
commit 0a7e5e5cc9
13 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Mainframe/Config/PM/PM1/DeviceModelPM1.xml
View File

@ -100,7 +100,7 @@
<IoValve id="V25" display="GasBoxVentBypass" schematicId="V99" unit="" isNc="true" isDefaultOpen="false" diOpen="" doOpen="DO_GasBoxVentBypass(V25)" diCloseSensor="" diOpenSensor="" />
</IoValves>
<IoThrottleValves classType="Aitex.Core.RT.Device.Devices.IoThrottleValve2" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoThrottleValve id="TV" display="TV" schematicId="TV" unit="mbar" scBasePath="PM.{module}" modeValuePressure="5" modeValuePosition="2" modeValueClose="3" modeValueOpen="4" aioType="float" aiStatus="AI_TVmode" aiPositionFeedback="AI_ActualPositon" aiPressureFeedback="AI_ActualPressure" aoPressureMode="AO_ValveModeSetpoint" aoPositionSetPoint="AO_SetpointPositon" aoPressureSetPoint="AO_SetpointPressure" doTVValveEnable="DO_TVEnable" diTVValveEnable="" />
<IoThrottleValve id="TV" display="TV" schematicId="TV" unit="mbar" scBasePath="PM.{module}" modeValuePressure="5" modeValuePosition="2" modeValueClose="3" modeValueOpen="4" aioType="float" aiStatus="AI_TVmode" aiPositionFeedback="AI_ActualPositon" aiPressureFeedback="AI_ActualPressure" aoPressureMode="AO_ValveModeSetpoint" aoPositionSetPoint="AO_SetpointPositon" aoPressureSetPoint="AO_SetpointPressure" doTVValveEnable="DO_TVEnable" doTVReset="DO_TVReset" diTVValveEnable="" />
</IoThrottleValves>
<IoMfcs classType="Aitex.Core.RT.Device.Devices.IoMFC" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoMfc3 id="Mfc1" display="Mfc1" schematicId="Mfc1" unit="sccm" aiActMode="AI_M1ActMode" aoSetMode="AO_M1CtrlMode" aiFlow="AI_M1" aoFlow="AO_M1" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC01Offline" AlarmText="Alarm101 MFC01 Offline[DI-351]" />

1
Modules/Mainframe/Config/PM/PM1/_ioDefinePM1.xml
View File

@ -353,6 +353,7 @@
<DO_ITEM Index="135" Name="DO_SCR2Enable" BufferOffset="135" Addr="135" Description="" />
<DO_ITEM Index="136" Name="DO_SCR3Enable" BufferOffset="136" Addr="136" Description="" />
<DO_ITEM Index="140" Name="DO_TVEnable" BufferOffset="140" Addr="140" Description="" />
<DO_ITEM Index="141" Name="DO_TVReset" BufferOffset="141" Addr="141" Description="" />
<DO_ITEM Index="144" Name="DO_PSU1Reset" BufferOffset="144" Addr="144" Description="" />
<DO_ITEM Index="145" Name="DO_PSU2Reset" BufferOffset="145" Addr="145" Description="" />
<DO_ITEM Index="146" Name="DO_PSU3Reset" BufferOffset="146" Addr="146" Description="" />

2
Modules/Mainframe/Config/PM/PM2/DeviceModelPM2.xml
View File

@ -95,7 +95,7 @@
<IoValve id="V25" display="GasBoxVentBypass" schematicId="V99" unit="" isNc="true" isDefaultOpen="false" diOpen="" doOpen="DO_GasBoxVentBypass(V25)" diCloseSensor="" diOpenSensor="" />
</IoValves>
<IoThrottleValves classType="Aitex.Core.RT.Device.Devices.IoThrottleValve2" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoThrottleValve id="TV" display="TV" schematicId="TV" unit="mbar" scBasePath="PM.{module}" modeValuePressure="5" modeValuePosition="2" modeValueClose="3" modeValueOpen="4" aioType="float" aiStatus="AI_TVmode" aiPositionFeedback="AI_ActualPositon" aiPressureFeedback="AI_ActualPressure" aoPressureMode="AO_ValveModeSetpoint" aoPositionSetPoint="AO_SetpointPositon" aoPressureSetPoint="AO_SetpointPressure" doTVValveEnable="DO_TVEnable" diTVValveEnable="" />
<IoThrottleValve id="TV" display="TV" schematicId="TV" unit="mbar" scBasePath="PM.{module}" modeValuePressure="5" modeValuePosition="2" modeValueClose="3" modeValueOpen="4" aioType="float" aiStatus="AI_TVmode" aiPositionFeedback="AI_ActualPositon" aiPressureFeedback="AI_ActualPressure" aoPressureMode="AO_ValveModeSetpoint" aoPositionSetPoint="AO_SetpointPositon" aoPressureSetPoint="AO_SetpointPressure" doTVValveEnable="DO_TVEnable" doTVReset="DO_TVReset" diTVValveEnable="" />
</IoThrottleValves>
<IoMfcs classType="Aitex.Core.RT.Device.Devices.IoMFC" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoMfc3 id="Mfc1" display="Mfc1" schematicId="Mfc1" unit="sccm" aiActMode="AI_M1ActMode" aoSetMode="AO_M1CtrlMode" aiFlow="AI_M1" aoFlow="AO_M1" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC01Offline" AlarmText="Alarm101 MFC01 Offline[DI-351]" />

1
Modules/Mainframe/Config/PM/PM2/_ioDefinePM2.xml
View File

@ -352,6 +352,7 @@
<DO_ITEM Index="135" Name="DO_SCR2Enable" BufferOffset="135" Addr="135" Description="" />
<DO_ITEM Index="136" Name="DO_SCR3Enable" BufferOffset="136" Addr="136" Description="" />
<DO_ITEM Index="140" Name="DO_TVEnable" BufferOffset="140" Addr="140" Description="" />
<DO_ITEM Index="141" Name="DO_TVReset" BufferOffset="141" Addr="141" Description="" />
<DO_ITEM Index="144" Name="DO_PSU1Reset" BufferOffset="144" Addr="144" Description="" />
<DO_ITEM Index="145" Name="DO_PSU2Reset" BufferOffset="145" Addr="145" Description="" />
<DO_ITEM Index="146" Name="DO_PSU3Reset" BufferOffset="146" Addr="146" Description="" />

1
SicSimulator/Config/_ioDefinePM.xml
View File

@ -350,6 +350,7 @@
<DO_ITEM Index="135" Name="DO_SCR2Enable" BufferOffset="135" Addr="135" Description="" />
<DO_ITEM Index="136" Name="DO_SCR3Enable" BufferOffset="136" Addr="136" Description="" />
<DO_ITEM Index="140" Name="DO_TVEnable" BufferOffset="140" Addr="140" Description="" />
<DO_ITEM Index="141" Name="DO_TVReset" BufferOffset="141" Addr="141" Description="" />
<DO_ITEM Index="144" Name="DO_PSU1Reset" BufferOffset="144" Addr="144" Description="" />
<DO_ITEM Index="145" Name="DO_PSU2Reset" BufferOffset="145" Addr="145" Description="" />
<DO_ITEM Index="146" Name="DO_PSU3Reset" BufferOffset="146" Addr="146" Description="" />

4
SicUI/Models/PMs/PMOperationView.xaml
View File

@ -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" >
</deviceControl:AITThrottleValve2>
<Canvas
x:Name="源"

8
SicUI/Models/PMs/PMOperationViewModel.cs
View File

@ -1310,6 +1310,7 @@ namespace SicUI.Models.PMs
set;
}
public ICommand CmdTvEnable { get; set; }
public ICommand CmdTvReset { get; set; }
public ICommand CmdTvPostionToZero { get; set; }
public ICommand CmdTurnGasValve { get; set; }
public ICommand CmdSetMfcFlow { get; set; }
@ -1318,6 +1319,7 @@ namespace SicUI.Models.PMs
{
DisplayName = "Operation";
CmdTvEnable = new DelegateCommand<object>(PerformCmdTvEnable);
CmdTvReset = new DelegateCommand<object>(PerformCmdTvReset);
CmdTurnGasValve = new DelegateCommand<object>(PerformCmdTurnGasValve);
CmdSetMfcFlow = new DelegateCommand<object>(PerformCmdSetMfcFlow);
//
@ -1329,6 +1331,12 @@ namespace SicUI.Models.PMs
var pair = (KeyValuePair<string, string>)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<string, string>)data;

BIN
ThirdParty/MECF.Framework/MECF.Framework.Common.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll vendored
View File

Binary file not shown.