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

修改PM Routine相关内容

This commit is contained in:
hanqiangqiang 2024-07-23 16:59:02 +08:00
parent 8dc0d9634a
commit 54ab92d6a6
11 changed files with 100 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1195,7 +1195,7 @@ namespace SicModules.PMs
}
else if (mGroupName == MfcGroupName.M2toM45)
{
lst = new List<int>() { 2, 9, 15, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 33, 35, 36, 37, 38, 40, 41, 42, 43, 44, 45 };
lst = new List<int>() { 2, 9, 15,17, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 33, 35, 36, 37, 38, 40, 41, 42, 43, 44, 45 };
}
else if (mGroupName == MfcGroupName.M2toM40NoFinal1MFC)
{
@ -1207,7 +1207,7 @@ namespace SicModules.PMs
}
else if (mGroupName == MfcGroupName.M2toM26M43M44M45)
{
lst = new List<int>() { 2, 15, 9, 19, 20, 22, 23, 25, 26, 43 ,44 , 45};
lst = new List<int>() { 2, 15, 9,17, 19, 20, 22, 23, 25, 26, 43 ,44 , 45};
}
else if (mGroupName == MfcGroupName.M2toM26)
{

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

@ -225,7 +225,8 @@ namespace SicModules.PMs.Routines
SetThrottleToPressModeAndWait((int)RoutineStep.SetTVPressMode, _IoThrottle, 5);
//伺服压力设定值到0mbar
SetThrottleToTargetAndNoWait((int)RoutineStep.SetTv1, _IoThrottle, _pumpBasePressure);
//SetThrottleToTargetAndNoWait((int)RoutineStep.SetTv1, _IoThrottle, _pumpBasePressure);
SetThrottlePressureAndWait((int)RoutineStep.SetTv1, _IoThrottle, _pumpBasePressure, _pumpTimeOut);
//M2、M9、M15、M19-M40 MFC 3s ramp到0
SetMfcByGroup((int)RoutineStep.SetM2to40, MfcGroupName.M2toM45, 0, 3);

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

@ -338,7 +338,7 @@ namespace SicModules.PMs.Routines
SetPcToDefault((int)RoutineStep.SetPC, _lstPcList);
//设置M2,M9,M15,M19-M26 3s ramp 到default 值
SetMfcToDefaultByGroup((int)RoutineStep.SetM2toM26M43M44M45, MfcGroupName.M2toM26M43M44M45, 3);
SetMfcToDefaultByGroup((int)RoutineStep.SetM2toM26M43M44M45, MfcGroupName.M2toM45, 3);
//7 打开EPV2
SetIoValueByGroup((int)RoutineStep.SetEPV2, IoGroupName.EPV2, true, _IoValueOpenCloseTimeout);

4
Modules/Mainframe/PMs/Routines/PMToProcessIdleRoutine.cs
View File

@ -357,8 +357,8 @@ namespace SicModules.PMs.Routines
//13 打开J Valves
SetIoValueByGroup((int)RoutineStep.SetGroupJOpen, IoGroupName.J, true, _IoValueOpenCloseTimeout);
//设置M2,M9,M15,M19-M26 3s ramp 到default 值
SetMfcToDefaultByGroup((int)RoutineStep.SetM2toM26, MfcGroupName.M2toM26, 3);
//设置M2,M9,M15,M19-M26 M43、M44、M45 3s ramp 到default 值
SetMfcToDefaultByGroup((int)RoutineStep.SetM2toM26, MfcGroupName.M2toM26M43M44M45, 3);
//设置蝶阀Enable
SetThrottleEnableAndWait((int)RoutineStep.SetTVEnable, _IoThrottle, 5);

5
Modules/Mainframe/PMs/Routines/PMVacIdleRoutine.cs
View File

@ -229,8 +229,9 @@ namespace SicModules.PMs.Routines
//设置蝶阀为压力模式
SetThrottleToPressModeAndWait((int)RoutineStep.SetTVPressMode, _IoThrottle, 5);
//伺服压力设定值到0mbar
SetThrottleToTargetAndNoWait((int)RoutineStep.SetTv1, _IoThrottle, _vacPumpBasePressure);
//伺服到0mbar
//SetThrottleToTargetAndNoWait((int)RoutineStep.SetTv1, _IoThrottle, _vacPumpBasePressure);
SetThrottlePressureAndWait((int)RoutineStep.SetTv1, _IoThrottle, _vacPumpBasePressure, _pumpTimeout);
//10 M2、M9、M15、M19-M45 MFC 3s ramp到0
SetMfcByGroup((int)RoutineStep.SetM2to40, MfcGroupName.M2toM45, 0, 3);

44
Modules/Mainframe/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.996",
"PreReleaseTagWithDash": "-alpha.996",
"PreReleaseTag": "alpha.999",
"PreReleaseTagWithDash": "-alpha.999",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 996,
"WeightedPreReleaseNumber": 996,
"PreReleaseNumber": 999,
"WeightedPreReleaseNumber": 999,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.859ef96382c0515dab27d346d3145cd07281d8e1",
"FullBuildMetaData": "Branch.develop.Sha.8dc0d9634a5113d7caa4f59350b9f7166f5ea202",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.996",
"LegacySemVer": "0.1.0-alpha996",
"LegacySemVerPadded": "0.1.0-alpha0996",
"AssemblySemVer": "0.1.0.996",
"AssemblySemFileVer": "0.1.0.996",
"FullSemVer": "0.1.0-alpha.996",
"InformationalVersion": "0.1.0-alpha.996+Branch.develop.Sha.859ef96382c0515dab27d346d3145cd07281d8e1",
"SemVer": "0.1.0-alpha.999",
"LegacySemVer": "0.1.0-alpha999",
"LegacySemVerPadded": "0.1.0-alpha0999",
"AssemblySemVer": "0.1.0.999",
"AssemblySemFileVer": "0.1.0.999",
"FullSemVer": "0.1.0-alpha.999",
"InformationalVersion": "0.1.0-alpha.999+Branch.develop.Sha.8dc0d9634a5113d7caa4f59350b9f7166f5ea202",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "859ef96382c0515dab27d346d3145cd07281d8e1",
"ShortSha": "859ef96",
"NuGetVersionV2": "0.1.0-alpha0996",
"NuGetVersion": "0.1.0-alpha0996",
"NuGetPreReleaseTagV2": "alpha0996",
"NuGetPreReleaseTag": "alpha0996",
"Sha": "8dc0d9634a5113d7caa4f59350b9f7166f5ea202",
"ShortSha": "8dc0d96",
"NuGetVersionV2": "0.1.0-alpha0999",
"NuGetVersion": "0.1.0-alpha0999",
"NuGetPreReleaseTagV2": "alpha0999",
"NuGetPreReleaseTag": "alpha0999",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 996,
"CommitsSinceVersionSourcePadded": "0996",
"UncommittedChanges": 9,
"CommitDate": "2024-07-17"
"CommitsSinceVersionSource": 999,
"CommitsSinceVersionSourcePadded": "0999",
"UncommittedChanges": 0,
"CommitDate": "2024-07-19"
}

