diff --git a/Modules/Mainframe/gitversion.json b/Modules/Mainframe/gitversion.json index 26c2f604..bb8d5ecd 100644 --- a/Modules/Mainframe/gitversion.json +++ b/Modules/Mainframe/gitversion.json @@ -2,34 +2,34 @@ "Major": 0, "Minor": 1, "Patch": 0, - "PreReleaseTag": "alpha.985", - "PreReleaseTagWithDash": "-alpha.985", + "PreReleaseTag": "alpha.986", + "PreReleaseTagWithDash": "-alpha.986", "PreReleaseLabel": "alpha", "PreReleaseLabelWithDash": "-alpha", - "PreReleaseNumber": 985, - "WeightedPreReleaseNumber": 985, + "PreReleaseNumber": 986, + "WeightedPreReleaseNumber": 986, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba", + "FullBuildMetaData": "Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f", "MajorMinorPatch": "0.1.0", - "SemVer": "0.1.0-alpha.985", - "LegacySemVer": "0.1.0-alpha985", - "LegacySemVerPadded": "0.1.0-alpha0985", - "AssemblySemVer": "0.1.0.985", - "AssemblySemFileVer": "0.1.0.985", - "FullSemVer": "0.1.0-alpha.985", - "InformationalVersion": "0.1.0-alpha.985+Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba", + "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", "BranchName": "develop", "EscapedBranchName": "develop", - "Sha": "51047663040d0c6479a57f5cf0215ba967a88dba", - "ShortSha": "5104766", - "NuGetVersionV2": "0.1.0-alpha0985", - "NuGetVersion": "0.1.0-alpha0985", - "NuGetPreReleaseTagV2": "alpha0985", - "NuGetPreReleaseTag": "alpha0985", + "Sha": "74b1244f686b56716d02c40be67291c77f5d917f", + "ShortSha": "74b1244", + "NuGetVersionV2": "0.1.0-alpha0986", + "NuGetVersion": "0.1.0-alpha0986", + "NuGetPreReleaseTagV2": "alpha0986", + "NuGetPreReleaseTag": "alpha0986", "VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c", - "CommitsSinceVersionSource": 985, - "CommitsSinceVersionSourcePadded": "0985", + "CommitsSinceVersionSource": 986, + "CommitsSinceVersionSourcePadded": "0986", "UncommittedChanges": 0, - "CommitDate": "2024-07-08" + "CommitDate": "2024-07-10" } \ No newline at end of file diff --git a/SicAutoGE.sln b/SicMultiplateGE.sln similarity index 100% rename from SicAutoGE.sln rename to SicMultiplateGE.sln diff --git a/SicRT/Config/System.sccfg b/SicRT/Config/System.sccfg index e6e0eb09..a87f8a1f 100644 --- a/SicRT/Config/System.sccfg +++ b/SicRT/Config/System.sccfg @@ -34,6 +34,7 @@ + diff --git a/SicRT/Equipments/ManualAutoTransfer.cs b/SicRT/Equipments/ManualAutoTransfer.cs index 4cfb738b..314d239d 100644 --- a/SicRT/Equipments/ManualAutoTransfer.cs +++ b/SicRT/Equipments/ManualAutoTransfer.cs @@ -792,25 +792,25 @@ namespace SicRT.Modules public void Abort() { var wafer = WaferManager.Instance.GetWafer(ModuleName.PM1, 0); - if (wafer != null) + if (wafer?.WaferID != null) { AutoJobRecorder.UpdatePosition(wafer.WaferID.ToString(), ModuleName.PM1.ToString(), "Abort"); } var wafer1 = WaferManager.Instance.GetWafer(ModuleName.TMRobot, 0); - if (wafer1 != null) + if (wafer1?.WaferID != null) { AutoJobRecorder.UpdatePosition(wafer1.WaferID.ToString(), ModuleName.TM.ToString(), "Abort"); } var wafer2 = WaferManager.Instance.GetWafer(ModuleName.Buffer, 0); - if (wafer2 != null) + if (wafer2?.WaferID != null) { AutoJobRecorder.UpdatePosition(wafer2.WaferID.ToString(), ModuleName.Buffer.ToString(), "Abort"); } var wafer3 = WaferManager.Instance.GetWafer(ModuleName.LoadLock, 0); - if (wafer3 != null) + if (wafer3?.WaferID != null) { AutoJobRecorder.UpdatePosition(wafer3.WaferID.ToString(), ModuleName.LoadLock.ToString(), "Abort"); } diff --git a/SicRT/gitversion.json b/SicRT/gitversion.json index 26c2f604..bb8d5ecd 100644 --- a/SicRT/gitversion.json +++ b/SicRT/gitversion.json @@ -2,34 +2,34 @@ "Major": 0, "Minor": 1, "Patch": 0, - "PreReleaseTag": "alpha.985", - "PreReleaseTagWithDash": "-alpha.985", + "PreReleaseTag": "alpha.986", + "PreReleaseTagWithDash": "-alpha.986", "PreReleaseLabel": "alpha", "PreReleaseLabelWithDash": "-alpha", - "PreReleaseNumber": 985, - "WeightedPreReleaseNumber": 985, + "PreReleaseNumber": 986, + "WeightedPreReleaseNumber": 986, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba", + "FullBuildMetaData": "Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f", "MajorMinorPatch": "0.1.0", - "SemVer": "0.1.0-alpha.985", - "LegacySemVer": "0.1.0-alpha985", - "LegacySemVerPadded": "0.1.0-alpha0985", - "AssemblySemVer": "0.1.0.985", - "AssemblySemFileVer": "0.1.0.985", - "FullSemVer": "0.1.0-alpha.985", - "InformationalVersion": "0.1.0-alpha.985+Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba", + "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", "BranchName": "develop", "EscapedBranchName": "develop", - "Sha": "51047663040d0c6479a57f5cf0215ba967a88dba", - "ShortSha": "5104766", - "NuGetVersionV2": "0.1.0-alpha0985", - "NuGetVersion": "0.1.0-alpha0985", - "NuGetPreReleaseTagV2": "alpha0985", - "NuGetPreReleaseTag": "alpha0985", + "Sha": "74b1244f686b56716d02c40be67291c77f5d917f", + "ShortSha": "74b1244", + "NuGetVersionV2": "0.1.0-alpha0986", + "NuGetVersion": "0.1.0-alpha0986", + "NuGetPreReleaseTagV2": "alpha0986", + "NuGetPreReleaseTag": "alpha0986", "VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c", - "CommitsSinceVersionSource": 985, - "CommitsSinceVersionSourcePadded": "0985", + "CommitsSinceVersionSource": 986, + "CommitsSinceVersionSourcePadded": "0986", "UncommittedChanges": 0, - "CommitDate": "2024-07-08" + "CommitDate": "2024-07-10" } \ No newline at end of file diff --git a/SicSimulator/gitversion.json b/SicSimulator/gitversion.json index 26c2f604..bb8d5ecd 100644 --- a/SicSimulator/gitversion.json +++ b/SicSimulator/gitversion.json @@ -2,34 +2,34 @@ "Major": 0, "Minor": 1, "Patch": 0, - "PreReleaseTag": "alpha.985", - "PreReleaseTagWithDash": "-alpha.985", + "PreReleaseTag": "alpha.986", + "PreReleaseTagWithDash": "-alpha.986", "PreReleaseLabel": "alpha", "PreReleaseLabelWithDash": "-alpha", - "PreReleaseNumber": 985, - "WeightedPreReleaseNumber": 985, + "PreReleaseNumber": 986, + "WeightedPreReleaseNumber": 986, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba", + "FullBuildMetaData": "Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f", "MajorMinorPatch": "0.1.0", - "SemVer": "0.1.0-alpha.985", - "LegacySemVer": "0.1.0-alpha985", - "LegacySemVerPadded": "0.1.0-alpha0985", - "AssemblySemVer": "0.1.0.985", - "AssemblySemFileVer": "0.1.0.985", - "FullSemVer": "0.1.0-alpha.985", - "InformationalVersion": "0.1.0-alpha.985+Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba", + "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", "BranchName": "develop", "EscapedBranchName": "develop", - "Sha": "51047663040d0c6479a57f5cf0215ba967a88dba", - "ShortSha": "5104766", - "NuGetVersionV2": "0.1.0-alpha0985", - "NuGetVersion": "0.1.0-alpha0985", - "NuGetPreReleaseTagV2": "alpha0985", - "NuGetPreReleaseTag": "alpha0985", + "Sha": "74b1244f686b56716d02c40be67291c77f5d917f", + "ShortSha": "74b1244", + "NuGetVersionV2": "0.1.0-alpha0986", + "NuGetVersion": "0.1.0-alpha0986", + "NuGetPreReleaseTagV2": "alpha0986", + "NuGetPreReleaseTag": "alpha0986", "VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c", - "CommitsSinceVersionSource": 985, - "CommitsSinceVersionSourcePadded": "0985", + "CommitsSinceVersionSource": 986, + "CommitsSinceVersionSourcePadded": "0986", "UncommittedChanges": 0, - "CommitDate": "2024-07-08" + "CommitDate": "2024-07-10" } \ No newline at end of file diff --git a/SicUI/gitversion.json b/SicUI/gitversion.json index 26c2f604..bb8d5ecd 100644 --- a/SicUI/gitversion.json +++ b/SicUI/gitversion.json @@ -2,34 +2,34 @@ "Major": 0, "Minor": 1, "Patch": 0, - "PreReleaseTag": "alpha.985", - "PreReleaseTagWithDash": "-alpha.985", + "PreReleaseTag": "alpha.986", + "PreReleaseTagWithDash": "-alpha.986", "PreReleaseLabel": "alpha", "PreReleaseLabelWithDash": "-alpha", - "PreReleaseNumber": 985, - "WeightedPreReleaseNumber": 985, + "PreReleaseNumber": 986, + "WeightedPreReleaseNumber": 986, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba", + "FullBuildMetaData": "Branch.develop.Sha.74b1244f686b56716d02c40be67291c77f5d917f", "MajorMinorPatch": "0.1.0", - "SemVer": "0.1.0-alpha.985", - "LegacySemVer": "0.1.0-alpha985", - "LegacySemVerPadded": "0.1.0-alpha0985", - "AssemblySemVer": "0.1.0.985", - "AssemblySemFileVer": "0.1.0.985", - "FullSemVer": "0.1.0-alpha.985", - "InformationalVersion": "0.1.0-alpha.985+Branch.develop.Sha.51047663040d0c6479a57f5cf0215ba967a88dba", + "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", "BranchName": "develop", "EscapedBranchName": "develop", - "Sha": "51047663040d0c6479a57f5cf0215ba967a88dba", - "ShortSha": "5104766", - "NuGetVersionV2": "0.1.0-alpha0985", - "NuGetVersion": "0.1.0-alpha0985", - "NuGetPreReleaseTagV2": "alpha0985", - "NuGetPreReleaseTag": "alpha0985", + "Sha": "74b1244f686b56716d02c40be67291c77f5d917f", + "ShortSha": "74b1244", + "NuGetVersionV2": "0.1.0-alpha0986", + "NuGetVersion": "0.1.0-alpha0986", + "NuGetPreReleaseTagV2": "alpha0986", + "NuGetPreReleaseTag": "alpha0986", "VersionSourceSha": "19532172dcf07eadf9b705f59d55a9287711990c", - "CommitsSinceVersionSource": 985, - "CommitsSinceVersionSourcePadded": "0985", + "CommitsSinceVersionSource": 986, + "CommitsSinceVersionSourcePadded": "0986", "UncommittedChanges": 0, - "CommitDate": "2024-07-08" + "CommitDate": "2024-07-10" } \ No newline at end of file