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

1修改调度器中Reset函数，对象为null调用 

2PM在Home时，隔热罩ServoOn
This commit is contained in:
hanqiangqiang 2024-07-10 17:29:09 +08:00
parent 3daf894b80
commit a9c77f844c
9 changed files with 128 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/Mainframe/PMs/RecipeExecutions/PostProcess.cs
View File

@ -238,6 +238,13 @@ namespace SicModules.PMs.RecipeExecutions
WaitRotationValve((int)RoutineStep.WaitRotation1, _rotationSpeed, true, _rotationSpeed / 2);
Cleanup((int)RoutineStep.Cleanup);
SetRoutinePostRuningDo();
}
private void SetRoutinePostRuningDo()
{
_pmInterLock.SetPMPostProcessRunning(false, out _);
}
private void Cleanup(int stepId)
@ -247,8 +254,6 @@ namespace SicModules.PMs.RecipeExecutions
//保存PostProcess结束的时间
SC.SetItemValue($"PM.{Module}.PostProcessEndTime",DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
_pmInterLock.SetPMPostProcessRunning(false, out _);
return true;
});

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

@ -542,6 +542,35 @@ namespace SicModules.PMs.Routines.Base
}
}
protected void SetConfinementRingEnable(int id)
{
Tuple<bool, Result> ret = Execute(id, () =>
{
Notify($"Set {Module} confinement ring enable");
if (_pm.ConfinementRing.RingServoOn)
{
return true;
}
if (!_pm.ConfinementRing.ServoOn(out string reason))
{
Stop(reason);
return false;
}
return true;
});
if (ret.Item1)
{
if (ret.Item2 == Result.FAIL)
{
throw (new RoutineFaildException());
}
else
throw (new RoutineBreakException());
}
}
protected void SetRotationValveAndNoWait(int id, float checkSpeed)
{
Tuple<bool, Result> ret = Execute(id, () =>

44
Modules/Mainframe/PMs/Routines/PMServoHome.cs
View File

@ -15,8 +15,8 @@ namespace SicModules.PMs.Routines
{
enum RoutineStep
{
Enable,
Enable1,
Enable2
}
private int _timeout;
@ -50,7 +50,8 @@ namespace SicModules.PMs.Routines
{
if (PmDevice != null && PmDevice.IsInstalled & !_isSimulatorMode)
{
SetRotationEnable((int)RoutineStep.Enable);
SetRotationEnable((int)RoutineStep.Enable1);//磁流体伺服
SetConfinementRingEnable((int)RoutineStep.Enable2);//隔热罩伺服
}
}
@ -74,41 +75,6 @@ namespace SicModules.PMs.Routines
}
public void Home(int id, PMModuleBase pm, int timeout)
{
Tuple<bool, Result> ret = ExecuteAndWait(id, () =>
{
Notify($"Run {pm.Name} home");
//pm.Home();
return true;
}, () =>
{
if (pm.IsError)
{
return null;
}
return true;
}, timeout * 1000);
if (ret.Item1)
{
if (ret.Item2 == Result.FAIL)
{
Stop($"{pm.Name} error");
throw (new RoutineFaildException());
}
else if (ret.Item2 == Result.TIMEOUT) //timeout
{
Stop($"timeout, over {timeout} seconds");
throw (new RoutineFaildException());
}
else
throw (new RoutineBreakException());
}
}
}
}

42
Modules/Mainframe/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.986",
"PreReleaseTagWithDash": "-alpha.986",
"PreReleaseTag": "alpha.987",
"PreReleaseTagWithDash": "-alpha.987",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 986,
"WeightedPreReleaseNumber": 986,
"PreReleaseNumber": 987,
"WeightedPreReleaseNumber": 987,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"FullBuildMetaData": "Branch.develop.Sha.3daf894b808ac7cd4aaaa1e110c6da24f3e5f8a0",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.986",
"LegacySemVer": "0.1.0-alpha986",
"LegacySemVerPadded": "0.1.0-alpha0986",
"AssemblySemVer": "0.1.0.986",
"AssemblySemFileVer": "0.1.0.986",
"FullSemVer": "0.1.0-alpha.986",
"InformationalVersion": "0.1.0-alpha.986+Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"SemVer": "0.1.0-alpha.987",
"LegacySemVer": "0.1.0-alpha987",
"LegacySemVerPadded": "0.1.0-alpha0987",
"AssemblySemVer": "0.1.0.987",
"AssemblySemFileVer": "0.1.0.987",
"FullSemVer": "0.1.0-alpha.987",
"InformationalVersion": "0.1.0-alpha.987+Branch.develop.Sha.3daf894b808ac7cd4aaaa1e110c6da24f3e5f8a0",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "74b1244f686b56716d02c40be67291c77f5d917f",
"ShortSha": "74b1244",
"NuGetVersionV2": "0.1.0-alpha0986",
"NuGetVersion": "0.1.0-alpha0986",
"NuGetPreReleaseTagV2": "alpha0986",
"NuGetPreReleaseTag": "alpha0986",
"Sha": "3daf894b808ac7cd4aaaa1e110c6da24f3e5f8a0",
"ShortSha": "3daf894",
"NuGetVersionV2": "0.1.0-alpha0987",
"NuGetVersion": "0.1.0-alpha0987",
"NuGetPreReleaseTagV2": "alpha0987",
"NuGetPreReleaseTag": "alpha0987",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 986,
"CommitsSinceVersionSourcePadded": "0986",
"UncommittedChanges": 0,
"CommitsSinceVersionSource": 987,
"CommitsSinceVersionSourcePadded": "0987",
"UncommittedChanges": 1,
"CommitDate": "2024-07-10"
}

