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

修改自动版本中多余模块初始化

This commit is contained in:
Han Qiang Qiang 2024-05-22 13:46:30 +08:00
parent 517904f6ac
commit 1a0075b4db
6 changed files with 102 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Modules/Mainframe/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23, "Major": 23,
"Minor": 9, "Minor": 9,
"Patch": 2, "Patch": 2,
"PreReleaseTag": "----multiplate-develop.509", "PreReleaseTag": "----multiplate-develop.510",
"PreReleaseTagWithDash": "-----multiplate-develop.509", "PreReleaseTagWithDash": "-----multiplate-develop.510",
"PreReleaseLabel": "----multiplate-develop", "PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop", "PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 509, "PreReleaseNumber": 510,
"WeightedPreReleaseNumber": 509, "WeightedPreReleaseNumber": 510,
"BuildMetaData": null, "BuildMetaData": null,
"BuildMetaDataPadded": "", "BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279", "FullBuildMetaData": "Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
"MajorMinorPatch": "23.9.2", "MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.509", "SemVer": "23.9.2-----multiplate-develop.510",
"LegacySemVer": "23.9.2-----multiplate-de509", "LegacySemVer": "23.9.2-----multiplate-de510",
"LegacySemVerPadded": "23.9.2-----multiplate-d0509", "LegacySemVerPadded": "23.9.2-----multiplate-d0510",
"AssemblySemVer": "23.9.2.509", "AssemblySemVer": "23.9.2.510",
"AssemblySemFileVer": "23.9.2.509", "AssemblySemFileVer": "23.9.2.510",
"FullSemVer": "23.9.2-----multiplate-develop.509", "FullSemVer": "23.9.2-----multiplate-develop.510",
"InformationalVersion": "23.9.2-----multiplate-develop.509+Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279", "InformationalVersion": "23.9.2-----multiplate-develop.510+Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
"BranchName": "多片机/multiplate-develop", "BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop", "EscapedBranchName": "----multiplate-develop",
"Sha": "e0fb503a8bde928cc6aec494246e5e6c029ae279", "Sha": "517904f6ac8376b21d3439168eef1c7098aa86d2",
"ShortSha": "e0fb503", "ShortSha": "517904f",
"NuGetVersionV2": "23.9.2-----multiplate-d0509", "NuGetVersionV2": "23.9.2-----multiplate-d0510",
"NuGetVersion": "23.9.2-----multiplate-d0509", "NuGetVersion": "23.9.2-----multiplate-d0510",
"NuGetPreReleaseTagV2": "----multiplate-d0509", "NuGetPreReleaseTagV2": "----multiplate-d0510",
"NuGetPreReleaseTag": "----multiplate-d0509", "NuGetPreReleaseTag": "----multiplate-d0510",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e", "VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 509, "CommitsSinceVersionSource": 510,
"CommitsSinceVersionSourcePadded": "0509", "CommitsSinceVersionSourcePadded": "0510",
"UncommittedChanges": 1, "UncommittedChanges": 1,
"CommitDate": "2024-05-22" "CommitDate": "2024-05-22"
} }

8
SicRT/Equipments/HomeAll.cs
View File

@ -27,9 +27,9 @@ namespace SicRT.Modules
public Result Start(params object[] objs) public Result Start(params object[] objs)
{ {
if (Debugger.IsAttached) //if (Debugger.IsAttached)
EV.PostInfoLog("System", // EV.PostInfoLog("System",
"这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度"); // "这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度这是一个长字符串用于测试MainWindow的LOG下拉框是否约束了显示宽度");
_lstModules.Clear(); _lstModules.Clear();
@ -44,8 +44,8 @@ namespace SicRT.Modules
lstA.Add(Singleton<EquipmentManager>.Instance.Modules[ModuleName.TM] as IModuleDevice ); lstA.Add(Singleton<EquipmentManager>.Instance.Modules[ModuleName.TM] as IModuleDevice );
dicModules.Add(tm.Module, tm.IsBusy); dicModules.Add(tm.Module, tm.IsBusy);
} }
_lstModules.Add(lstA);
var lstModules = new List<IModuleDevice>(); var lstModules = new List<IModuleDevice>();
var ll = Singleton<EquipmentManager>.Instance.Modules[ModuleName.LoadLock] as LoadLockModule; var ll = Singleton<EquipmentManager>.Instance.Modules[ModuleName.LoadLock] as LoadLockModule;

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

