Sic-Software
/
SicMultiplate
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1修改PM开腔兼容性问题 

2修改MFC17相关问题
This commit is contained in:
Han Qiang Qiang 2024-06-26 15:50:10 +08:00
parent 671567ff45
commit 36acbf4c86
20 changed files with 108 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,9 +144,7 @@
<IoMfc3 id="Mfc14" display="Mfc14" schematicId="Mfc14" unit="sccm" aiActMode="AI_M14ActMode" aoSetMode="AO_M14CtrlMode" aiFlow="AI_M14" aoFlow="AO_M14" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC14Offline" AlarmText="Alarm114 MFC14 Offline[DI-364]" />
<IoMfc3 id="Mfc15" display="Mfc15" schematicId="Mfc15" unit="sccm" aiActMode="AI_M15ActMode" aoSetMode="AO_M15CtrlMode" aiFlow="AI_M15" aoFlow="AO_M15" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC15Offline" AlarmText="Alarm115 MFC15 Offline[DI-365]" />
<IoMfc3 id="Mfc16" display="Mfc16" schematicId="Mfc16" unit="sccm" aiActMode="AI_M16ActMode" aoSetMode="AO_M16CtrlMode" aiFlow="AI_M16" aoFlow="AO_M16" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC16Offline" AlarmText="Alarm116 MFC16 Offline[DI-366]" />
<IoMfc3 id="Mfc17" display="Mfc17" schematicId="Mfc17" unit="sccm" aiActMode="AI_M17ActMode" aoSetMode="AO_M17CtrlMode" aiFlow="AI_M17" aoFlow="AO_M17" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC17Offline" AlarmText="Alarm117 MFC17 Offline[DI-367]" />
<IoMfc3 id="Mfc19" display="Mfc19" schematicId="Mfc19" unit="sccm" aiActMode="AI_M19ActMode" aoSetMode="AO_M19CtrlMode" aiFlow="AI_M19" aoFlow="AO_M19" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC19Offline" AlarmText="Alarm119 MFC19 Offline[DI-369]" />
<IoMfc3 id="Mfc20" display="Mfc20" schematicId="Mfc20" unit="sccm" aiActMode="AI_M20ActMode" aoSetMode="AO_M20CtrlMode" aiFlow="AI_M20" aoFlow="AO_M20" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC20Offline" AlarmText="Alarm120 MFC20 Offline[DI-370]" />
<IoMfc3 id="Mfc22" display="Mfc22" schematicId="Mfc22" unit="sccm" aiActMode="AI_M22ActMode" aoSetMode="AO_M22CtrlMode" aiFlow="AI_M22" aoFlow="AO_M22" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC22Offline" AlarmText="Alarm122 MFC22 Offline[DI-372]" />
@ -163,14 +161,12 @@
<IoMfc3 id="Mfc36" display="Mfc36" schematicId="Mfc36" unit="sccm" aiActMode="AI_M36ActMode" aoSetMode="AO_M36CtrlMode" aiFlow="AI_M36" aoFlow="AO_M36" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC36Offline" AlarmText="Alarm136 MFC36 Offline[DI-386]" />
<IoMfc3 id="Mfc37" display="Mfc37" schematicId="Mfc37" unit="sccm" aiActMode="AI_M37ActMode" aoSetMode="AO_M37CtrlMode" aiFlow="AI_M37" aoFlow="AO_M37" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC37Offline" AlarmText="Alarm137 MFC37 Offline[DI-387]" />
<IoMfc3 id="Mfc38" display="Mfc38" schematicId="Mfc38" unit="sccm" aiActMode="AI_M38ActMode" aoSetMode="AO_M38CtrlMode" aiFlow="AI_M38" aoFlow="AO_M38" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC38Offline" AlarmText="Alarm138 MFC38 Offline[DI-388]" />
<IoMfc3 id="Mfc40" display="Mfc40" schematicId="Mfc40" unit="sccm" aiActMode="AI_M40ActMode" aoSetMode="AO_M40CtrlMode" aiFlow="AI_M40" aoFlow="AO_M40" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC40Offline" AlarmText="Alarm140 MFC40 Offline[DI-390]" />
<IoMfc3 id="Mfc41" display="Mfc41" schematicId="Mfc41" unit="sccm" aiActMode="AI_M41ActMode" aoSetMode="AO_M41CtrlMode" aiFlow="AI_M41" aoFlow="AO_M41" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC41Offline" AlarmText="Alarm141 MFC41 Offline[DI-391]" />
<IoMfc3 id="Mfc42" display="Mfc42" schematicId="Mfc42" unit="sccm" aiActMode="AI_M42ActMode" aoSetMode="AO_M42CtrlMode" aiFlow="AI_M42" aoFlow="AO_M42" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC42Offline" AlarmText="Alarm142 MFC42 Offline[DI-392]" />
<IoMfc3 id="Mfc43" display="Mfc43" schematicId="Mfc43" unit="sccm" aiActMode="AI_M43ActMode" aoSetMode="AO_M43CtrlMode" aiFlow="AI_M43" aoFlow="AO_M43" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC43Offline" AlarmText="Alarm143 MFC43 Offline[DI-393]" />
<IoMfc3 id="Mfc44" display="Mfc44" schematicId="Mfc44" unit="sccm" aiActMode="AI_M44ActMode" aoSetMode="AO_M44CtrlMode" aiFlow="AI_M44" aoFlow="AO_M44" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC44Offline" AlarmText="Alarm144 MFC44 Offline[DI-394]" />
<IoMfc3 id="Mfc45" display="Mfc45" schematicId="Mfc45" unit="sccm" aiActMode="AI_M45ActMode" aoSetMode="AO_M45CtrlMode" aiFlow="AI_M45" aoFlow="AO_M45" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC45Offline" AlarmText="Alarm145 MFC45 Offline[DI-395]" />
</IoMfcs>
<IoPressureMeters classType="Aitex.Core.RT.Device.Devices.IoPressure" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoPressureMeter id="Pressure1" display="PC1" schematicId="Pressure1" scBasePath="PM.{module}.PC" unit="mbar" aioType="float" aiOpenDegree="AI_PC1Valve" aiActMode="AI_PC1ActMode" aoSetMode="AO_PC1CtrlMode" aiValue="AI_PressCtrl1" aoValue="AO_PressCtrl1" formatString="0.0" diAlarm="DI_PC01Offline" AlarmText="Alarm141 PC1 Offline[DI-391]" />
@ -572,13 +568,13 @@
doGreen="DO_TowerGreen" doYellow="DO_TowerYellow" doRed="DO_TowerRed" doBuzzer="DO_Buzzer"
aoBuzzerBlinkFreq="AO_BuzzerBlinkFreqHz"/>
</IoSignalTowers>
<IoChamberMoveBodys classType="Aitex.Core.RT.Device.Devices.IoChamberMoveBody" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoChamberMoveBodys classType="Aitex.Core.RT.Device.Devices.IoChamberMoveBodySicMultiple" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoChamberMoveBody id="ChamberMoveBody" module="" display="ChamberMoveBody" schematicId="ChamberMoveBody" unit="" aioType="" diUpFaceback="DI_ChamMoveBodyUp"
diDownFaceback="DI_ChamMoveBodyDown" diFront=" DI_ChamMoveBodyFront" diEndFaceback="DI_ChamMoveBodyEnd" doUpSetpoint="DO_ChamMoveBodyUp"
doDownSetpoint="DO_ChamMoveBodyDown" doUpBrake="DO_ChamMoveBodyUpAirBrake" doForward="DO_ChamMoveBodyForward" doBackward="DO_ChamMoveBodyBackward"
doForwardLatch="DO_ChamMoveBodyBrakerForward" doBackwardLatch="DO_ChamMoveBodyBrakerBackward" diForwardLatch="DI_ChamMoveBodyUpLatchFW"
diBackwardLatch="DI_ChamMoveBodyEndLatchBW" diRemote="DI_ChamLidPushButtonLocal" diLock="DI_ManualLidUpPB"
diUpDownEnable="DI_ChamMoveBodyUpDownEnableFB" doUpDownEnable="DO_ChamMoveBodyUpDownEnable" />
diDownFaceback="DI_ChamMoveBodyDown" diFront=" DI_ChamMoveBodyFront" diEndFaceback="DI_ChamMoveBodyEnd" doUpSetpoint="DO_ChamMoveBodyUp"
doDownSetpoint="DO_ChamMoveBodyDown" doUpBrake="DO_ChamMoveBodyUpAirBrake" doForward="DO_ChamMoveBodyForward" doBackward="DO_ChamMoveBodyBackward"
doForwardLatch="DO_ChamMoveBodyBrakerForward" doBackwardLatch="DO_ChamMoveBodyBrakerBackward" diForwardLatch="DI_ChamMoveBodyUpLatchFW"
diBackwardLatch="DI_ChamMoveBodyEndLatchBW" diRemote="DI_ChamLidPushButtonLocal" diLock="DI_ManualLidUpPB"
diUpDownEnable="DI_ChamMoveBodyUpDownEnableFB" doUpDownEnable="DO_ChamMoveBodyUpDownEnable" />
</IoChamberMoveBodys>
<IoGasConnectors classType="Aitex.Core.RT.Device.Devices.IoGasConnector" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoGasConnector id="GasConnector" module="" display="GasConnector" schematicId="GasConnector" unit="" aioType="" diGasConnectorLoosen="DI_SHGasConnectorLoosen" diGasConnectorTighten="DI_SHGasConnectorTighten" doGasConnectorLoosen="DO_SHGasConnectorLoosen" doGasConnectorTighten="DO_SHGasConnectorTighten" />

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

