修改自动版本中多余模块初始化
This commit is contained in:
parent
517904f6ac
commit
1a0075b4db
|
@ -2,34 +2,34 @@
|
|||
"Major": 23,
|
||||
"Minor": 9,
|
||||
"Patch": 2,
|
||||
"PreReleaseTag": "----multiplate-develop.509",
|
||||
"PreReleaseTagWithDash": "-----multiplate-develop.509",
|
||||
"PreReleaseTag": "----multiplate-develop.510",
|
||||
"PreReleaseTagWithDash": "-----multiplate-develop.510",
|
||||
"PreReleaseLabel": "----multiplate-develop",
|
||||
"PreReleaseLabelWithDash": "-----multiplate-develop",
|
||||
"PreReleaseNumber": 509,
|
||||
"WeightedPreReleaseNumber": 509,
|
||||
"PreReleaseNumber": 510,
|
||||
"WeightedPreReleaseNumber": 510,
|
||||
"BuildMetaData": null,
|
||||
"BuildMetaDataPadded": "",
|
||||
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279",
|
||||
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
|
||||
"MajorMinorPatch": "23.9.2",
|
||||
"SemVer": "23.9.2-----multiplate-develop.509",
|
||||
"LegacySemVer": "23.9.2-----multiplate-de509",
|
||||
"LegacySemVerPadded": "23.9.2-----multiplate-d0509",
|
||||
"AssemblySemVer": "23.9.2.509",
|
||||
"AssemblySemFileVer": "23.9.2.509",
|
||||
"FullSemVer": "23.9.2-----multiplate-develop.509",
|
||||
"InformationalVersion": "23.9.2-----multiplate-develop.509+Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279",
|
||||
"SemVer": "23.9.2-----multiplate-develop.510",
|
||||
"LegacySemVer": "23.9.2-----multiplate-de510",
|
||||
"LegacySemVerPadded": "23.9.2-----multiplate-d0510",
|
||||
"AssemblySemVer": "23.9.2.510",
|
||||
"AssemblySemFileVer": "23.9.2.510",
|
||||
"FullSemVer": "23.9.2-----multiplate-develop.510",
|
||||
"InformationalVersion": "23.9.2-----multiplate-develop.510+Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
|
||||
"BranchName": "多片机/multiplate-develop",
|
||||
"EscapedBranchName": "----multiplate-develop",
|
||||
"Sha": "e0fb503a8bde928cc6aec494246e5e6c029ae279",
|
||||
"ShortSha": "e0fb503",
|
||||
"NuGetVersionV2": "23.9.2-----multiplate-d0509",
|
||||
"NuGetVersion": "23.9.2-----multiplate-d0509",
|
||||
"NuGetPreReleaseTagV2": "----multiplate-d0509",
|
||||
"NuGetPreReleaseTag": "----multiplate-d0509",
|
||||
"Sha": "517904f6ac8376b21d3439168eef1c7098aa86d2",
|
||||
"ShortSha": "517904f",
|
||||
"NuGetVersionV2": "23.9.2-----multiplate-d0510",
|
||||
"NuGetVersion": "23.9.2-----multiplate-d0510",
|
||||
"NuGetPreReleaseTagV2": "----multiplate-d0510",
|
||||
"NuGetPreReleaseTag": "----multiplate-d0510",
|
||||
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
|
||||
"CommitsSinceVersionSource": 509,
|
||||
"CommitsSinceVersionSourcePadded": "0509",
|
||||
"CommitsSinceVersionSource": 510,
|
||||
"CommitsSinceVersionSourcePadded": "0510",
|
||||
"UncommittedChanges": 1,
|
||||
"CommitDate": "2024-05-22"
|
||||
}
|
|
@ -27,9 +27,9 @@ namespace SicRT.Modules
|
|||
|
||||
public Result Start(params object[] objs)
|
||||
{
|
||||
if (Debugger.IsAttached)
|
||||
EV.PostInfoLog("System",
|
||||
"这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度");
|
||||
//if (Debugger.IsAttached)
|
||||
// EV.PostInfoLog("System",
|
||||
// "这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度");
|
||||
|
||||
|
||||
_lstModules.Clear();
|
||||
|
@ -44,8 +44,8 @@ namespace SicRT.Modules
|
|||
lstA.Add(Singleton<EquipmentManager>.Instance.Modules[ModuleName.TM] as IModuleDevice );
|
||||
dicModules.Add(tm.Module, tm.IsBusy);
|
||||
}
|
||||
_lstModules.Add(lstA);
|
||||
|
||||
|
||||
|
||||
var lstModules = new List<IModuleDevice>();
|
||||
var ll = Singleton<EquipmentManager>.Instance.Modules[ModuleName.LoadLock] as LoadLockModule;
|
||||
|
|
|
@ -7,20 +7,20 @@ namespace SicRT.Modules.Schedulers
|
|||
public class SchedulerModuleFactory
|
||||
{
|
||||
protected SchedulerTMRobot _tmRobot = new();
|
||||
protected SchedulerWaferRobot _waferRobot = new();
|
||||
protected SchedulerTrayRobot _trayRobot = new();
|
||||
protected SchedulerWaferRobot _waferRobot;
|
||||
protected SchedulerTrayRobot _trayRobot;
|
||||
|
||||
protected SchedulerBuffer _buffer = new(ModuleName.Buffer);
|
||||
protected SchedulerLoadLock _load = new(ModuleName.LoadLock);
|
||||
protected SchedulerUnLoad _unload = new(ModuleName.UnLoad);
|
||||
protected SchedulerAligner _aligner = new(ModuleName.Aligner);
|
||||
protected SchedulerAligner _aligner;
|
||||
|
||||
protected SchedulerPM _pm1 = new(ModuleName.PM1);
|
||||
protected SchedulerPM _pm2 = new(ModuleName.PM2);
|
||||
|
||||
protected SchedulerCassette _cassetteAL = new(ModuleName.CassAL);
|
||||
protected SchedulerCassette _cassetteAR = new(ModuleName.CassAR);
|
||||
protected SchedulerCassette _cassetteBL = new(ModuleName.CassBL);
|
||||
protected SchedulerCassette _cassetteAL;
|
||||
protected SchedulerCassette _cassetteAR;
|
||||
protected SchedulerCassette _cassetteBL;
|
||||
|
||||
protected List<SchedulerPM> _lstPms = new();
|
||||
protected List<SchedulerCassette> _lstWaferCassettes = new();
|
||||
|
@ -30,9 +30,20 @@ namespace SicRT.Modules.Schedulers
|
|||
|
||||
_lstPms.AddRange(new[] { _pm1 ,_pm2});
|
||||
|
||||
if (SC.GetValue<bool>($"System.SetUp.IsEFEMInstalled"))
|
||||
{
|
||||
_waferRobot = new();
|
||||
_trayRobot = new();
|
||||
_aligner = new(ModuleName.Aligner);
|
||||
|
||||
_cassetteAL = new(ModuleName.CassAL);
|
||||
_cassetteAR = new(ModuleName.CassAR);
|
||||
_cassetteBL = new(ModuleName.CassBL);
|
||||
|
||||
_lstWaferCassettes.AddRange(new[] { _cassetteAL, _cassetteAR });
|
||||
}
|
||||
|
||||
|
||||
_lstWaferCassettes.AddRange(new[] { _cassetteAL, _cassetteAR});
|
||||
}
|
||||
|
||||
protected SchedulerModule GetModule(string name)
|
||||
|
|
|
@ -2,34 +2,34 @@
|
|||
"Major": 23,
|
||||
"Minor": 9,
|
||||
"Patch": 2,
|
||||
"PreReleaseTag": "----multiplate-develop.509",
|
||||
"PreReleaseTagWithDash": "-----multiplate-develop.509",
|
||||
"PreReleaseTag": "----multiplate-develop.510",
|
||||
"PreReleaseTagWithDash": "-----multiplate-develop.510",
|
||||
"PreReleaseLabel": "----multiplate-develop",
|
||||
"PreReleaseLabelWithDash": "-----multiplate-develop",
|
||||
"PreReleaseNumber": 509,
|
||||
"WeightedPreReleaseNumber": 509,
|
||||
"PreReleaseNumber": 510,
|
||||
"WeightedPreReleaseNumber": 510,
|
||||
"BuildMetaData": null,
|
||||
"BuildMetaDataPadded": "",
|
||||
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279",
|
||||
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
|
||||
"MajorMinorPatch": "23.9.2",
|
||||
"SemVer": "23.9.2-----multiplate-develop.509",
|
||||
"LegacySemVer": "23.9.2-----multiplate-de509",
|
||||
"LegacySemVerPadded": "23.9.2-----multiplate-d0509",
|
||||
"AssemblySemVer": "23.9.2.509",
|
||||
"AssemblySemFileVer": "23.9.2.509",
|
||||
"FullSemVer": "23.9.2-----multiplate-develop.509",
|
||||
"InformationalVersion": "23.9.2-----multiplate-develop.509+Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279",
|
||||
"SemVer": "23.9.2-----multiplate-develop.510",
|
||||
"LegacySemVer": "23.9.2-----multiplate-de510",
|
||||
"LegacySemVerPadded": "23.9.2-----multiplate-d0510",
|
||||
"AssemblySemVer": "23.9.2.510",
|
||||
"AssemblySemFileVer": "23.9.2.510",
|
||||
"FullSemVer": "23.9.2-----multiplate-develop.510",
|
||||
"InformationalVersion": "23.9.2-----multiplate-develop.510+Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
|
||||
"BranchName": "多片机/multiplate-develop",
|
||||
"EscapedBranchName": "----multiplate-develop",
|
||||
"Sha": "e0fb503a8bde928cc6aec494246e5e6c029ae279",
|
||||
"ShortSha": "e0fb503",
|
||||
"NuGetVersionV2": "23.9.2-----multiplate-d0509",
|
||||
"NuGetVersion": "23.9.2-----multiplate-d0509",
|
||||
"NuGetPreReleaseTagV2": "----multiplate-d0509",
|
||||
"NuGetPreReleaseTag": "----multiplate-d0509",
|
||||
"Sha": "517904f6ac8376b21d3439168eef1c7098aa86d2",
|
||||
"ShortSha": "517904f",
|
||||
"NuGetVersionV2": "23.9.2-----multiplate-d0510",
|
||||
"NuGetVersion": "23.9.2-----multiplate-d0510",
|
||||
"NuGetPreReleaseTagV2": "----multiplate-d0510",
|
||||
"NuGetPreReleaseTag": "----multiplate-d0510",
|
||||
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
|
||||
"CommitsSinceVersionSource": 509,
|
||||
"CommitsSinceVersionSourcePadded": "0509",
|
||||
"CommitsSinceVersionSource": 510,
|
||||
"CommitsSinceVersionSourcePadded": "0510",
|
||||
"UncommittedChanges": 1,
|
||||
"CommitDate": "2024-05-22"
|
||||
}
|
|
@ -2,34 +2,34 @@
|
|||
"Major": 23,
|
||||
"Minor": 9,
|
||||
"Patch": 2,
|
||||
"PreReleaseTag": "----multiplate-develop.509",
|
||||
"PreReleaseTagWithDash": "-----multiplate-develop.509",
|
||||
"PreReleaseTag": "----multiplate-develop.510",
|
||||
"PreReleaseTagWithDash": "-----multiplate-develop.510",
|
||||
"PreReleaseLabel": "----multiplate-develop",
|
||||
"PreReleaseLabelWithDash": "-----multiplate-develop",
|
||||
"PreReleaseNumber": 509,
|
||||
"WeightedPreReleaseNumber": 509,
|
||||
"PreReleaseNumber": 510,
|
||||
"WeightedPreReleaseNumber": 510,
|
||||
"BuildMetaData": null,
|
||||
"BuildMetaDataPadded": "",
|
||||
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279",
|
||||
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
|
||||
"MajorMinorPatch": "23.9.2",
|
||||
"SemVer": "23.9.2-----multiplate-develop.509",
|
||||
"LegacySemVer": "23.9.2-----multiplate-de509",
|
||||
"LegacySemVerPadded": "23.9.2-----multiplate-d0509",
|
||||
"AssemblySemVer": "23.9.2.509",
|
||||
"AssemblySemFileVer": "23.9.2.509",
|
||||
"FullSemVer": "23.9.2-----multiplate-develop.509",
|
||||
"InformationalVersion": "23.9.2-----multiplate-develop.509+Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279",
|
||||
"SemVer": "23.9.2-----multiplate-develop.510",
|
||||
"LegacySemVer": "23.9.2-----multiplate-de510",
|
||||
"LegacySemVerPadded": "23.9.2-----multiplate-d0510",
|
||||
"AssemblySemVer": "23.9.2.510",
|
||||
"AssemblySemFileVer": "23.9.2.510",
|
||||
"FullSemVer": "23.9.2-----multiplate-develop.510",
|
||||
"InformationalVersion": "23.9.2-----multiplate-develop.510+Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
|
||||
"BranchName": "多片机/multiplate-develop",
|
||||
"EscapedBranchName": "----multiplate-develop",
|
||||
"Sha": "e0fb503a8bde928cc6aec494246e5e6c029ae279",
|
||||
"ShortSha": "e0fb503",
|
||||
"NuGetVersionV2": "23.9.2-----multiplate-d0509",
|
||||
"NuGetVersion": "23.9.2-----multiplate-d0509",
|
||||
"NuGetPreReleaseTagV2": "----multiplate-d0509",
|
||||
"NuGetPreReleaseTag": "----multiplate-d0509",
|
||||
"Sha": "517904f6ac8376b21d3439168eef1c7098aa86d2",
|
||||
"ShortSha": "517904f",
|
||||
"NuGetVersionV2": "23.9.2-----multiplate-d0510",
|
||||
"NuGetVersion": "23.9.2-----multiplate-d0510",
|
||||
"NuGetPreReleaseTagV2": "----multiplate-d0510",
|
||||
"NuGetPreReleaseTag": "----multiplate-d0510",
|
||||
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
|
||||
"CommitsSinceVersionSource": 509,
|
||||
"CommitsSinceVersionSourcePadded": "0509",
|
||||
"CommitsSinceVersionSource": 510,
|
||||
"CommitsSinceVersionSourcePadded": "0510",
|
||||
"UncommittedChanges": 1,
|
||||
"CommitDate": "2024-05-22"
|
||||
}
|
|
@ -2,34 +2,34 @@
|
|||
"Major": 23,
|
||||
"Minor": 9,
|
||||
"Patch": 2,
|
||||
"PreReleaseTag": "----multiplate-develop.509",
|
||||
"PreReleaseTagWithDash": "-----multiplate-develop.509",
|
||||
"PreReleaseTag": "----multiplate-develop.510",
|
||||
"PreReleaseTagWithDash": "-----multiplate-develop.510",
|
||||
"PreReleaseLabel": "----multiplate-develop",
|
||||
"PreReleaseLabelWithDash": "-----multiplate-develop",
|
||||
"PreReleaseNumber": 509,
|
||||
"WeightedPreReleaseNumber": 509,
|
||||
"PreReleaseNumber": 510,
|
||||
"WeightedPreReleaseNumber": 510,
|
||||
"BuildMetaData": null,
|
||||
"BuildMetaDataPadded": "",
|
||||
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279",
|
||||
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
|
||||
"MajorMinorPatch": "23.9.2",
|
||||
"SemVer": "23.9.2-----multiplate-develop.509",
|
||||
"LegacySemVer": "23.9.2-----multiplate-de509",
|
||||
"LegacySemVerPadded": "23.9.2-----multiplate-d0509",
|
||||
"AssemblySemVer": "23.9.2.509",
|
||||
"AssemblySemFileVer": "23.9.2.509",
|
||||
"FullSemVer": "23.9.2-----multiplate-develop.509",
|
||||
"InformationalVersion": "23.9.2-----multiplate-develop.509+Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279",
|
||||
"SemVer": "23.9.2-----multiplate-develop.510",
|
||||
"LegacySemVer": "23.9.2-----multiplate-de510",
|
||||
"LegacySemVerPadded": "23.9.2-----multiplate-d0510",
|
||||
"AssemblySemVer": "23.9.2.510",
|
||||
"AssemblySemFileVer": "23.9.2.510",
|
||||
"FullSemVer": "23.9.2-----multiplate-develop.510",
|
||||
"InformationalVersion": "23.9.2-----multiplate-develop.510+Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
|
||||
"BranchName": "多片机/multiplate-develop",
|
||||
"EscapedBranchName": "----multiplate-develop",
|
||||
"Sha": "e0fb503a8bde928cc6aec494246e5e6c029ae279",
|
||||
"ShortSha": "e0fb503",
|
||||
"NuGetVersionV2": "23.9.2-----multiplate-d0509",
|
||||
"NuGetVersion": "23.9.2-----multiplate-d0509",
|
||||
"NuGetPreReleaseTagV2": "----multiplate-d0509",
|
||||
"NuGetPreReleaseTag": "----multiplate-d0509",
|
||||
"Sha": "517904f6ac8376b21d3439168eef1c7098aa86d2",
|
||||
"ShortSha": "517904f",
|
||||
"NuGetVersionV2": "23.9.2-----multiplate-d0510",
|
||||
"NuGetVersion": "23.9.2-----multiplate-d0510",
|
||||
"NuGetPreReleaseTagV2": "----multiplate-d0510",
|
||||
"NuGetPreReleaseTag": "----multiplate-d0510",
|
||||
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
|
||||
"CommitsSinceVersionSource": 509,
|
||||
"CommitsSinceVersionSourcePadded": "0509",
|
||||
"CommitsSinceVersionSource": 510,
|
||||
"CommitsSinceVersionSourcePadded": "0510",
|
||||
"UncommittedChanges": 1,
|
||||
"CommitDate": "2024-05-22"
|
||||
}
|
Loading…
Reference in New Issue