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

更新dll，修改Recipe控制气阀类

This commit is contained in:
hanqiangqiang 2024-07-15 13:53:02 +08:00
parent 490b0a92a7
commit 06c4d228ba
15 changed files with 104 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -600,7 +600,7 @@
<IoHeartBeat id="HeartBeat" display="HeartBeat" schematicId="HeartBeat" aioType="float" ai="AI_HeartBeat" ao="AO_HeartBeat" />
</IoHeartBeats>
<RecipeValveActions classType="MECF.Framework.RT.EquipmentLibrary.PmDevices.RecipeValveAction" assembly="MECF.Framework.RT.EquipmentLibrary">
<RecipeValveActions classType="Aitex.Core.RT.Device.PmDevices.RecipeValveAction" assembly="MECF.Framework.RT.EquipmentLibrary">
<RecipeValveAction id="C2H4" display="" schematicId="" unit="">
<Valve Name="V58" Purge="false" Vent="true" Run="true" />
<Valve Name="V58s" Purge="true" Vent="false" Run="false" />
@ -631,8 +631,8 @@
<RecipeValveAction id="SiH4" display="" schematicId="" unit="">
<Valve Name="V52" Purge="false" Vent="true" Run="true" />
<Valve Name="V52s" Purge="true" Vent="false" Run="false" />
<Valve Name="V55" Purge="false" Vent="false" Run="true" />
<Valve Name="V56" Purge="true" Vent="true" Run="false" />
<Valve Name="V53" Purge="false" Vent="false" Run="true" />
<Valve Name="V53s" Purge="true" Vent="true" Run="false" />
<Valve Name="V62" Purge="true" Vent="true" Run="true" />
</RecipeValveAction>

42
Modules/Mainframe/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.991",
"PreReleaseTagWithDash": "-alpha.991",
"PreReleaseTag": "alpha.992",
"PreReleaseTagWithDash": "-alpha.992",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 991,
"WeightedPreReleaseNumber": 991,
"PreReleaseNumber": 992,
"WeightedPreReleaseNumber": 992,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.598d5ea0f8e9c21b867e90d5002d63bb08601232",
"FullBuildMetaData": "Branch.develop.Sha.490b0a92a7922f2d08b5765648a8eb70f7c99828",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.991",
"LegacySemVer": "0.1.0-alpha991",
"LegacySemVerPadded": "0.1.0-alpha0991",
"AssemblySemVer": "0.1.0.991",
"AssemblySemFileVer": "0.1.0.991",
"FullSemVer": "0.1.0-alpha.991",
"InformationalVersion": "0.1.0-alpha.991+Branch.develop.Sha.598d5ea0f8e9c21b867e90d5002d63bb08601232",
"SemVer": "0.1.0-alpha.992",
"LegacySemVer": "0.1.0-alpha992",
"LegacySemVerPadded": "0.1.0-alpha0992",
"AssemblySemVer": "0.1.0.992",
"AssemblySemFileVer": "0.1.0.992",
"FullSemVer": "0.1.0-alpha.992",
"InformationalVersion": "0.1.0-alpha.992+Branch.develop.Sha.490b0a92a7922f2d08b5765648a8eb70f7c99828",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "598d5ea0f8e9c21b867e90d5002d63bb08601232",
"ShortSha": "598d5ea",
"NuGetVersionV2": "0.1.0-alpha0991",
"NuGetVersion": "0.1.0-alpha0991",
"NuGetPreReleaseTagV2": "alpha0991",
"NuGetPreReleaseTag": "alpha0991",
"Sha": "490b0a92a7922f2d08b5765648a8eb70f7c99828",
"ShortSha": "490b0a9",
"NuGetVersionV2": "0.1.0-alpha0992",
"NuGetVersion": "0.1.0-alpha0992",
"NuGetPreReleaseTagV2": "alpha0992",
"NuGetPreReleaseTag": "alpha0992",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 991,
"CommitsSinceVersionSourcePadded": "0991",
"UncommittedChanges": 9,
"CommitsSinceVersionSource": 992,
"CommitsSinceVersionSourcePadded": "0992",
"UncommittedChanges": 0,
"CommitDate": "2024-07-15"
}