@ -117,9 +117,7 @@
<IoMfc3 id="Mfc14" display="Mfc14" schematicId="Mfc14" unit="sccm" aiActMode="AI_M14ActMode" aoSetMode="AO_M14CtrlMode" aiFlow="AI_M14" aoFlow="AO_M14" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC14Offline" AlarmText="Alarm114 MFC14 Offline[DI-364]" />
<IoMfc3 id="Mfc15" display="Mfc15" schematicId="Mfc15" unit="sccm" aiActMode="AI_M15ActMode" aoSetMode="AO_M15CtrlMode" aiFlow="AI_M15" aoFlow="AO_M15" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC15Offline" AlarmText="Alarm115 MFC15 Offline[DI-365]" />
<IoMfc3 id="Mfc16" display="Mfc16" schematicId="Mfc16" unit="sccm" aiActMode="AI_M16ActMode" aoSetMode="AO_M16CtrlMode" aiFlow="AI_M16" aoFlow="AO_M16" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC16Offline" AlarmText="Alarm116 MFC16 Offline[DI-366]" />
<IoMfc3 id="Mfc17" display="Mfc17" schematicId="Mfc17" unit="sccm" aiActMode="AI_M17ActMode" aoSetMode="AO_M17CtrlMode" aiFlow="AI_M17" aoFlow="AO_M17" scBasePath="PM.PM1.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC17Offline" AlarmText="Alarm117 MFC17 Offline[DI-367]" />
<IoMfc3 id="Mfc19" display="Mfc19" schematicId="Mfc19" unit="sccm" aiActMode="AI_M19ActMode" aoSetMode="AO_M19CtrlMode" aiFlow="AI_M19" aoFlow="AO_M19" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC19Offline" AlarmText="Alarm119 MFC19 Offline[DI-369]" />
<IoMfc3 id="Mfc20" display="Mfc20" schematicId="Mfc20" unit="sccm" aiActMode="AI_M20ActMode" aoSetMode="AO_M20CtrlMode" aiFlow="AI_M20" aoFlow="AO_M20" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC20Offline" AlarmText="Alarm120 MFC20 Offline[DI-370]" />
<IoMfc3 id="Mfc22" display="Mfc22" schematicId="Mfc22" unit="sccm" aiActMode="AI_M22ActMode" aoSetMode="AO_M22CtrlMode" aiFlow="AI_M22" aoFlow="AO_M22" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC22Offline" AlarmText="Alarm122 MFC22 Offline[DI-372]" />
@ -136,16 +134,12 @@
<IoMfc3 id="Mfc36" display="Mfc36" schematicId="Mfc36" unit="sccm" aiActMode="AI_M36ActMode" aoSetMode="AO_M36CtrlMode" aiFlow="AI_M36" aoFlow="AO_M36" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC36Offline" AlarmText="Alarm136 MFC36 Offline[DI-386]" />
<IoMfc3 id="Mfc37" display="Mfc37" schematicId="Mfc37" unit="sccm" aiActMode="AI_M37ActMode" aoSetMode="AO_M37CtrlMode" aiFlow="AI_M37" aoFlow="AO_M37" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC37Offline" AlarmText="Alarm137 MFC37 Offline[DI-387]" />
<IoMfc3 id="Mfc38" display="Mfc38" schematicId="Mfc38" unit="sccm" aiActMode="AI_M38ActMode" aoSetMode="AO_M38CtrlMode" aiFlow="AI_M38" aoFlow="AO_M38" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC38Offline" AlarmText="Alarm138 MFC38 Offline[DI-388]" />
<IoMfc3 id="Mfc40" display="Mfc40" schematicId="Mfc40" unit="sccm" aiActMode="AI_M40ActMode" aoSetMode="AO_M40CtrlMode" aiFlow="AI_M40" aoFlow="AO_M40" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC40Offline" AlarmText="Alarm140 MFC40 Offline[DI-390]" />
<IoMfc3 id="Mfc41" display="Mfc41" schematicId="Mfc41" unit="sccm" aiActMode="AI_M41ActMode" aoSetMode="AO_M41CtrlMode" aiFlow="AI_M41" aoFlow="AO_M41" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC41Offline" AlarmText="Alarm141 MFC41 Offline[DI-391]" />
<IoMfc3 id="Mfc42" display="Mfc42" schematicId="Mfc42" unit="sccm" aiActMode="AI_M42ActMode" aoSetMode="AO_M42CtrlMode" aiFlow="AI_M42" aoFlow="AO_M42" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC42Offline" AlarmText="Alarm142 MFC42 Offline[DI-392]" />
<IoMfc3 id="Mfc43" display="Mfc43" schematicId="Mfc43" unit="sccm" aiActMode="AI_M43ActMode" aoSetMode="AO_M43CtrlMode" aiFlow="AI_M43" aoFlow="AO_M43" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC43Offline" AlarmText="Alarm143 MFC43 Offline[DI-393]" />
<IoMfc3 id="Mfc44" display="Mfc44" schematicId="Mfc44" unit="sccm" aiActMode="AI_M44ActMode" aoSetMode="AO_M44CtrlMode" aiFlow="AI_M44" aoFlow="AO_M44" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC44Offline" AlarmText="Alarm144 MFC44 Offline[DI-394]" />
<IoMfc3 id="Mfc45" display="Mfc45" schematicId="Mfc45" unit="sccm" aiActMode="AI_M45ActMode" aoSetMode="AO_M45CtrlMode" aiFlow="AI_M45" aoFlow="AO_M45" scBasePath="PM.PM2.MFC" aioType="float" formatString="F1" diAlarm="DI_MFC45Offline" AlarmText="Alarm145 MFC45 Offline[DI-395]" />
</IoMfcs>
<IoPressureMeters classType="Aitex.Core.RT.Device.Devices.IoPressure" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoPressureMeter id="Pressure1" display="PC1" schematicId="Pressure1" scBasePath="PM.{module}.PC" unit="mbar" aioType="float" aiOpenDegree="AI_PC1Valve" aiActMode="AI_PC1ActMode" aoSetMode="AO_PC1CtrlMode" aiValue="AI_PressCtrl1" aoValue="AO_PressCtrl1" formatString="0.0" diAlarm="DI_PC01Offline" AlarmText="Alarm141 PC1 Offline[DI-391]" />
@ -543,7 +537,7 @@
doGreen="DO_TowerGreen" doYellow="DO_TowerYellow" doRed="DO_TowerRed" doBuzzer="DO_Buzzer"
aoBuzzerBlinkFreq="AO_BuzzerBlinkFreqHz"/>
</IoSignalTowers>
<IoChamberMoveBodys classType="Aitex.Core.RT.Device.Devices.IoChamberMoveBody" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoChamberMoveBodys classType="Aitex.Core.RT.Device.Devices.IoChamberMoveBodySicMultiple" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoChamberMoveBody id="ChamberMoveBody" module="" display="ChamberMoveBody" schematicId="ChamberMoveBody" unit="" aioType="" diUpFaceback="DI_ChamMoveBodyUp" diDownFaceback="DI_ChamMoveBodyDown" diFront=" DI_ChamMoveBodyFront" diEndFaceback="DI_ChamMoveBodyEnd" doUpSetpoint="DO_ChamMoveBodyUp" doDownSetpoint="DO_ChamMoveBodyDown" doUpBrake="DO_ChamMoveBodyUpAirBrake" doForward="DO_ChamMoveBodyForward" doBackward="DO_ChamMoveBodyBackward" doForwardLatch="DO_ChamMoveBodyBrakerForward" doBackwardLatch="DO_ChamMoveBodyBrakerBackward" diForwardLatch="DI_ChamMoveBodyUpLatchFW" diBackwardLatch="DI_ChamMoveBodyEndLatchBW" diRemote="DI_ChamLidPushButtonLocal" diLock="DI_ManualLidUpPB" diUpDownEnable="DI_ChamMoveBodyUpDownEnableFB" doUpDownEnable="DO_ChamMoveBodyUpDownEnable" />
</IoChamberMoveBodys>
<IoGasConnectors classType="Aitex.Core.RT.Device.Devices.IoGasConnector" assembly="MECF.Framework.RT.EquipmentLibrary">