2
SicRT/Properties/AssemblyInfo.cs
View File

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

44
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.996",
"PreReleaseTagWithDash": "-alpha.996",
"PreReleaseTag": "alpha.999",
"PreReleaseTagWithDash": "-alpha.999",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 996,
"WeightedPreReleaseNumber": 996,
"PreReleaseNumber": 999,
"WeightedPreReleaseNumber": 999,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.859ef96382c0515dab27d346d3145cd07281d8e1",
"FullBuildMetaData": "Branch.develop.Sha.8dc0d9634a5113d7caa4f59350b9f7166f5ea202",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.996",
"LegacySemVer": "0.1.0-alpha996",
"LegacySemVerPadded": "0.1.0-alpha0996",
"AssemblySemVer": "0.1.0.996",
"AssemblySemFileVer": "0.1.0.996",
"FullSemVer": "0.1.0-alpha.996",
"InformationalVersion": "0.1.0-alpha.996+Branch.develop.Sha.859ef96382c0515dab27d346d3145cd07281d8e1",
"SemVer": "0.1.0-alpha.999",
"LegacySemVer": "0.1.0-alpha999",
"LegacySemVerPadded": "0.1.0-alpha0999",
"AssemblySemVer": "0.1.0.999",
"AssemblySemFileVer": "0.1.0.999",
"FullSemVer": "0.1.0-alpha.999",
"InformationalVersion": "0.1.0-alpha.999+Branch.develop.Sha.8dc0d9634a5113d7caa4f59350b9f7166f5ea202",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "859ef96382c0515dab27d346d3145cd07281d8e1",
"ShortSha": "859ef96",
"NuGetVersionV2": "0.1.0-alpha0996",
"NuGetVersion": "0.1.0-alpha0996",
"NuGetPreReleaseTagV2": "alpha0996",
"NuGetPreReleaseTag": "alpha0996",
"Sha": "8dc0d9634a5113d7caa4f59350b9f7166f5ea202",
"ShortSha": "8dc0d96",
"NuGetVersionV2": "0.1.0-alpha0999",
"NuGetVersion": "0.1.0-alpha0999",
"NuGetPreReleaseTagV2": "alpha0999",
"NuGetPreReleaseTag": "alpha0999",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 996,
"CommitsSinceVersionSourcePadded": "0996",
"UncommittedChanges": 9,
"CommitDate": "2024-07-17"
"CommitsSinceVersionSource": 999,
"CommitsSinceVersionSourcePadded": "0999",
"UncommittedChanges": 0,
"CommitDate": "2024-07-19"
}