42
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.991",
"PreReleaseTagWithDash": "-alpha.991",
"PreReleaseTag": "alpha.992",
"PreReleaseTagWithDash": "-alpha.992",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 991,
"WeightedPreReleaseNumber": 991,
"PreReleaseNumber": 992,
"WeightedPreReleaseNumber": 992,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.598d5ea0f8e9c21b867e90d5002d63bb08601232",
"FullBuildMetaData": "Branch.develop.Sha.490b0a92a7922f2d08b5765648a8eb70f7c99828",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.991",
"LegacySemVer": "0.1.0-alpha991",
"LegacySemVerPadded": "0.1.0-alpha0991",
"AssemblySemVer": "0.1.0.991",
"AssemblySemFileVer": "0.1.0.991",
"FullSemVer": "0.1.0-alpha.991",
"InformationalVersion": "0.1.0-alpha.991+Branch.develop.Sha.598d5ea0f8e9c21b867e90d5002d63bb08601232",
"SemVer": "0.1.0-alpha.992",
"LegacySemVer": "0.1.0-alpha992",
"LegacySemVerPadded": "0.1.0-alpha0992",
"AssemblySemVer": "0.1.0.992",
"AssemblySemFileVer": "0.1.0.992",
"FullSemVer": "0.1.0-alpha.992",
"InformationalVersion": "0.1.0-alpha.992+Branch.develop.Sha.490b0a92a7922f2d08b5765648a8eb70f7c99828",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "598d5ea0f8e9c21b867e90d5002d63bb08601232",
"ShortSha": "598d5ea",
"NuGetVersionV2": "0.1.0-alpha0991",
"NuGetVersion": "0.1.0-alpha0991",
"NuGetPreReleaseTagV2": "alpha0991",
"NuGetPreReleaseTag": "alpha0991",
"Sha": "490b0a92a7922f2d08b5765648a8eb70f7c99828",
"ShortSha": "490b0a9",
"NuGetVersionV2": "0.1.0-alpha0992",
"NuGetVersion": "0.1.0-alpha0992",
"NuGetPreReleaseTagV2": "alpha0992",
"NuGetPreReleaseTag": "alpha0992",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 991,
"CommitsSinceVersionSourcePadded": "0991",
"UncommittedChanges": 9,
"CommitsSinceVersionSource": 992,
"CommitsSinceVersionSourcePadded": "0992",
"UncommittedChanges": 0,
"CommitDate": "2024-07-15"
}

42
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.991",
"PreReleaseTagWithDash": "-alpha.991",
"PreReleaseTag": "alpha.992",
"PreReleaseTagWithDash": "-alpha.992",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 991,
"WeightedPreReleaseNumber": 991,
"PreReleaseNumber": 992,
"WeightedPreReleaseNumber": 992,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.598d5ea0f8e9c21b867e90d5002d63bb08601232",
"FullBuildMetaData": "Branch.develop.Sha.490b0a92a7922f2d08b5765648a8eb70f7c99828",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.991",
"LegacySemVer": "0.1.0-alpha991",
"LegacySemVerPadded": "0.1.0-alpha0991",
"AssemblySemVer": "0.1.0.991",
"AssemblySemFileVer": "0.1.0.991",
"FullSemVer": "0.1.0-alpha.991",
"InformationalVersion": "0.1.0-alpha.991+Branch.develop.Sha.598d5ea0f8e9c21b867e90d5002d63bb08601232",
"SemVer": "0.1.0-alpha.992",
"LegacySemVer": "0.1.0-alpha992",
"LegacySemVerPadded": "0.1.0-alpha0992",
"AssemblySemVer": "0.1.0.992",
"AssemblySemFileVer": "0.1.0.992",
"FullSemVer": "0.1.0-alpha.992",
"InformationalVersion": "0.1.0-alpha.992+Branch.develop.Sha.490b0a92a7922f2d08b5765648a8eb70f7c99828",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "598d5ea0f8e9c21b867e90d5002d63bb08601232",
"ShortSha": "598d5ea",
"NuGetVersionV2": "0.1.0-alpha0991",
"NuGetVersion": "0.1.0-alpha0991",
"NuGetPreReleaseTagV2": "alpha0991",
"NuGetPreReleaseTag": "alpha0991",
"Sha": "490b0a92a7922f2d08b5765648a8eb70f7c99828",
"ShortSha": "490b0a9",
"NuGetVersionV2": "0.1.0-alpha0992",
"NuGetVersion": "0.1.0-alpha0992",
"NuGetPreReleaseTagV2": "alpha0992",
"NuGetPreReleaseTag": "alpha0992",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 991,
"CommitsSinceVersionSourcePadded": "0991",
"UncommittedChanges": 9,
"CommitsSinceVersionSource": 992,
"CommitsSinceVersionSourcePadded": "0992",
"UncommittedChanges": 0,
"CommitDate": "2024-07-15"
}

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