8
Modules/Mainframe/PMs/PMModuleDevice.cs
View File

@ -308,6 +308,9 @@ namespace SicModules.PMs
[Tag("Mfc16")]
public IoMFC Mfc16 { get; set; }
[Tag("Mfc17")]
public IoMFC Mfc17 { get; set; }
[Tag("Mfc19")]
public IoMFC Mfc19 { get; set; }
@ -425,7 +428,7 @@ namespace SicModules.PMs
#region ChamberMoveBody
[Tag("ChamberMoveBody")]
[Tag("IoChamberMoveBodySicMultiple")]
public IoChamberMoveBody ChamberMoveBody { get; set; }
#endregion ChamberMoveBody
@ -517,7 +520,7 @@ namespace SicModules.PMs
private List<string> _mfc = new List<string>()
{
"Mfc1", "Mfc2", "Mfc3", "Mfc4", "Mfc5", "Mfc6", "Mfc7", "Mfc8","Mfc9",
"Mfc10", "Mfc11", "Mfc12", "Mfc13", "Mfc14", "Mfc15", "Mfc16","Mfc19",
"Mfc10", "Mfc11", "Mfc12", "Mfc13", "Mfc14", "Mfc15", "Mfc16","Mfc17","Mfc19",
"Mfc20","Mfc22", "Mfc23", "Mfc26", "Mfc27", "Mfc28", "Mfc29",
"Mfc31", "Mfc33", "Mfc34", "Mfc35", "Mfc36", "Mfc37", "Mfc38","Mfc31",
"Mfc40", "Mfc41", "Mfc42", "Mfc43", "Mfc44", "Mfc45"};
@ -546,6 +549,7 @@ namespace SicModules.PMs
list.Add(Mfc14);
list.Add(Mfc15);
list.Add(Mfc16);
list.Add(Mfc17);
list.Add(Mfc19);
list.Add(Mfc20);
list.Add(Mfc22);