1
SicRT/Equipments/Schedulers/SchedulerLoadLock.cs
View File

@ -161,7 +161,6 @@ namespace SicRT.Scheduler
if (_entityTaskToken != (int)FSM_MSG.NONE)
{
_task = TaskType.Purge;
_purged = true;
LogTaskStart(_task, $"{Module} do tray home");
return true;
}

6
SicRT/Equipments/Schedulers/SchedulerModuleFactory.cs
View File

@ -116,9 +116,9 @@ namespace SicRT.Modules.Schedulers
public void Reset()
{
_tmRobot.ResetTask();
_waferRobot.ResetTask();
_trayRobot.ResetTask();
_tmRobot?.ResetTask();
_waferRobot?.ResetTask();
_trayRobot?.ResetTask();
foreach (var pm in _lstPms)
{

42
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.986",
"PreReleaseTagWithDash": "-alpha.986",
"PreReleaseTag": "alpha.987",
"PreReleaseTagWithDash": "-alpha.987",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 986,
"WeightedPreReleaseNumber": 986,
"PreReleaseNumber": 987,
"WeightedPreReleaseNumber": 987,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"FullBuildMetaData": "Branch.develop.Sha.3daf894b808ac7cd4aaaa1e110c6da24f3e5f8a0",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.986",
"LegacySemVer": "0.1.0-alpha986",
"LegacySemVerPadded": "0.1.0-alpha0986",
"AssemblySemVer": "0.1.0.986",
"AssemblySemFileVer": "0.1.0.986",
"FullSemVer": "0.1.0-alpha.986",
"InformationalVersion": "0.1.0-alpha.986+Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"SemVer": "0.1.0-alpha.987",
"LegacySemVer": "0.1.0-alpha987",
"LegacySemVerPadded": "0.1.0-alpha0987",
"AssemblySemVer": "0.1.0.987",
"AssemblySemFileVer": "0.1.0.987",
"FullSemVer": "0.1.0-alpha.987",
"InformationalVersion": "0.1.0-alpha.987+Branch.develop.Sha.3daf894b808ac7cd4aaaa1e110c6da24f3e5f8a0",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "74b1244f686b56716d02c40be67291c77f5d917f",
"ShortSha": "74b1244",
"NuGetVersionV2": "0.1.0-alpha0986",
"NuGetVersion": "0.1.0-alpha0986",
"NuGetPreReleaseTagV2": "alpha0986",
"NuGetPreReleaseTag": "alpha0986",
"Sha": "3daf894b808ac7cd4aaaa1e110c6da24f3e5f8a0",
"ShortSha": "3daf894",
"NuGetVersionV2": "0.1.0-alpha0987",
"NuGetVersion": "0.1.0-alpha0987",
"NuGetPreReleaseTagV2": "alpha0987",
"NuGetPreReleaseTag": "alpha0987",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 986,
"CommitsSinceVersionSourcePadded": "0986",
"UncommittedChanges": 0,
"CommitsSinceVersionSource": 987,
"CommitsSinceVersionSourcePadded": "0987",
"UncommittedChanges": 1,
"CommitDate": "2024-07-10"
}

42
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.986",
"PreReleaseTagWithDash": "-alpha.986",
"PreReleaseTag": "alpha.987",
"PreReleaseTagWithDash": "-alpha.987",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 986,
"WeightedPreReleaseNumber": 986,
"PreReleaseNumber": 987,
"WeightedPreReleaseNumber": 987,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"FullBuildMetaData": "Branch.develop.Sha.3daf894b808ac7cd4aaaa1e110c6da24f3e5f8a0",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.986",
"LegacySemVer": "0.1.0-alpha986",
"LegacySemVerPadded": "0.1.0-alpha0986",
"AssemblySemVer": "0.1.0.986",
"AssemblySemFileVer": "0.1.0.986",
"FullSemVer": "0.1.0-alpha.986",
"InformationalVersion": "0.1.0-alpha.986+Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"SemVer": "0.1.0-alpha.987",
"LegacySemVer": "0.1.0-alpha987",
"LegacySemVerPadded": "0.1.0-alpha0987",
"AssemblySemVer": "0.1.0.987",
"AssemblySemFileVer": "0.1.0.987",
"FullSemVer": "0.1.0-alpha.987",
"InformationalVersion": "0.1.0-alpha.987+Branch.develop.Sha.3daf894b808ac7cd4aaaa1e110c6da24f3e5f8a0",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "74b1244f686b56716d02c40be67291c77f5d917f",
"ShortSha": "74b1244",
"NuGetVersionV2": "0.1.0-alpha0986",
"NuGetVersion": "0.1.0-alpha0986",
"NuGetPreReleaseTagV2": "alpha0986",
"NuGetPreReleaseTag": "alpha0986",
"Sha": "3daf894b808ac7cd4aaaa1e110c6da24f3e5f8a0",
"ShortSha": "3daf894",
"NuGetVersionV2": "0.1.0-alpha0987",
"NuGetVersion": "0.1.0-alpha0987",
"NuGetPreReleaseTagV2": "alpha0987",
"NuGetPreReleaseTag": "alpha0987",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 986,
"CommitsSinceVersionSourcePadded": "0986",
"UncommittedChanges": 0,
"CommitsSinceVersionSource": 987,
"CommitsSinceVersionSourcePadded": "0987",
"UncommittedChanges": 1,
"CommitDate": "2024-07-10"
}