@ -7,20 +7,20 @@ namespace SicRT.Modules.Schedulers
public class SchedulerModuleFactory public class SchedulerModuleFactory
{ {
protected SchedulerTMRobot _tmRobot = new(); protected SchedulerTMRobot _tmRobot = new();
protected SchedulerWaferRobot _waferRobot = new(); protected SchedulerWaferRobot _waferRobot;
protected SchedulerTrayRobot _trayRobot = new(); protected SchedulerTrayRobot _trayRobot;
protected SchedulerBuffer _buffer = new(ModuleName.Buffer); protected SchedulerBuffer _buffer = new(ModuleName.Buffer);
protected SchedulerLoadLock _load = new(ModuleName.LoadLock); protected SchedulerLoadLock _load = new(ModuleName.LoadLock);
protected SchedulerUnLoad _unload = new(ModuleName.UnLoad); protected SchedulerUnLoad _unload = new(ModuleName.UnLoad);
protected SchedulerAligner _aligner = new(ModuleName.Aligner); protected SchedulerAligner _aligner;
protected SchedulerPM _pm1 = new(ModuleName.PM1); protected SchedulerPM _pm1 = new(ModuleName.PM1);
protected SchedulerPM _pm2 = new(ModuleName.PM2); protected SchedulerPM _pm2 = new(ModuleName.PM2);
protected SchedulerCassette _cassetteAL = new(ModuleName.CassAL); protected SchedulerCassette _cassetteAL;
protected SchedulerCassette _cassetteAR = new(ModuleName.CassAR); protected SchedulerCassette _cassetteAR;
protected SchedulerCassette _cassetteBL = new(ModuleName.CassBL); protected SchedulerCassette _cassetteBL;
protected List<SchedulerPM> _lstPms = new(); protected List<SchedulerPM> _lstPms = new();
protected List<SchedulerCassette> _lstWaferCassettes = new(); protected List<SchedulerCassette> _lstWaferCassettes = new();
@ -30,9 +30,20 @@ namespace SicRT.Modules.Schedulers
_lstPms.AddRange(new[] { _pm1 ,_pm2}); _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) protected SchedulerModule GetModule(string name)

40
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23, "Major": 23,
"Minor": 9, "Minor": 9,
"Patch": 2, "Patch": 2,
"PreReleaseTag": "----multiplate-develop.509", "PreReleaseTag": "----multiplate-develop.510",
"PreReleaseTagWithDash": "-----multiplate-develop.509", "PreReleaseTagWithDash": "-----multiplate-develop.510",
"PreReleaseLabel": "----multiplate-develop", "PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop", "PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 509, "PreReleaseNumber": 510,
"WeightedPreReleaseNumber": 509, "WeightedPreReleaseNumber": 510,
"BuildMetaData": null, "BuildMetaData": null,
"BuildMetaDataPadded": "", "BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279", "FullBuildMetaData": "Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
"MajorMinorPatch": "23.9.2", "MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.509", "SemVer": "23.9.2-----multiplate-develop.510",
"LegacySemVer": "23.9.2-----multiplate-de509", "LegacySemVer": "23.9.2-----multiplate-de510",
"LegacySemVerPadded": "23.9.2-----multiplate-d0509", "LegacySemVerPadded": "23.9.2-----multiplate-d0510",
"AssemblySemVer": "23.9.2.509", "AssemblySemVer": "23.9.2.510",
"AssemblySemFileVer": "23.9.2.509", "AssemblySemFileVer": "23.9.2.510",
"FullSemVer": "23.9.2-----multiplate-develop.509", "FullSemVer": "23.9.2-----multiplate-develop.510",
"InformationalVersion": "23.9.2-----multiplate-develop.509+Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279", "InformationalVersion": "23.9.2-----multiplate-develop.510+Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
"BranchName": "多片机/multiplate-develop", "BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop", "EscapedBranchName": "----multiplate-develop",
"Sha": "e0fb503a8bde928cc6aec494246e5e6c029ae279", "Sha": "517904f6ac8376b21d3439168eef1c7098aa86d2",
"ShortSha": "e0fb503", "ShortSha": "517904f",
"NuGetVersionV2": "23.9.2-----multiplate-d0509", "NuGetVersionV2": "23.9.2-----multiplate-d0510",
"NuGetVersion": "23.9.2-----multiplate-d0509", "NuGetVersion": "23.9.2-----multiplate-d0510",
"NuGetPreReleaseTagV2": "----multiplate-d0509", "NuGetPreReleaseTagV2": "----multiplate-d0510",
"NuGetPreReleaseTag": "----multiplate-d0509", "NuGetPreReleaseTag": "----multiplate-d0510",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e", "VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 509, "CommitsSinceVersionSource": 510,
"CommitsSinceVersionSourcePadded": "0509", "CommitsSinceVersionSourcePadded": "0510",
"UncommittedChanges": 1, "UncommittedChanges": 1,
"CommitDate": "2024-05-22" "CommitDate": "2024-05-22"
} }

40
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23, "Major": 23,
"Minor": 9, "Minor": 9,
"Patch": 2, "Patch": 2,
"PreReleaseTag": "----multiplate-develop.509", "PreReleaseTag": "----multiplate-develop.510",
"PreReleaseTagWithDash": "-----multiplate-develop.509", "PreReleaseTagWithDash": "-----multiplate-develop.510",
"PreReleaseLabel": "----multiplate-develop", "PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop", "PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 509, "PreReleaseNumber": 510,
"WeightedPreReleaseNumber": 509, "WeightedPreReleaseNumber": 510,
"BuildMetaData": null, "BuildMetaData": null,
"BuildMetaDataPadded": "", "BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279", "FullBuildMetaData": "Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
"MajorMinorPatch": "23.9.2", "MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.509", "SemVer": "23.9.2-----multiplate-develop.510",
"LegacySemVer": "23.9.2-----multiplate-de509", "LegacySemVer": "23.9.2-----multiplate-de510",
"LegacySemVerPadded": "23.9.2-----multiplate-d0509", "LegacySemVerPadded": "23.9.2-----multiplate-d0510",
"AssemblySemVer": "23.9.2.509", "AssemblySemVer": "23.9.2.510",
"AssemblySemFileVer": "23.9.2.509", "AssemblySemFileVer": "23.9.2.510",
"FullSemVer": "23.9.2-----multiplate-develop.509", "FullSemVer": "23.9.2-----multiplate-develop.510",
"InformationalVersion": "23.9.2-----multiplate-develop.509+Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279", "InformationalVersion": "23.9.2-----multiplate-develop.510+Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
"BranchName": "多片机/multiplate-develop", "BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop", "EscapedBranchName": "----multiplate-develop",
"Sha": "e0fb503a8bde928cc6aec494246e5e6c029ae279", "Sha": "517904f6ac8376b21d3439168eef1c7098aa86d2",
"ShortSha": "e0fb503", "ShortSha": "517904f",
"NuGetVersionV2": "23.9.2-----multiplate-d0509", "NuGetVersionV2": "23.9.2-----multiplate-d0510",
"NuGetVersion": "23.9.2-----multiplate-d0509", "NuGetVersion": "23.9.2-----multiplate-d0510",
"NuGetPreReleaseTagV2": "----multiplate-d0509", "NuGetPreReleaseTagV2": "----multiplate-d0510",
"NuGetPreReleaseTag": "----multiplate-d0509", "NuGetPreReleaseTag": "----multiplate-d0510",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e", "VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 509, "CommitsSinceVersionSource": 510,
"CommitsSinceVersionSourcePadded": "0509", "CommitsSinceVersionSourcePadded": "0510",
"UncommittedChanges": 1, "UncommittedChanges": 1,
"CommitDate": "2024-05-22" "CommitDate": "2024-05-22"
} }

40
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23, "Major": 23,
"Minor": 9, "Minor": 9,
"Patch": 2, "Patch": 2,
"PreReleaseTag": "----multiplate-develop.509", "PreReleaseTag": "----multiplate-develop.510",
"PreReleaseTagWithDash": "-----multiplate-develop.509", "PreReleaseTagWithDash": "-----multiplate-develop.510",
"PreReleaseLabel": "----multiplate-develop", "PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop", "PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 509, "PreReleaseNumber": 510,
"WeightedPreReleaseNumber": 509, "WeightedPreReleaseNumber": 510,
"BuildMetaData": null, "BuildMetaData": null,
"BuildMetaDataPadded": "", "BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279", "FullBuildMetaData": "Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
"MajorMinorPatch": "23.9.2", "MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.509", "SemVer": "23.9.2-----multiplate-develop.510",
"LegacySemVer": "23.9.2-----multiplate-de509", "LegacySemVer": "23.9.2-----multiplate-de510",
"LegacySemVerPadded": "23.9.2-----multiplate-d0509", "LegacySemVerPadded": "23.9.2-----multiplate-d0510",
"AssemblySemVer": "23.9.2.509", "AssemblySemVer": "23.9.2.510",
"AssemblySemFileVer": "23.9.2.509", "AssemblySemFileVer": "23.9.2.510",
"FullSemVer": "23.9.2-----multiplate-develop.509", "FullSemVer": "23.9.2-----multiplate-develop.510",
"InformationalVersion": "23.9.2-----multiplate-develop.509+Branch.----multiplate-develop.Sha.e0fb503a8bde928cc6aec494246e5e6c029ae279", "InformationalVersion": "23.9.2-----multiplate-develop.510+Branch.----multiplate-develop.Sha.517904f6ac8376b21d3439168eef1c7098aa86d2",
"BranchName": "多片机/multiplate-develop", "BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop", "EscapedBranchName": "----multiplate-develop",
"Sha": "e0fb503a8bde928cc6aec494246e5e6c029ae279", "Sha": "517904f6ac8376b21d3439168eef1c7098aa86d2",
"ShortSha": "e0fb503", "ShortSha": "517904f",
"NuGetVersionV2": "23.9.2-----multiplate-d0509", "NuGetVersionV2": "23.9.2-----multiplate-d0510",
"NuGetVersion": "23.9.2-----multiplate-d0509", "NuGetVersion": "23.9.2-----multiplate-d0510",
"NuGetPreReleaseTagV2": "----multiplate-d0509", "NuGetPreReleaseTagV2": "----multiplate-d0510",
"NuGetPreReleaseTag": "----multiplate-d0509", "NuGetPreReleaseTag": "----multiplate-d0510",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e", "VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 509, "CommitsSinceVersionSource": 510,
"CommitsSinceVersionSourcePadded": "0509", "CommitsSinceVersionSourcePadded": "0510",
"UncommittedChanges": 1, "UncommittedChanges": 1,
"CommitDate": "2024-05-22" "CommitDate": "2024-05-22"
} }