3
Modules/Mainframe/PMs/Routines/PMChamberMoveBodyRoutine.cs
View File

@ -5,6 +5,7 @@ using Aitex.Core.RT.Device.Devices;
using Aitex.Core.RT.Event;
using Aitex.Core.RT.Routine;
using MECF.Framework.Common.Equipment;
using MECF.Framework.RT.EquipmentLibrary.Devices;
using SicModules.PMs.Routines.Base;
namespace SicModules.PMs.Routines
@ -78,7 +79,7 @@ namespace SicModules.PMs.Routines
Name = "MoveBody";
_pm1Module = pm1;
_ioChamberMoveBody = DEVICE.GetDevice<IoChamberMoveBody>($"{pm1.Name}.{"ChamberMoveBody"}");
_ioChamberMoveBody = DEVICE.GetDevice<IoChamberMoveBodySicMultiple>($"{pm1.Name}.{"ChamberMoveBody"}");
_ioGasConnector = DEVICE.GetDevice<IoGasConnector>($"{pm1.Name}.{"GasConnector"}");
_ioSHLid = DEVICE.GetDevice<IoLid>($"{pm1.Name}.{"SHLid"}");

44
Modules/Mainframe/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.587",
"PreReleaseTagWithDash": "-----multiplate-develop.587",
"PreReleaseTag": "----multiplate-develop.588",
"PreReleaseTagWithDash": "-----multiplate-develop.588",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 587,
"WeightedPreReleaseNumber": 587,
"PreReleaseNumber": 588,
"WeightedPreReleaseNumber": 588,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.671567ff45fd1bd0f9df6e3546cb75ea1302c905",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.587",
"LegacySemVer": "23.9.2-----multiplate-de587",
"LegacySemVerPadded": "23.9.2-----multiplate-d0587",
"AssemblySemVer": "23.9.2.587",
"AssemblySemFileVer": "23.9.2.587",
"FullSemVer": "23.9.2-----multiplate-develop.587",
"InformationalVersion": "23.9.2-----multiplate-develop.587+Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c",
"SemVer": "23.9.2-----multiplate-develop.588",
"LegacySemVer": "23.9.2-----multiplate-de588",
"LegacySemVerPadded": "23.9.2-----multiplate-d0588",
"AssemblySemVer": "23.9.2.588",
"AssemblySemFileVer": "23.9.2.588",
"FullSemVer": "23.9.2-----multiplate-develop.588",
"InformationalVersion": "23.9.2-----multiplate-develop.588+Branch.----multiplate-develop.Sha.671567ff45fd1bd0f9df6e3546cb75ea1302c905",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c",
"ShortSha": "4c18bc3",
"NuGetVersionV2": "23.9.2-----multiplate-d0587",
"NuGetVersion": "23.9.2-----multiplate-d0587",
"NuGetPreReleaseTagV2": "----multiplate-d0587",
"NuGetPreReleaseTag": "----multiplate-d0587",
"Sha": "671567ff45fd1bd0f9df6e3546cb75ea1302c905",
"ShortSha": "671567f",
"NuGetVersionV2": "23.9.2-----multiplate-d0588",
"NuGetVersion": "23.9.2-----multiplate-d0588",
"NuGetPreReleaseTagV2": "----multiplate-d0588",
"NuGetPreReleaseTag": "----multiplate-d0588",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 587,
"CommitsSinceVersionSourcePadded": "0587",
"UncommittedChanges": 27,
"CommitDate": "2024-06-24"
"CommitsSinceVersionSource": 588,
"CommitsSinceVersionSourcePadded": "0588",
"UncommittedChanges": 0,
"CommitDate": "2024-06-25"
}

