临时存储
This commit is contained in:
parent
acb370ddb6
commit
80f65eba5e
|
@ -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"
|
||||
}
|
|
@ -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");
|
||||
|
|
|
@ -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"
|
||||
}
|
|
@ -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"
|
||||
}
|
|
@ -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"
|
||||
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue