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

修改大流量MFC不能按照分步Ramp

This commit is contained in:
hanqiangqiang 2024-07-15 09:09:16 +08:00
parent 1ff2d1e174
commit 598d5ea0f8
10 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ namespace SicModules.PMs
public enum MfcGroupName
{
Final1, Final2, M1to16, M2M9M15_M19toM26, M2toM45, M2toM40NoFinal1MFC, M27toM38, M2toM26, M2toM26M43M44M45, M27toM45, M19toM33, M36, M28293140,
Final1, Final2, M1to16, M2M9M15_M19toM26, M2toM45, M2toM40NoFinal1MFC, M27toM38, M2toM26, M2toM26M43M44M45, M27toM45, M19toM33, M36, M2829313540To42,
M19toM26, All, M35M37, M35M36M37M38, M38
};
@ -1221,9 +1221,9 @@ namespace SicModules.PMs
{
lst = new List<int>() { 27, 28, 29, 31, 33, 32, 35, 36, 37, 38, 40 ,41 ,42 ,43 ,44, 45};
}
else if (mGroupName == MfcGroupName.M28293140)
else if (mGroupName == MfcGroupName.M2829313540To42)
{
lst = new List<int>() { 28, 29, 31, 40 };
lst = new List<int>() { 28, 29, 31,35, 40, 41,42};
}
else if (mGroupName == MfcGroupName.M19toM33)
{

2
Modules/Mainframe/PMs/Routines/Base/PMBaseRoutine.cs
View File

@ -1322,7 +1322,7 @@ namespace SicModules.PMs.Routines.Base
Notify($"Set MFC28,29,31,40 to pressureLevel [{cIntLv - 50},{cIntLv + 50})");
}
_lastPressureLevel = level;
_pm.SetMfcRampByGroupAndPressure(MfcGroupName.M28293140, Convert.ToDouble((int)level));
_pm.SetMfcRampByGroupAndPressure(MfcGroupName.M2829313540To42, Convert.ToDouble((int)level));
}
}
}

2
Modules/Mainframe/PMs/Routines/PMToAtmIdleRoutine.cs
View File

@ -254,7 +254,7 @@ namespace SicModules.PMs.Routines
WaitPMPressureAndSetMfcSpecial((int)RoutineStep.WaitPmPressureUp, _ventBasePressure, _waitPMPressureUpTimeout);
//设置M28,M29,M31,M40 3s ramp 到default 值
//SetMfcToDefaultByGroup((int)RoutineStep.SetMfc28to40Default, MfcGroupName.M28293140, 3);
//SetMfcToDefaultByGroup((int)RoutineStep.SetMfc28to40Default, MfcGroupName.M2829313540To42, 3);
}
catch (RoutineBreakException)
{

2
Modules/Mainframe/PMs/Routines/PMVentRoutine.cs
View File

@ -255,7 +255,7 @@ namespace SicModules.PMs.Routines
WaitPMPressureAndSetMfcSpecial((int)RoutineStep.WaitPmPressureUp, _ventBasePressure, _waitPMPressureUpTimeout); //等待反应腔压力大于1000
//设置M28,M29,M31,M40 3s ramp 到default 值
//SetMfcToDefaultByGroup((int)RoutineStep.SetMfc28to40Default, MfcGroupName.M28293140, 3);
//SetMfcToDefaultByGroup((int)RoutineStep.SetMfc28to40Default, MfcGroupName.M2829313540To42, 3);
_pmIoInterLock.SetPMVentRoutineRunning(false, out _);

42
Modules/Mainframe/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.988",
"PreReleaseTagWithDash": "-alpha.988",
"PreReleaseTag": "alpha.990",
"PreReleaseTagWithDash": "-alpha.990",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 988,
"WeightedPreReleaseNumber": 988,
"PreReleaseNumber": 990,
"WeightedPreReleaseNumber": 990,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.a9c77f844c568f05028d982403c2925c2a9bf55c",
"FullBuildMetaData": "Branch.develop.Sha.1ff2d1e174c59cfb0793e292ade0129a7ef69fd1",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.988",
"LegacySemVer": "0.1.0-alpha988",
"LegacySemVerPadded": "0.1.0-alpha0988",
"AssemblySemVer": "0.1.0.988",
"AssemblySemFileVer": "0.1.0.988",
"FullSemVer": "0.1.0-alpha.988",
"InformationalVersion": "0.1.0-alpha.988+Branch.develop.Sha.a9c77f844c568f05028d982403c2925c2a9bf55c",
"SemVer": "0.1.0-alpha.990",
"LegacySemVer": "0.1.0-alpha990",
"LegacySemVerPadded": "0.1.0-alpha0990",
"AssemblySemVer": "0.1.0.990",
"AssemblySemFileVer": "0.1.0.990",
"FullSemVer": "0.1.0-alpha.990",
"InformationalVersion": "0.1.0-alpha.990+Branch.develop.Sha.1ff2d1e174c59cfb0793e292ade0129a7ef69fd1",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "a9c77f844c568f05028d982403c2925c2a9bf55c",
"ShortSha": "a9c77f8",
"NuGetVersionV2": "0.1.0-alpha0988",
"NuGetVersion": "0.1.0-alpha0988",
"NuGetPreReleaseTagV2": "alpha0988",
"NuGetPreReleaseTag": "alpha0988",
"Sha": "1ff2d1e174c59cfb0793e292ade0129a7ef69fd1",
"ShortSha": "1ff2d1e",
"NuGetVersionV2": "0.1.0-alpha0990",
"NuGetVersion": "0.1.0-alpha0990",
"NuGetPreReleaseTagV2": "alpha0990",
"NuGetPreReleaseTag": "alpha0990",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 988,
"CommitsSinceVersionSourcePadded": "0988",
"CommitsSinceVersionSource": 990,
"CommitsSinceVersionSourcePadded": "0990",
"UncommittedChanges": 0,
"CommitDate": "2024-07-10"
"CommitDate": "2024-07-11"
}

2
SicRT/Properties/AssemblyInfo.cs
View File

@ -51,5 +51,5 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
[assembly: AssemblyVersion("1.0.1.40711")]
[assembly: AssemblyVersion("1.0.1.40715")]
[assembly: AssemblyInformationalVersion("Sic多片机（无EFEM）")]

42
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.988",
"PreReleaseTagWithDash": "-alpha.988",
"PreReleaseTag": "alpha.990",
"PreReleaseTagWithDash": "-alpha.990",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 988,
"WeightedPreReleaseNumber": 988,
"PreReleaseNumber": 990,
"WeightedPreReleaseNumber": 990,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.a9c77f844c568f05028d982403c2925c2a9bf55c",
"FullBuildMetaData": "Branch.develop.Sha.1ff2d1e174c59cfb0793e292ade0129a7ef69fd1",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.988",
"LegacySemVer": "0.1.0-alpha988",
"LegacySemVerPadded": "0.1.0-alpha0988",
"AssemblySemVer": "0.1.0.988",
"AssemblySemFileVer": "0.1.0.988",
"FullSemVer": "0.1.0-alpha.988",
"InformationalVersion": "0.1.0-alpha.988+Branch.develop.Sha.a9c77f844c568f05028d982403c2925c2a9bf55c",
"SemVer": "0.1.0-alpha.990",
"LegacySemVer": "0.1.0-alpha990",
"LegacySemVerPadded": "0.1.0-alpha0990",
"AssemblySemVer": "0.1.0.990",
"AssemblySemFileVer": "0.1.0.990",
"FullSemVer": "0.1.0-alpha.990",
"InformationalVersion": "0.1.0-alpha.990+Branch.develop.Sha.1ff2d1e174c59cfb0793e292ade0129a7ef69fd1",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "a9c77f844c568f05028d982403c2925c2a9bf55c",
"ShortSha": "a9c77f8",
"NuGetVersionV2": "0.1.0-alpha0988",
"NuGetVersion": "0.1.0-alpha0988",
"NuGetPreReleaseTagV2": "alpha0988",
"NuGetPreReleaseTag": "alpha0988",
"Sha": "1ff2d1e174c59cfb0793e292ade0129a7ef69fd1",
"ShortSha": "1ff2d1e",
"NuGetVersionV2": "0.1.0-alpha0990",
"NuGetVersion": "0.1.0-alpha0990",
"NuGetPreReleaseTagV2": "alpha0990",
"NuGetPreReleaseTag": "alpha0990",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 988,
"CommitsSinceVersionSourcePadded": "0988",
"CommitsSinceVersionSource": 990,
"CommitsSinceVersionSourcePadded": "0990",
"UncommittedChanges": 0,
"CommitDate": "2024-07-10"
"CommitDate": "2024-07-11"
}

