diff --git a/Modules/Mainframe/gitversion.json b/Modules/Mainframe/gitversion.json index b242759f..a85806c1 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", - "PreReleaseLabel": "----multiplate-develop", - "PreReleaseLabelWithDash": "-----multiplate-develop", - "PreReleaseNumber": 592, - "WeightedPreReleaseNumber": 592, + "PreReleaseTag": "----Trigger--.593", + "PreReleaseTagWithDash": "-----Trigger--.593", + "PreReleaseLabel": "----Trigger--", + "PreReleaseLabelWithDash": "-----Trigger--", + "PreReleaseNumber": 593, + "WeightedPreReleaseNumber": 593, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.----multiplate-develop.Sha.cc3fcd2e29a0b6ecb494106b5cc05b4758ecb996", + "FullBuildMetaData": "Branch.----Trigger--.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", - "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", + "SemVer": "23.9.2-----Trigger--.593", + "LegacySemVer": "23.9.2-----Trigger--593", + "LegacySemVerPadded": "23.9.2-----Trigger--0593", + "AssemblySemVer": "23.9.2.593", + "AssemblySemFileVer": "23.9.2.593", + "FullSemVer": "23.9.2-----Trigger--.593", + "InformationalVersion": "23.9.2-----Trigger--.593+Branch.----Trigger--.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", + "BranchName": "测试昂坤Trigger测温", + "EscapedBranchName": "----Trigger--", + "Sha": "acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", + "ShortSha": "acb370d", + "NuGetVersionV2": "23.9.2-----trigger--0593", + "NuGetVersion": "23.9.2-----trigger--0593", + "NuGetPreReleaseTagV2": "----trigger--0593", + "NuGetPreReleaseTag": "----trigger--0593", "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/Equipments/Systems/DeviceManager.cs b/SicRT/Equipments/Systems/DeviceManager.cs index b96d2aaa..565f6042 100644 --- a/SicRT/Equipments/Systems/DeviceManager.cs +++ b/SicRT/Equipments/Systems/DeviceManager.cs @@ -7,6 +7,7 @@ using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.MachineVision.Keyence; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Temps.P116PIDTC; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.Sunway; using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Robots.HwinRobot; +using MECF.Framework.RT.EquipmentLibrary.HardwareUnits.Temps; namespace SicRT.Instances { @@ -28,6 +29,7 @@ namespace SicRT.Instances string MoudleA = "PM1"; string MoudleB = "PM2"; + AKunTriggerTemp _ak = new AKunTriggerTemp("127.0.0.1",55888,0,"\r\n"); //if (SC.GetConfigItem("AETemp.EnableDevice").BoolValue) //{ // string _address = SC.GetStringValue("AETemp.Address"); @@ -37,7 +39,7 @@ namespace SicRT.Instances // aeTemp.Initialize(_address, _enableLog); // QueueDevice(aeTemp); //} - + //if (SC.GetConfigItem("TempOmron.EnableDevice").BoolValue) //{ // var Omron1 = new TempOmron("PM1", "TempOmron", "TempOmron"); diff --git a/SicRT/gitversion.json b/SicRT/gitversion.json index b242759f..a85806c1 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", - "PreReleaseLabel": "----multiplate-develop", - "PreReleaseLabelWithDash": "-----multiplate-develop", - "PreReleaseNumber": 592, - "WeightedPreReleaseNumber": 592, + "PreReleaseTag": "----Trigger--.593", + "PreReleaseTagWithDash": "-----Trigger--.593", + "PreReleaseLabel": "----Trigger--", + "PreReleaseLabelWithDash": "-----Trigger--", + "PreReleaseNumber": 593, + "WeightedPreReleaseNumber": 593, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.----multiplate-develop.Sha.cc3fcd2e29a0b6ecb494106b5cc05b4758ecb996", + "FullBuildMetaData": "Branch.----Trigger--.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", - "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", + "SemVer": "23.9.2-----Trigger--.593", + "LegacySemVer": "23.9.2-----Trigger--593", + "LegacySemVerPadded": "23.9.2-----Trigger--0593", + "AssemblySemVer": "23.9.2.593", + "AssemblySemFileVer": "23.9.2.593", + "FullSemVer": "23.9.2-----Trigger--.593", + "InformationalVersion": "23.9.2-----Trigger--.593+Branch.----Trigger--.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", + "BranchName": "测试昂坤Trigger测温", + "EscapedBranchName": "----Trigger--", + "Sha": "acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", + "ShortSha": "acb370d", + "NuGetVersionV2": "23.9.2-----trigger--0593", + "NuGetVersion": "23.9.2-----trigger--0593", + "NuGetPreReleaseTagV2": "----trigger--0593", + "NuGetPreReleaseTag": "----trigger--0593", "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..a85806c1 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", - "PreReleaseLabel": "----multiplate-develop", - "PreReleaseLabelWithDash": "-----multiplate-develop", - "PreReleaseNumber": 592, - "WeightedPreReleaseNumber": 592, + "PreReleaseTag": "----Trigger--.593", + "PreReleaseTagWithDash": "-----Trigger--.593", + "PreReleaseLabel": "----Trigger--", + "PreReleaseLabelWithDash": "-----Trigger--", + "PreReleaseNumber": 593, + "WeightedPreReleaseNumber": 593, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.----multiplate-develop.Sha.cc3fcd2e29a0b6ecb494106b5cc05b4758ecb996", + "FullBuildMetaData": "Branch.----Trigger--.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", - "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", + "SemVer": "23.9.2-----Trigger--.593", + "LegacySemVer": "23.9.2-----Trigger--593", + "LegacySemVerPadded": "23.9.2-----Trigger--0593", + "AssemblySemVer": "23.9.2.593", + "AssemblySemFileVer": "23.9.2.593", + "FullSemVer": "23.9.2-----Trigger--.593", + "InformationalVersion": "23.9.2-----Trigger--.593+Branch.----Trigger--.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", + "BranchName": "测试昂坤Trigger测温", + "EscapedBranchName": "----Trigger--", + "Sha": "acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", + "ShortSha": "acb370d", + "NuGetVersionV2": "23.9.2-----trigger--0593", + "NuGetVersion": "23.9.2-----trigger--0593", + "NuGetPreReleaseTagV2": "----trigger--0593", + "NuGetPreReleaseTag": "----trigger--0593", "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/gitversion.json b/SicUI/gitversion.json index b242759f..a85806c1 100644 --- a/SicUI/gitversion.json +++ b/SicUI/gitversion.json @@ -2,34 +2,34 @@ "Major": 23, "Minor": 9, "Patch": 2, - "PreReleaseTag": "----multiplate-develop.592", - "PreReleaseTagWithDash": "-----multiplate-develop.592", - "PreReleaseLabel": "----multiplate-develop", - "PreReleaseLabelWithDash": "-----multiplate-develop", - "PreReleaseNumber": 592, - "WeightedPreReleaseNumber": 592, + "PreReleaseTag": "----Trigger--.593", + "PreReleaseTagWithDash": "-----Trigger--.593", + "PreReleaseLabel": "----Trigger--", + "PreReleaseLabelWithDash": "-----Trigger--", + "PreReleaseNumber": 593, + "WeightedPreReleaseNumber": 593, "BuildMetaData": null, "BuildMetaDataPadded": "", - "FullBuildMetaData": "Branch.----multiplate-develop.Sha.cc3fcd2e29a0b6ecb494106b5cc05b4758ecb996", + "FullBuildMetaData": "Branch.----Trigger--.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", - "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", + "SemVer": "23.9.2-----Trigger--.593", + "LegacySemVer": "23.9.2-----Trigger--593", + "LegacySemVerPadded": "23.9.2-----Trigger--0593", + "AssemblySemVer": "23.9.2.593", + "AssemblySemFileVer": "23.9.2.593", + "FullSemVer": "23.9.2-----Trigger--.593", + "InformationalVersion": "23.9.2-----Trigger--.593+Branch.----Trigger--.Sha.acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", + "BranchName": "测试昂坤Trigger测温", + "EscapedBranchName": "----Trigger--", + "Sha": "acb370ddb614cdf83fe7c40f0c7d0ffaab2e3859", + "ShortSha": "acb370d", + "NuGetVersionV2": "23.9.2-----trigger--0593", + "NuGetVersion": "23.9.2-----trigger--0593", + "NuGetPreReleaseTagV2": "----trigger--0593", + "NuGetPreReleaseTag": "----trigger--0593", "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/ThirdParty/MECF.Framework/MECF.Framework.Common.dll b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll index 452e87a4..df2461b6 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Common.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Common.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll index 8b22c47c..99238dc8 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll index cc40f9e9..ecdd2909 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll and b/ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll index 093066bf..1ed6860c 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll index 89948836..67101e91 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll differ diff --git a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll index 4d24cf6f..2f95f896 100644 Binary files a/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll and b/ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll differ diff --git a/ThirdParty/MECF.Framework/Sicentury.Core.dll b/ThirdParty/MECF.Framework/Sicentury.Core.dll index e2aede98..563cc061 100644 Binary files a/ThirdParty/MECF.Framework/Sicentury.Core.dll and b/ThirdParty/MECF.Framework/Sicentury.Core.dll differ diff --git a/ThirdParty/MECF.Framework/Sicentury.Localization.dll b/ThirdParty/MECF.Framework/Sicentury.Localization.dll index 4fc86848..384a5505 100644 Binary files a/ThirdParty/MECF.Framework/Sicentury.Localization.dll and b/ThirdParty/MECF.Framework/Sicentury.Localization.dll differ diff --git a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll index 11579faf..36a3bfaf 100644 Binary files a/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll and b/ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll differ