44
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.587",
"PreReleaseTagWithDash": "-----multiplate-develop.587",
"PreReleaseTag": "----multiplate-develop.588",
"PreReleaseTagWithDash": "-----multiplate-develop.588",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 587,
"WeightedPreReleaseNumber": 587,
"PreReleaseNumber": 588,
"WeightedPreReleaseNumber": 588,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.671567ff45fd1bd0f9df6e3546cb75ea1302c905",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.587",
"LegacySemVer": "23.9.2-----multiplate-de587",
"LegacySemVerPadded": "23.9.2-----multiplate-d0587",
"AssemblySemVer": "23.9.2.587",
"AssemblySemFileVer": "23.9.2.587",
"FullSemVer": "23.9.2-----multiplate-develop.587",
"InformationalVersion": "23.9.2-----multiplate-develop.587+Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c",
"SemVer": "23.9.2-----multiplate-develop.588",
"LegacySemVer": "23.9.2-----multiplate-de588",
"LegacySemVerPadded": "23.9.2-----multiplate-d0588",
"AssemblySemVer": "23.9.2.588",
"AssemblySemFileVer": "23.9.2.588",
"FullSemVer": "23.9.2-----multiplate-develop.588",
"InformationalVersion": "23.9.2-----multiplate-develop.588+Branch.----multiplate-develop.Sha.671567ff45fd1bd0f9df6e3546cb75ea1302c905",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c",
"ShortSha": "4c18bc3",
"NuGetVersionV2": "23.9.2-----multiplate-d0587",
"NuGetVersion": "23.9.2-----multiplate-d0587",
"NuGetPreReleaseTagV2": "----multiplate-d0587",
"NuGetPreReleaseTag": "----multiplate-d0587",
"Sha": "671567ff45fd1bd0f9df6e3546cb75ea1302c905",
"ShortSha": "671567f",
"NuGetVersionV2": "23.9.2-----multiplate-d0588",
"NuGetVersion": "23.9.2-----multiplate-d0588",
"NuGetPreReleaseTagV2": "----multiplate-d0588",
"NuGetPreReleaseTag": "----multiplate-d0588",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 587,
"CommitsSinceVersionSourcePadded": "0587",
"UncommittedChanges": 27,
"CommitDate": "2024-06-24"
"CommitsSinceVersionSource": 588,
"CommitsSinceVersionSourcePadded": "0588",
"UncommittedChanges": 0,
"CommitDate": "2024-06-25"
}