42
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 0,
"Minor": 1,
"Patch": 0,
"PreReleaseTag": "alpha.986",
"PreReleaseTagWithDash": "-alpha.986",
"PreReleaseTag": "alpha.987",
"PreReleaseTagWithDash": "-alpha.987",
"PreReleaseLabel": "alpha",
"PreReleaseLabelWithDash": "-alpha",
"PreReleaseNumber": 986,
"WeightedPreReleaseNumber": 986,
"PreReleaseNumber": 987,
"WeightedPreReleaseNumber": 987,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"FullBuildMetaData": "Branch.develop.Sha.3daf894b808ac7cd4aaaa1e110c6da24f3e5f8a0",
"MajorMinorPatch": "0.1.0",
"SemVer": "0.1.0-alpha.986",
"LegacySemVer": "0.1.0-alpha986",
"LegacySemVerPadded": "0.1.0-alpha0986",
"AssemblySemVer": "0.1.0.986",
"AssemblySemFileVer": "0.1.0.986",
"FullSemVer": "0.1.0-alpha.986",
"InformationalVersion": "0.1.0-alpha.986+Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f",
"SemVer": "0.1.0-alpha.987",
"LegacySemVer": "0.1.0-alpha987",
"LegacySemVerPadded": "0.1.0-alpha0987",
"AssemblySemVer": "0.1.0.987",
"AssemblySemFileVer": "0.1.0.987",
"FullSemVer": "0.1.0-alpha.987",
"InformationalVersion": "0.1.0-alpha.987+Branch.develop.Sha.3daf894b808ac7cd4aaaa1e110c6da24f3e5f8a0",
"BranchName": "develop",
"EscapedBranchName": "develop",
"Sha": "74b1244f686b56716d02c40be67291c77f5d917f",
"ShortSha": "74b1244",
"NuGetVersionV2": "0.1.0-alpha0986",
"NuGetVersion": "0.1.0-alpha0986",
"NuGetPreReleaseTagV2": "alpha0986",
"NuGetPreReleaseTag": "alpha0986",
"Sha": "3daf894b808ac7cd4aaaa1e110c6da24f3e5f8a0",
"ShortSha": "3daf894",
"NuGetVersionV2": "0.1.0-alpha0987",
"NuGetVersion": "0.1.0-alpha0987",
"NuGetPreReleaseTagV2": "alpha0987",
"NuGetPreReleaseTag": "alpha0987",
"VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c",
"CommitsSinceVersionSource": 986,
"CommitsSinceVersionSourcePadded": "0986",
"UncommittedChanges": 0,
"CommitsSinceVersionSource": 987,
"CommitsSinceVersionSourcePadded": "0987",
"UncommittedChanges": 1,
"CommitDate": "2024-07-10"
}