44
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.996",
"PreReleaseTagWithDash": "-alpha.996",
"PreReleaseTag": "alpha.999",
"PreReleaseTagWithDash": "-alpha.999",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 996,
"WeightedPreReleaseNumber": 996,
"PreReleaseNumber": 999,
"WeightedPreReleaseNumber": 999,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.859ef96382c0515dab27d346d3145cd07281d8e1",
"FullBuildMetaData": "Branch.develop.Sha.8dc0d9634a5113d7caa4f59350b9f7166f5ea202",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.996",
"LegacySemVer": "0.1.0-alpha996",
"LegacySemVerPadded": "0.1.0-alpha0996",
"AssemblySemVer": "0.1.0.996",
"AssemblySemFileVer": "0.1.0.996",
"FullSemVer": "0.1.0-alpha.996",
"InformationalVersion": "0.1.0-alpha.996+Branch.develop.Sha.859ef96382c0515dab27d346d3145cd07281d8e1",
"SemVer": "0.1.0-alpha.999",
"LegacySemVer": "0.1.0-alpha999",
"LegacySemVerPadded": "0.1.0-alpha0999",
"AssemblySemVer": "0.1.0.999",
"AssemblySemFileVer": "0.1.0.999",
"FullSemVer": "0.1.0-alpha.999",
"InformationalVersion": "0.1.0-alpha.999+Branch.develop.Sha.8dc0d9634a5113d7caa4f59350b9f7166f5ea202",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "859ef96382c0515dab27d346d3145cd07281d8e1",
"ShortSha": "859ef96",
"NuGetVersionV2": "0.1.0-alpha0996",
"NuGetVersion": "0.1.0-alpha0996",
"NuGetPreReleaseTagV2": "alpha0996",
"NuGetPreReleaseTag": "alpha0996",
"Sha": "8dc0d9634a5113d7caa4f59350b9f7166f5ea202",
"ShortSha": "8dc0d96",
"NuGetVersionV2": "0.1.0-alpha0999",
"NuGetVersion": "0.1.0-alpha0999",
"NuGetPreReleaseTagV2": "alpha0999",
"NuGetPreReleaseTag": "alpha0999",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 996,
"CommitsSinceVersionSourcePadded": "0996",
"UncommittedChanges": 9,
"CommitDate": "2024-07-17"
"CommitsSinceVersionSource": 999,
"CommitsSinceVersionSourcePadded": "0999",
"UncommittedChanges": 0,
"CommitDate": "2024-07-19"
}

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.40717")]
[assembly: AssemblyVersion("1.0.1.40723")]
[assembly: AssemblyInformationalVersion("Sic多片机（无EFEM）")]

44
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.996",
"PreReleaseTagWithDash": "-alpha.996",
"PreReleaseTag": "alpha.999",
"PreReleaseTagWithDash": "-alpha.999",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 996,
"WeightedPreReleaseNumber": 996,
"PreReleaseNumber": 999,
"WeightedPreReleaseNumber": 999,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.859ef96382c0515dab27d346d3145cd07281d8e1",
"FullBuildMetaData": "Branch.develop.Sha.8dc0d9634a5113d7caa4f59350b9f7166f5ea202",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.996",
"LegacySemVer": "0.1.0-alpha996",
"LegacySemVerPadded": "0.1.0-alpha0996",
"AssemblySemVer": "0.1.0.996",
"AssemblySemFileVer": "0.1.0.996",
"FullSemVer": "0.1.0-alpha.996",
"InformationalVersion": "0.1.0-alpha.996+Branch.develop.Sha.859ef96382c0515dab27d346d3145cd07281d8e1",
"SemVer": "0.1.0-alpha.999",
"LegacySemVer": "0.1.0-alpha999",
"LegacySemVerPadded": "0.1.0-alpha0999",
"AssemblySemVer": "0.1.0.999",
"AssemblySemFileVer": "0.1.0.999",
"FullSemVer": "0.1.0-alpha.999",
"InformationalVersion": "0.1.0-alpha.999+Branch.develop.Sha.8dc0d9634a5113d7caa4f59350b9f7166f5ea202",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "859ef96382c0515dab27d346d3145cd07281d8e1",
"ShortSha": "859ef96",
"NuGetVersionV2": "0.1.0-alpha0996",
"NuGetVersion": "0.1.0-alpha0996",
"NuGetPreReleaseTagV2": "alpha0996",
"NuGetPreReleaseTag": "alpha0996",
"Sha": "8dc0d9634a5113d7caa4f59350b9f7166f5ea202",
"ShortSha": "8dc0d96",
"NuGetVersionV2": "0.1.0-alpha0999",
"NuGetVersion": "0.1.0-alpha0999",
"NuGetPreReleaseTagV2": "alpha0999",
"NuGetPreReleaseTag": "alpha0999",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 996,
"CommitsSinceVersionSourcePadded": "0996",
"UncommittedChanges": 9,
"CommitDate": "2024-07-17"
"CommitsSinceVersionSource": 999,
"CommitsSinceVersionSourcePadded": "0999",
"UncommittedChanges": 0,
"CommitDate": "2024-07-19"
}