44
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.587",
"PreReleaseTagWithDash": "-----multiplate-develop.587",
"PreReleaseTag": "----multiplate-develop.588",
"PreReleaseTagWithDash": "-----multiplate-develop.588",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 587,
"WeightedPreReleaseNumber": 587,
"PreReleaseNumber": 588,
"WeightedPreReleaseNumber": 588,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.671567ff45fd1bd0f9df6e3546cb75ea1302c905",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.587",
"LegacySemVer": "23.9.2-----multiplate-de587",
"LegacySemVerPadded": "23.9.2-----multiplate-d0587",
"AssemblySemVer": "23.9.2.587",
"AssemblySemFileVer": "23.9.2.587",
"FullSemVer": "23.9.2-----multiplate-develop.587",
"InformationalVersion": "23.9.2-----multiplate-develop.587+Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c",
"SemVer": "23.9.2-----multiplate-develop.588",
"LegacySemVer": "23.9.2-----multiplate-de588",
"LegacySemVerPadded": "23.9.2-----multiplate-d0588",
"AssemblySemVer": "23.9.2.588",
"AssemblySemFileVer": "23.9.2.588",
"FullSemVer": "23.9.2-----multiplate-develop.588",
"InformationalVersion": "23.9.2-----multiplate-develop.588+Branch.----multiplate-develop.Sha.671567ff45fd1bd0f9df6e3546cb75ea1302c905",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c",
"ShortSha": "4c18bc3",
"NuGetVersionV2": "23.9.2-----multiplate-d0587",
"NuGetVersion": "23.9.2-----multiplate-d0587",
"NuGetPreReleaseTagV2": "----multiplate-d0587",
"NuGetPreReleaseTag": "----multiplate-d0587",
"Sha": "671567ff45fd1bd0f9df6e3546cb75ea1302c905",
"ShortSha": "671567f",
"NuGetVersionV2": "23.9.2-----multiplate-d0588",
"NuGetVersion": "23.9.2-----multiplate-d0588",
"NuGetPreReleaseTagV2": "----multiplate-d0588",
"NuGetPreReleaseTag": "----multiplate-d0588",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 587,
"CommitsSinceVersionSourcePadded": "0587",
"UncommittedChanges": 27,
"CommitDate": "2024-06-24"
"CommitsSinceVersionSource": 588,
"CommitsSinceVersionSourcePadded": "0588",
"UncommittedChanges": 0,
"CommitDate": "2024-06-25"
}

