diff --git a/Modules/Mainframe/TMs/TMModule.cs b/Modules/Mainframe/TMs/TMModule.cs index 5d88124f..d4f84a3c 100644 --- a/Modules/Mainframe/TMs/TMModule.cs +++ b/Modules/Mainframe/TMs/TMModule.cs @@ -18,6 +18,7 @@ using Aitex.Sorter.Common; using MECF.Framework.Common.Equipment; using MECF.Framework.Common.Event; using MECF.Framework.Common.PLC; +using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots; using SicModules.TMs.Routines; using SicAds = SicModules.Devices.SicAds; @@ -574,6 +575,10 @@ namespace SicModules.TMs OP.Subscribe($"{Module}.SetOnline", (string cmd, object[] args) => PutOnline()); OP.Subscribe($"{Module}.SetOffline", (string cmd, object[] args) => PutOffline()); + + OP.Subscribe($"TMRobot.RobotArmBlade1SetParameter", (string cmd, object[] args) =>RobotArmBlade1SetParameter(args)); + OP.Subscribe($"TMRobot.RobotArmBlade1ReadParameter", (string cmd, object[] args) => RobotArmBlade1ReadParameter(args)); + } private void InitData() @@ -703,6 +708,16 @@ namespace SicModules.TMs return true; } + private bool RobotArmBlade1SetParameter(object[] param) + { + return RobotDevice.SetParameter(new object[] { param[0], RobotArmEnum.Blade1, param[1] }); + } + + private bool RobotArmBlade1ReadParameter(object[] param) + { + return RobotDevice.ReadParameter(new object[] { param[0], RobotArmEnum.Blade1}); + } + private bool FsmExitError(object[] param) { return true; diff --git a/Modules/Mainframe/gitversion.json b/Modules/Mainframe/gitversion.json index b242759f..fe210aba 100644 --- a/Modules/Mainframe/gitversion.json +++ b/Modules/Mainframe/gitversion.json @@ -2,34 +2,34 @@ "Major": 23, "Minor": 9, "Patch": 2, - "PreReleaseTag": "----multiplate-develop.592", - "PreReleaseTagWithDash": "-----multiplate-develop.592", + "PreReleaseTag": "----multiplate-develop.593", + "PreReleaseTagWithDash": "-----multiplate-develop.593", "PreReleaseLabel": "----multiplate-develop", "PreReleaseLabelWithDash": "-----multiplate-develop", - "PreReleaseNumber": 592, - "WeightedPreReleaseNumber": 592, + "PreReleaseNumber": 593, + "WeightedPreReleaseNumber": 593, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.----multiplate-develop.Sha.cc3fcd2e29a0b6ecb494106b5cc05b4758ecb996", + "FullBuildMetaData": "Branch.----multiplate-develop.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", "MajorMinorPatch": "23.9.2", - "SemVer": "23.9.2-----multiplate-develop.592", - "LegacySemVer": "23.9.2-----multiplate-de592", - "LegacySemVerPadded": "23.9.2-----multiplate-d0592", - "AssemblySemVer": "23.9.2.592", - "AssemblySemFileVer": "23.9.2.592", - "FullSemVer": "23.9.2-----multiplate-develop.592", - "InformationalVersion": "23.9.2-----multiplate-develop.592+Branch.----multiplate-develop.Sha.cc3fcd2e29a0b6ecb494106b5cc05b4758ecb996", + "SemVer": "23.9.2-----multiplate-develop.593", + "LegacySemVer": "23.9.2-----multiplate-de593", + "LegacySemVerPadded": "23.9.2-----multiplate-d0593", + "AssemblySemVer": "23.9.2.593", + "AssemblySemFileVer": "23.9.2.593", + "FullSemVer": "23.9.2-----multiplate-develop.593", + "InformationalVersion": "23.9.2-----multiplate-develop.593+Branch.----multiplate-develop.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", "BranchName": "多片机/multiplate-develop", "EscapedBranchName": "----multiplate-develop", - "Sha": "cc3fcd2e29a0b6ecb494106b5cc05b4758ecb996", - "ShortSha": "cc3fcd2", - "NuGetVersionV2": "23.9.2-----multiplate-d0592", - "NuGetVersion": "23.9.2-----multiplate-d0592", - "NuGetPreReleaseTagV2": "----multiplate-d0592", - "NuGetPreReleaseTag": "----multiplate-d0592", + "Sha": "acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", + "ShortSha": "acb370d", + "NuGetVersionV2": "23.9.2-----multiplate-d0593", + "NuGetVersion": "23.9.2-----multiplate-d0593", + "NuGetPreReleaseTagV2": "----multiplate-d0593", + "NuGetPreReleaseTag": "----multiplate-d0593", "VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e", - "CommitsSinceVersionSource": 592, - "CommitsSinceVersionSourcePadded": "0592", - "UncommittedChanges": 2, - "CommitDate": "2024-06-27" + "CommitsSinceVersionSource": 593, + "CommitsSinceVersionSourcePadded": "0593", + "UncommittedChanges": 0, + "CommitDate": "2024-06-28" } \ No newline at end of file diff --git a/SicRT/gitversion.json b/SicRT/gitversion.json index b242759f..fe210aba 100644 --- a/SicRT/gitversion.json +++ b/SicRT/gitversion.json @@ -2,34 +2,34 @@ "Major": 23, "Minor": 9, "Patch": 2, - "PreReleaseTag": "----multiplate-develop.592", - "PreReleaseTagWithDash": "-----multiplate-develop.592", + "PreReleaseTag": "----multiplate-develop.593", + "PreReleaseTagWithDash": "-----multiplate-develop.593", "PreReleaseLabel": "----multiplate-develop", "PreReleaseLabelWithDash": "-----multiplate-develop", - "PreReleaseNumber": 592, - "WeightedPreReleaseNumber": 592, + "PreReleaseNumber": 593, + "WeightedPreReleaseNumber": 593, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.----multiplate-develop.Sha.cc3fcd2e29a0b6ecb494106b5cc05b4758ecb996", + "FullBuildMetaData": "Branch.----multiplate-develop.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", "MajorMinorPatch": "23.9.2", - "SemVer": "23.9.2-----multiplate-develop.592", - "LegacySemVer": "23.9.2-----multiplate-de592", - "LegacySemVerPadded": "23.9.2-----multiplate-d0592", - "AssemblySemVer": "23.9.2.592", - "AssemblySemFileVer": "23.9.2.592", - "FullSemVer": "23.9.2-----multiplate-develop.592", - "InformationalVersion": "23.9.2-----multiplate-develop.592+Branch.----multiplate-develop.Sha.cc3fcd2e29a0b6ecb494106b5cc05b4758ecb996", + "SemVer": "23.9.2-----multiplate-develop.593", + "LegacySemVer": "23.9.2-----multiplate-de593", + "LegacySemVerPadded": "23.9.2-----multiplate-d0593", + "AssemblySemVer": "23.9.2.593", + "AssemblySemFileVer": "23.9.2.593", + "FullSemVer": "23.9.2-----multiplate-develop.593", + "InformationalVersion": "23.9.2-----multiplate-develop.593+Branch.----multiplate-develop.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", "BranchName": "多片机/multiplate-develop", "EscapedBranchName": "----multiplate-develop", - "Sha": "cc3fcd2e29a0b6ecb494106b5cc05b4758ecb996", - "ShortSha": "cc3fcd2", - "NuGetVersionV2": "23.9.2-----multiplate-d0592", - "NuGetVersion": "23.9.2-----multiplate-d0592", - "NuGetPreReleaseTagV2": "----multiplate-d0592", - "NuGetPreReleaseTag": "----multiplate-d0592", + "Sha": "acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", + "ShortSha": "acb370d", + "NuGetVersionV2": "23.9.2-----multiplate-d0593", + "NuGetVersion": "23.9.2-----multiplate-d0593", + "NuGetPreReleaseTagV2": "----multiplate-d0593", + "NuGetPreReleaseTag": "----multiplate-d0593", "VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e", - "CommitsSinceVersionSource": 592, - "CommitsSinceVersionSourcePadded": "0592", - "UncommittedChanges": 2, - "CommitDate": "2024-06-27" + "CommitsSinceVersionSource": 593, + "CommitsSinceVersionSourcePadded": "0593", + "UncommittedChanges": 0, + "CommitDate": "2024-06-28" } \ No newline at end of file diff --git a/SicSimulator/gitversion.json b/SicSimulator/gitversion.json index b242759f..fe210aba 100644 --- a/SicSimulator/gitversion.json +++ b/SicSimulator/gitversion.json @@ -2,34 +2,34 @@ "Major": 23, "Minor": 9, "Patch": 2, - "PreReleaseTag": "----multiplate-develop.592", - "PreReleaseTagWithDash": "-----multiplate-develop.592", + "PreReleaseTag": "----multiplate-develop.593", + "PreReleaseTagWithDash": "-----multiplate-develop.593", "PreReleaseLabel": "----multiplate-develop", "PreReleaseLabelWithDash": "-----multiplate-develop", - "PreReleaseNumber": 592, - "WeightedPreReleaseNumber": 592, + "PreReleaseNumber": 593, + "WeightedPreReleaseNumber": 593, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.----multiplate-develop.Sha.cc3fcd2e29a0b6ecb494106b5cc05b4758ecb996", + "FullBuildMetaData": "Branch.----multiplate-develop.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", "MajorMinorPatch": "23.9.2", - "SemVer": "23.9.2-----multiplate-develop.592", - "LegacySemVer": "23.9.2-----multiplate-de592", - "LegacySemVerPadded": "23.9.2-----multiplate-d0592", - "AssemblySemVer": "23.9.2.592", - "AssemblySemFileVer": "23.9.2.592", - "FullSemVer": "23.9.2-----multiplate-develop.592", - "InformationalVersion": "23.9.2-----multiplate-develop.592+Branch.----multiplate-develop.Sha.cc3fcd2e29a0b6ecb494106b5cc05b4758ecb996", + "SemVer": "23.9.2-----multiplate-develop.593", + "LegacySemVer": "23.9.2-----multiplate-de593", + "LegacySemVerPadded": "23.9.2-----multiplate-d0593", + "AssemblySemVer": "23.9.2.593", + "AssemblySemFileVer": "23.9.2.593", + "FullSemVer": "23.9.2-----multiplate-develop.593", + "InformationalVersion": "23.9.2-----multiplate-develop.593+Branch.----multiplate-develop.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", "BranchName": "多片机/multiplate-develop", "EscapedBranchName": "----multiplate-develop", - "Sha": "cc3fcd2e29a0b6ecb494106b5cc05b4758ecb996", - "ShortSha": "cc3fcd2", - "NuGetVersionV2": "23.9.2-----multiplate-d0592", - "NuGetVersion": "23.9.2-----multiplate-d0592", - "NuGetPreReleaseTagV2": "----multiplate-d0592", - "NuGetPreReleaseTag": "----multiplate-d0592", + "Sha": "acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", + "ShortSha": "acb370d", + "NuGetVersionV2": "23.9.2-----multiplate-d0593", + "NuGetVersion": "23.9.2-----multiplate-d0593", + "NuGetPreReleaseTagV2": "----multiplate-d0593", + "NuGetPreReleaseTag": "----multiplate-d0593", "VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e", - "CommitsSinceVersionSource": 592, - "CommitsSinceVersionSourcePadded": "0592", - "UncommittedChanges": 2, - "CommitDate": "2024-06-27" + "CommitsSinceVersionSource": 593, + "CommitsSinceVersionSourcePadded": "0593", + "UncommittedChanges": 0, + "CommitDate": "2024-06-28" } \ No newline at end of file diff --git a/SicUI/Models/Maintenances/TM/TMView.xaml b/SicUI/Models/Maintenances/TM/TMView.xaml index 732228a6..6dcca755 100644 --- a/SicUI/Models/Maintenances/TM/TMView.xaml +++ b/SicUI/Models/Maintenances/TM/TMView.xaml @@ -3006,6 +3006,7 @@ + @@ -3487,6 +3488,86 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/SicUI/Models/Maintenances/TM/TMViewModel.cs b/SicUI/Models/Maintenances/TM/TMViewModel.cs index 779136f6..e8add162 100644 --- a/SicUI/Models/Maintenances/TM/TMViewModel.cs +++ b/SicUI/Models/Maintenances/TM/TMViewModel.cs @@ -14,6 +14,7 @@ using Aitex.Core.RT.SCCore; using Aitex.Core.RT.DataCenter; using MECF.Framework.Common.DBCore; using System; +using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots; namespace SicUI.Client.Models.Platform.TM { @@ -264,6 +265,15 @@ namespace SicUI.Client.Models.Platform.TM return ModuleStatusBackground.GetStatusBackground(status); } + private List _robotLoads=new List(){"ON","OFF"}; + public List RobotLoads + { + get { return _robotLoads; } + set { _robotLoads = value; NotifyOfPropertyChange("RobotLoads"); } + } + + + public string SelectRobotLoad { get; set; } = "ON"; private List _modules = new List() { "PM1", "PM2", "LoadLock", "UnLoad", "Buffer.01", "Buffer.02", "Buffer.03" }; public List Modules @@ -633,6 +643,12 @@ namespace SicUI.Client.Models.Platform.TM #endregion #region TM Robot + + [Subscription("TMRobot.IsHaveWafer")] + public bool IsHaveWafer { get; set; } + + public string RobotHaveWafer => IsHaveWafer ? "ON" : "OFF"; + public void TMRobot_Home() { TMProvider.Instance.TMRobot_Home(); @@ -1091,7 +1107,15 @@ namespace SicUI.Client.Models.Platform.TM InvokeClient.Instance.Service.DoOperation($"{module}.Separate"); } - + public void RobotSetParameter() + { + InvokeClient.Instance.Service.DoOperation($"TMRobot.RobotArmBlade1SetParameter", new object[] { "SetLoad", SelectRobotLoad =="ON" ? true:false}); + } + + public void RobotReadParameter() + { + InvokeClient.Instance.Service.DoOperation($"TMRobot.RobotArmBlade1ReadParameter", new object[] { "QueryWaferPresent"}); + } #endregion #region ConfinementRing diff --git a/SicUI/Models/PMs/PMMotionView.xaml b/SicUI/Models/PMs/PMMotionView.xaml index ccf940c3..5e141b27 100644 --- a/SicUI/Models/PMs/PMMotionView.xaml +++ b/SicUI/Models/PMs/PMMotionView.xaml @@ -1432,12 +1432,10 @@ Background="{DynamicResource Table_BG_Content}" BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1"> -