42
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.988",
"PreReleaseTagWithDash": "-alpha.988",
"PreReleaseTag": "alpha.990",
"PreReleaseTagWithDash": "-alpha.990",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 988,
"WeightedPreReleaseNumber": 988,
"PreReleaseNumber": 990,
"WeightedPreReleaseNumber": 990,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.a9c77f844c568f05028d982403c2925c2a9bf55c",
"FullBuildMetaData": "Branch.develop.Sha.1ff2d1e174c59cfb0793e292ade0129a7ef69fd1",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.988",
"LegacySemVer": "0.1.0-alpha988",
"LegacySemVerPadded": "0.1.0-alpha0988",
"AssemblySemVer": "0.1.0.988",
"AssemblySemFileVer": "0.1.0.988",
"FullSemVer": "0.1.0-alpha.988",
"InformationalVersion": "0.1.0-alpha.988+Branch.develop.Sha.a9c77f844c568f05028d982403c2925c2a9bf55c",
"SemVer": "0.1.0-alpha.990",
"LegacySemVer": "0.1.0-alpha990",
"LegacySemVerPadded": "0.1.0-alpha0990",
"AssemblySemVer": "0.1.0.990",
"AssemblySemFileVer": "0.1.0.990",
"FullSemVer": "0.1.0-alpha.990",
"InformationalVersion": "0.1.0-alpha.990+Branch.develop.Sha.1ff2d1e174c59cfb0793e292ade0129a7ef69fd1",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "a9c77f844c568f05028d982403c2925c2a9bf55c",
"ShortSha": "a9c77f8",
"NuGetVersionV2": "0.1.0-alpha0988",
"NuGetVersion": "0.1.0-alpha0988",
"NuGetPreReleaseTagV2": "alpha0988",
"NuGetPreReleaseTag": "alpha0988",
"Sha": "1ff2d1e174c59cfb0793e292ade0129a7ef69fd1",
"ShortSha": "1ff2d1e",
"NuGetVersionV2": "0.1.0-alpha0990",
"NuGetVersion": "0.1.0-alpha0990",
"NuGetPreReleaseTagV2": "alpha0990",
"NuGetPreReleaseTag": "alpha0990",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 988,
"CommitsSinceVersionSourcePadded": "0988",
"CommitsSinceVersionSource": 990,
"CommitsSinceVersionSourcePadded": "0990",
"UncommittedChanges": 0,
"CommitDate": "2024-07-10"
"CommitDate": "2024-07-11"
}

2
SicUI/Properties/AssemblyInfo.cs
View File

@ -54,5 +54,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.1.40711")]
[assembly: AssemblyVersion("1.0.1.40715")]
[assembly: AssemblyInformationalVersion("Sic多片机（无EFEM）")]

42
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.988",
"PreReleaseTagWithDash": "-alpha.988",
"PreReleaseTag": "alpha.990",
"PreReleaseTagWithDash": "-alpha.990",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 988,
"WeightedPreReleaseNumber": 988,
"PreReleaseNumber": 990,
"WeightedPreReleaseNumber": 990,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.a9c77f844c568f05028d982403c2925c2a9bf55c",
"FullBuildMetaData": "Branch.develop.Sha.1ff2d1e174c59cfb0793e292ade0129a7ef69fd1",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.988",
"LegacySemVer": "0.1.0-alpha988",
"LegacySemVerPadded": "0.1.0-alpha0988",
"AssemblySemVer": "0.1.0.988",
"AssemblySemFileVer": "0.1.0.988",
"FullSemVer": "0.1.0-alpha.988",
"InformationalVersion": "0.1.0-alpha.988+Branch.develop.Sha.a9c77f844c568f05028d982403c2925c2a9bf55c",
"SemVer": "0.1.0-alpha.990",
"LegacySemVer": "0.1.0-alpha990",
"LegacySemVerPadded": "0.1.0-alpha0990",
"AssemblySemVer": "0.1.0.990",
"AssemblySemFileVer": "0.1.0.990",
"FullSemVer": "0.1.0-alpha.990",
"InformationalVersion": "0.1.0-alpha.990+Branch.develop.Sha.1ff2d1e174c59cfb0793e292ade0129a7ef69fd1",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "a9c77f844c568f05028d982403c2925c2a9bf55c",
"ShortSha": "a9c77f8",
"NuGetVersionV2": "0.1.0-alpha0988",
"NuGetVersion": "0.1.0-alpha0988",
"NuGetPreReleaseTagV2": "alpha0988",
"NuGetPreReleaseTag": "alpha0988",
"Sha": "1ff2d1e174c59cfb0793e292ade0129a7ef69fd1",
"ShortSha": "1ff2d1e",
"NuGetVersionV2": "0.1.0-alpha0990",
"NuGetVersion": "0.1.0-alpha0990",
"NuGetPreReleaseTagV2": "alpha0990",
"NuGetPreReleaseTag": "alpha0990",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 988,
"CommitsSinceVersionSourcePadded": "0988",
"CommitsSinceVersionSource": 990,
"CommitsSinceVersionSourcePadded": "0990",
"UncommittedChanges": 0,
"CommitDate": "2024-07-10"
"CommitDate": "2024-07-11"
}