5
SicUI/Controls/BodyBottom.xaml
View File

@ -62,7 +62,7 @@
Source="/SicUI;component/Themes/Images/parts/bodymove/bottom3.png" />
</Canvas>
<Canvas Canvas.Left="395" Canvas.Top="337">
<Canvas Canvas.Left="395" Canvas.Top="337" Visibility="Collapsed">
<common:AxisCanvas x:Name="canvasRing2">
<Image
Width="206"
@ -76,9 +76,10 @@
Canvas.Top="316"
Width="327"
Height="123"
Visibility="Collapsed"
Source="/SicUI;component/Themes/Images/parts/bodymove/Fixed.png" />
<Canvas Canvas.Left="395" Canvas.Top="357">
<Canvas Canvas.Left="395" Canvas.Top="357" Visibility="Collapsed">
<common:AxisCanvas x:Name="canvasRing">
<Image
Width="206"

2
SicUI/Controls/MoveBody.xaml
View File

@ -24,7 +24,7 @@
<lid:BodyLid
Canvas.Left="0"
Canvas.Top="50"
Canvas.Top="120"
ChamberBodyGroup="{Binding SelectedMoveBodyGroup}"
ChamberIsDown="{Binding IsChamMoveBodyDown}"
ChamberIsEnd="{Binding IsChamMoveBodyEnd}"