@ -1935,12 +1935,25 @@
MoveSpeed="{Binding V32MoveSpeed}"
RightDirection="None" />
<industrialcontrol:PipeLine
Canvas.Left="255"
Canvas.Left="253"
Canvas.Top="94"
Width="885"
Width="26"
Height="{StaticResource ResourceKey=Pipe_Height}"
HorizontalAlignment="Center"
VerticalAlignment="Top"
HorizontalAlignment="Left"
VerticalAlignment="Center"
CenterColor="{StaticResource ResourceKey=EdgeColorRed}"
EdgeColor="{StaticResource ResourceKey=EdgeColorRed}"
FlowDirection="RightToLeft"
LeftDirection="None"
MoveSpeed="{Binding V32MoveSpeed}"
RightDirection="None" />
<industrialcontrol:PipeLine
Canvas.Left="281"
Canvas.Top="94"
Width="859"
Height="{StaticResource ResourceKey=Pipe_Height}"
HorizontalAlignment="Left"
VerticalAlignment="Center"
CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
FlowDirection="RightToLeft"

42
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.991",
"PreReleaseTagWithDash": "-alpha.991",
"PreReleaseTag": "alpha.992",
"PreReleaseTagWithDash": "-alpha.992",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 991,
"WeightedPreReleaseNumber": 991,
"PreReleaseNumber": 992,
"WeightedPreReleaseNumber": 992,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.598d5ea0f8e9c21b867e90d5002d63bb08601232",
"FullBuildMetaData": "Branch.develop.Sha.490b0a92a7922f2d08b5765648a8eb70f7c99828",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.991",
"LegacySemVer": "0.1.0-alpha991",
"LegacySemVerPadded": "0.1.0-alpha0991",
"AssemblySemVer": "0.1.0.991",
"AssemblySemFileVer": "0.1.0.991",
"FullSemVer": "0.1.0-alpha.991",
"InformationalVersion": "0.1.0-alpha.991+Branch.develop.Sha.598d5ea0f8e9c21b867e90d5002d63bb08601232",
"SemVer": "0.1.0-alpha.992",
"LegacySemVer": "0.1.0-alpha992",
"LegacySemVerPadded": "0.1.0-alpha0992",
"AssemblySemVer": "0.1.0.992",
"AssemblySemFileVer": "0.1.0.992",
"FullSemVer": "0.1.0-alpha.992",
"InformationalVersion": "0.1.0-alpha.992+Branch.develop.Sha.490b0a92a7922f2d08b5765648a8eb70f7c99828",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "598d5ea0f8e9c21b867e90d5002d63bb08601232",
"ShortSha": "598d5ea",
"NuGetVersionV2": "0.1.0-alpha0991",
"NuGetVersion": "0.1.0-alpha0991",
"NuGetPreReleaseTagV2": "alpha0991",
"NuGetPreReleaseTag": "alpha0991",
"Sha": "490b0a92a7922f2d08b5765648a8eb70f7c99828",
"ShortSha": "490b0a9",
"NuGetVersionV2": "0.1.0-alpha0992",
"NuGetVersion": "0.1.0-alpha0992",
"NuGetPreReleaseTagV2": "alpha0992",
"NuGetPreReleaseTag": "alpha0992",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 991,
"CommitsSinceVersionSourcePadded": "0991",
"UncommittedChanges": 9,
"CommitsSinceVersionSource": 992,
"CommitsSinceVersionSourcePadded": "0992",
"UncommittedChanges": 0,
"CommitDate": "2024-07-15"
}

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.