2
SicUI/Models/PMs/PMMotionViewModel.cs
View File

@ -75,7 +75,7 @@ namespace SicUI.Models.PMs
public float BottomLocation { get; set; }
public float RingLocation { get; set; }
private List<string> _moveBodyGroup = new List<string>() { "ShowHead", "Middle" };
private List<string> _moveBodyGroup = new List<string>() { "ShowHead" };
public List<string> MoveBodyGroup
{
get { return _moveBodyGroup; }

44
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.587",
"PreReleaseTagWithDash": "-----multiplate-develop.587",
"PreReleaseTag": "----multiplate-develop.588",
"PreReleaseTagWithDash": "-----multiplate-develop.588",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 587,
"WeightedPreReleaseNumber": 587,
"PreReleaseNumber": 588,
"WeightedPreReleaseNumber": 588,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.671567ff45fd1bd0f9df6e3546cb75ea1302c905",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.587",
"LegacySemVer": "23.9.2-----multiplate-de587",
"LegacySemVerPadded": "23.9.2-----multiplate-d0587",
"AssemblySemVer": "23.9.2.587",
"AssemblySemFileVer": "23.9.2.587",
"FullSemVer": "23.9.2-----multiplate-develop.587",
"InformationalVersion": "23.9.2-----multiplate-develop.587+Branch.----multiplate-develop.Sha.4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c",
"SemVer": "23.9.2-----multiplate-develop.588",
"LegacySemVer": "23.9.2-----multiplate-de588",
"LegacySemVerPadded": "23.9.2-----multiplate-d0588",
"AssemblySemVer": "23.9.2.588",
"AssemblySemFileVer": "23.9.2.588",
"FullSemVer": "23.9.2-----multiplate-develop.588",
"InformationalVersion": "23.9.2-----multiplate-develop.588+Branch.----multiplate-develop.Sha.671567ff45fd1bd0f9df6e3546cb75ea1302c905",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "4c18bc3c1736a4751da6f6c99bfdb84962b7ed2c",
"ShortSha": "4c18bc3",
"NuGetVersionV2": "23.9.2-----multiplate-d0587",
"NuGetVersion": "23.9.2-----multiplate-d0587",
"NuGetPreReleaseTagV2": "----multiplate-d0587",
"NuGetPreReleaseTag": "----multiplate-d0587",
"Sha": "671567ff45fd1bd0f9df6e3546cb75ea1302c905",
"ShortSha": "671567f",
"NuGetVersionV2": "23.9.2-----multiplate-d0588",
"NuGetVersion": "23.9.2-----multiplate-d0588",
"NuGetPreReleaseTagV2": "----multiplate-d0588",
"NuGetPreReleaseTag": "----multiplate-d0588",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 587,
"CommitsSinceVersionSourcePadded": "0587",
"UncommittedChanges": 27,
"CommitDate": "2024-06-24"
"CommitsSinceVersionSource": 588,
"CommitsSinceVersionSourcePadded": "0588",
"UncommittedChanges": 0,
"CommitDate": "2024-06-25"
}

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.

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

Binary file not shown.

BIN
ThirdParty/MECF.Framework/Sicentury.Localization.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll vendored
View File

Binary file not shown.