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

整理多片机问题点 

1.Recipe不能运行问题
2.V30问题
3.泵问题
4.Recipe中磁流体设置问题
5.Recipe中HCLSourSplitRatio设置问题
This commit is contained in:
Han Qiang Qiang 2024-07-08 09:25:18 +08:00
parent fe58c9fac4
commit f9e503b36c
17 changed files with 115 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/Mainframe/Config/PM/PM1/DeviceModelPM1.xml
View File

@ -334,9 +334,9 @@
<IoGasBoxTemp id="HeatTailPipe" display="HeatTailPipe" aiHeatTMA="AI_HeatTailPipe" scBasePath="PM.{module}.LineHeaterTemp" scAlarmHigh="PumpLineTempLimt" scWarningLog="PumpLineTempAlarm" doLineHeaterEnable=""/>
</IoGasBoxTemps>
<IoPumps classType="SicModules.Devices.IoPump" assembly="SicModules">
<IoPump id="Pump1" module="" display="Pump" schematicId="Pump" unit="" aioType="" diRunning="DI_DryPump1Running" diAlarm="DI_DryPump1Alarm" diWarning="DI_DryPump1Warning"/>
<IoPump id="Pump2" module="" display="Pump2" schematicId="Pump2" unit="" aioType="" diRunning="DI_DryPump2Running" diAlarm="DI_DryPump2Alarm" diWarning="DI_DryPump2Warning" />
<IoPumps classType="Aitex.Core.RT.Device.Devices.IoPump" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoPump id="Pump" module="" display="Pump" schematicId="Pump" unit="" aioType="" diDryPump1Running="DI_DryPump1Running" diDryPumpAlarm="DI_DryPump1Alarm" diDryPump1Warning="DI_DryPump1Warning" diPumpExhaustPress="DI_PumpExhaustPressSW" diDryPumpFlow="DI_DryPumpFlowSW" />
<IoPump id="Pump2" module="" display="Pump2" schematicId="Pump2" unit="" aioType="" diDryPump1Running="DI_DryPump2Running" diDryPumpAlarm="DI_DryPump2Alarm" diDryPump1Warning="DI_DryPump2Warning" diPumpExhaustPress="DI_PumpExhaustDPSW" diDryPumpFlow="DO_PMpumpFlowTemp" />
</IoPumps>
<IoPTOffsetAndKs classType="Aitex.Core.RT.Device.Devices.IoPTOffsetAndK" assembly="MECF.Framework.RT.EquipmentLibrary">
<IoPTOffsetAndK id="PT1_Offset" module="" display="PT" schematicId="" unit="" aioType="float" aoOffset="AO_PT1_Offset" />

4
Modules/Mainframe/PMs/PMModuleDevice.cs
View File

@ -1018,6 +1018,10 @@ namespace SicModules.PMs
{
lst = new List<string>() { "V31", "V32", "V35", "V36" };
}
else if (eGroupName == IoGroupName.V30)
{
lst = new List<string>() { "V30" };
}
else if (eGroupName == IoGroupName.V31)
{
lst = new List<string>() { "V31" };

1
Modules/Mainframe/PMs/RecipeExecutions/RecipeParser.cs
View File

@ -223,6 +223,7 @@ namespace SicModules.PMs.RecipeExecutions
dic.Remove("SHTotalFlow");
dic.Remove("SHTotalFlowSplitRatio");
//dic.Remove("SiSourTotalFlow");
dic.Remove("HCLSourSplitRatio");
dic.Remove("SiSourSplitRatio");
//dic.Remove("CSourTotalFlow");
dic.Remove("CSourSplitRatio");

52
Modules/Mainframe/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----------.604",
"PreReleaseTagWithDash": "-----------.604",
"PreReleaseLabel": "----------",
"PreReleaseLabelWithDash": "-----------",
"PreReleaseNumber": 604,
"WeightedPreReleaseNumber": 604,
"PreReleaseTag": "----multiplate-develop.605",
"PreReleaseTagWithDash": "-----multiplate-develop.605",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 605,
"WeightedPreReleaseNumber": 605,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----------.Sha.fa8d924e5cd15ec31fc1c3905779f33cf2bbeb33",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.fe58c9fac48cbe7bd4fb8d51d9a18e7777f94d1a",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----------.604",
"LegacySemVer": "23.9.2-----------604",
"LegacySemVerPadded": "23.9.2-----------0604",
"AssemblySemVer": "23.9.2.604",
"AssemblySemFileVer": "23.9.2.604",
"FullSemVer": "23.9.2-----------.604",
"InformationalVersion": "23.9.2-----------.604+Branch.----------.Sha.fa8d924e5cd15ec31fc1c3905779f33cf2bbeb33",
"BranchName": "昂坤测温计算平均温度",
"EscapedBranchName": "----------",
"Sha": "fa8d924e5cd15ec31fc1c3905779f33cf2bbeb33",
"ShortSha": "fa8d924",
"NuGetVersionV2": "23.9.2-----------0604",
"NuGetVersion": "23.9.2-----------0604",
"NuGetPreReleaseTagV2": "----------0604",
"NuGetPreReleaseTag": "----------0604",
"SemVer": "23.9.2-----multiplate-develop.605",
"LegacySemVer": "23.9.2-----multiplate-de605",
"LegacySemVerPadded": "23.9.2-----multiplate-d0605",
"AssemblySemVer": "23.9.2.605",
"AssemblySemFileVer": "23.9.2.605",
"FullSemVer": "23.9.2-----multiplate-develop.605",
"InformationalVersion": "23.9.2-----multiplate-develop.605+Branch.----multiplate-develop.Sha.fe58c9fac48cbe7bd4fb8d51d9a18e7777f94d1a",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "fe58c9fac48cbe7bd4fb8d51d9a18e7777f94d1a",
"ShortSha": "fe58c9f",
"NuGetVersionV2": "23.9.2-----multiplate-d0605",
"NuGetVersion": "23.9.2-----multiplate-d0605",
"NuGetPreReleaseTagV2": "----multiplate-d0605",
"NuGetPreReleaseTag": "----multiplate-d0605",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 604,
"CommitsSinceVersionSourcePadded": "0604",
"UncommittedChanges": 9,
"CommitDate": "2024-07-03"
"CommitsSinceVersionSource": 605,
"CommitsSinceVersionSourcePadded": "0605",
"UncommittedChanges": 0,
"CommitDate": "2024-07-04"
}

52
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----------.604",
"PreReleaseTagWithDash": "-----------.604",
"PreReleaseLabel": "----------",
"PreReleaseLabelWithDash": "-----------",
"PreReleaseNumber": 604,
"WeightedPreReleaseNumber": 604,
"PreReleaseTag": "----multiplate-develop.605",
"PreReleaseTagWithDash": "-----multiplate-develop.605",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 605,
"WeightedPreReleaseNumber": 605,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----------.Sha.fa8d924e5cd15ec31fc1c3905779f33cf2bbeb33",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.fe58c9fac48cbe7bd4fb8d51d9a18e7777f94d1a",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----------.604",
"LegacySemVer": "23.9.2-----------604",
"LegacySemVerPadded": "23.9.2-----------0604",
"AssemblySemVer": "23.9.2.604",
"AssemblySemFileVer": "23.9.2.604",
"FullSemVer": "23.9.2-----------.604",
"InformationalVersion": "23.9.2-----------.604+Branch.----------.Sha.fa8d924e5cd15ec31fc1c3905779f33cf2bbeb33",
"BranchName": "昂坤测温计算平均温度",
"EscapedBranchName": "----------",
"Sha": "fa8d924e5cd15ec31fc1c3905779f33cf2bbeb33",
"ShortSha": "fa8d924",
"NuGetVersionV2": "23.9.2-----------0604",
"NuGetVersion": "23.9.2-----------0604",
"NuGetPreReleaseTagV2": "----------0604",
"NuGetPreReleaseTag": "----------0604",
"SemVer": "23.9.2-----multiplate-develop.605",
"LegacySemVer": "23.9.2-----multiplate-de605",
"LegacySemVerPadded": "23.9.2-----multiplate-d0605",
"AssemblySemVer": "23.9.2.605",
"AssemblySemFileVer": "23.9.2.605",
"FullSemVer": "23.9.2-----multiplate-develop.605",
"InformationalVersion": "23.9.2-----multiplate-develop.605+Branch.----multiplate-develop.Sha.fe58c9fac48cbe7bd4fb8d51d9a18e7777f94d1a",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "fe58c9fac48cbe7bd4fb8d51d9a18e7777f94d1a",
"ShortSha": "fe58c9f",
"NuGetVersionV2": "23.9.2-----multiplate-d0605",
"NuGetVersion": "23.9.2-----multiplate-d0605",
"NuGetPreReleaseTagV2": "----multiplate-d0605",
"NuGetPreReleaseTag": "----multiplate-d0605",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 604,
"CommitsSinceVersionSourcePadded": "0604",
"UncommittedChanges": 9,
"CommitDate": "2024-07-03"
"CommitsSinceVersionSource": 605,
"CommitsSinceVersionSourcePadded": "0605",
"UncommittedChanges": 0,
"CommitDate": "2024-07-04"
}

1
SicSimulator/Instances/SimulatorSystem.cs
View File

@ -145,6 +145,7 @@ namespace SicSimulator.Instances
IO.AO[$"{mod}.AO_ValveModeSetpoint"].Value = (float)2.222;
IO.DI[$"{mod}.DI_ChamLidClosed"].Value = true;
IO.DI[$"{mod}.DI_DORPressVac2SW"].Value = true;
IO.DI[$"{mod}.DI_ChamCabDoorClosed"].Value = true;
IO.DI[$"{mod}.DI_ChamPressAboveATMSW"].Value = true;
IO.DI[$"{mod}.DI_ChamAtSafeProcessPressSW"].Value = false;

52
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----------.604",
"PreReleaseTagWithDash": "-----------.604",
"PreReleaseLabel": "----------",
"PreReleaseLabelWithDash": "-----------",
"PreReleaseNumber": 604,
"WeightedPreReleaseNumber": 604,
"PreReleaseTag": "----multiplate-develop.605",
"PreReleaseTagWithDash": "-----multiplate-develop.605",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 605,
"WeightedPreReleaseNumber": 605,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----------.Sha.fa8d924e5cd15ec31fc1c3905779f33cf2bbeb33",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.fe58c9fac48cbe7bd4fb8d51d9a18e7777f94d1a",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----------.604",
"LegacySemVer": "23.9.2-----------604",
"LegacySemVerPadded": "23.9.2-----------0604",
"AssemblySemVer": "23.9.2.604",
"AssemblySemFileVer": "23.9.2.604",
"FullSemVer": "23.9.2-----------.604",
"InformationalVersion": "23.9.2-----------.604+Branch.----------.Sha.fa8d924e5cd15ec31fc1c3905779f33cf2bbeb33",
"BranchName": "昂坤测温计算平均温度",
"EscapedBranchName": "----------",
"Sha": "fa8d924e5cd15ec31fc1c3905779f33cf2bbeb33",
"ShortSha": "fa8d924",
"NuGetVersionV2": "23.9.2-----------0604",
"NuGetVersion": "23.9.2-----------0604",
"NuGetPreReleaseTagV2": "----------0604",
"NuGetPreReleaseTag": "----------0604",
"SemVer": "23.9.2-----multiplate-develop.605",
"LegacySemVer": "23.9.2-----multiplate-de605",
"LegacySemVerPadded": "23.9.2-----multiplate-d0605",
"AssemblySemVer": "23.9.2.605",
"AssemblySemFileVer": "23.9.2.605",
"FullSemVer": "23.9.2-----multiplate-develop.605",
"InformationalVersion": "23.9.2-----multiplate-develop.605+Branch.----multiplate-develop.Sha.fe58c9fac48cbe7bd4fb8d51d9a18e7777f94d1a",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "fe58c9fac48cbe7bd4fb8d51d9a18e7777f94d1a",
"ShortSha": "fe58c9f",
"NuGetVersionV2": "23.9.2-----multiplate-d0605",
"NuGetVersion": "23.9.2-----multiplate-d0605",
"NuGetPreReleaseTagV2": "----multiplate-d0605",
"NuGetPreReleaseTag": "----multiplate-d0605",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 604,
"CommitsSinceVersionSourcePadded": "0604",
"UncommittedChanges": 9,
"CommitDate": "2024-07-03"
"CommitsSinceVersionSource": 605,
"CommitsSinceVersionSourcePadded": "0605",
"UncommittedChanges": 0,
"CommitDate": "2024-07-04"
}

2
SicUI/Models/PMs/PMMotionViewModel.cs
View File

@ -462,7 +462,7 @@ namespace SicUI.Models.PMs
public void SetActualSpeed(object data)
{
SetPMServoValue(data, 1000, 0, "SpindleSpeedRun");
SetPMServoValue(data, 1000, 0, "SetActualSpeed");
}
public void LoadAngleSet(object data)

2
SicUI/Models/PMs/PMOperationViewModel.cs
View File

@ -561,7 +561,7 @@ namespace SicUI.Models.PMs
#endregion
#region Pump
[Subscription("Pump1.DeviceData")]
[Subscription("Pump.DeviceData")]
public AITPumpData PumpData1 { get; set; }
[Subscription("Pump2.DeviceData")]

52
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----------.604",
"PreReleaseTagWithDash": "-----------.604",
"PreReleaseLabel": "----------",
"PreReleaseLabelWithDash": "-----------",
"PreReleaseNumber": 604,
"WeightedPreReleaseNumber": 604,
"PreReleaseTag": "----multiplate-develop.605",
"PreReleaseTagWithDash": "-----multiplate-develop.605",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 605,
"WeightedPreReleaseNumber": 605,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----------.Sha.fa8d924e5cd15ec31fc1c3905779f33cf2bbeb33",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.fe58c9fac48cbe7bd4fb8d51d9a18e7777f94d1a",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----------.604",
"LegacySemVer": "23.9.2-----------604",
"LegacySemVerPadded": "23.9.2-----------0604",
"AssemblySemVer": "23.9.2.604",
"AssemblySemFileVer": "23.9.2.604",
"FullSemVer": "23.9.2-----------.604",
"InformationalVersion": "23.9.2-----------.604+Branch.----------.Sha.fa8d924e5cd15ec31fc1c3905779f33cf2bbeb33",
"BranchName": "昂坤测温计算平均温度",
"EscapedBranchName": "----------",
"Sha": "fa8d924e5cd15ec31fc1c3905779f33cf2bbeb33",
"ShortSha": "fa8d924",
"NuGetVersionV2": "23.9.2-----------0604",
"NuGetVersion": "23.9.2-----------0604",
"NuGetPreReleaseTagV2": "----------0604",
"NuGetPreReleaseTag": "----------0604",
"SemVer": "23.9.2-----multiplate-develop.605",
"LegacySemVer": "23.9.2-----multiplate-de605",
"LegacySemVerPadded": "23.9.2-----multiplate-d0605",
"AssemblySemVer": "23.9.2.605",
"AssemblySemFileVer": "23.9.2.605",
"FullSemVer": "23.9.2-----multiplate-develop.605",
"InformationalVersion": "23.9.2-----multiplate-develop.605+Branch.----multiplate-develop.Sha.fe58c9fac48cbe7bd4fb8d51d9a18e7777f94d1a",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "fe58c9fac48cbe7bd4fb8d51d9a18e7777f94d1a",
"ShortSha": "fe58c9f",
"NuGetVersionV2": "23.9.2-----multiplate-d0605",
"NuGetVersion": "23.9.2-----multiplate-d0605",
"NuGetPreReleaseTagV2": "----multiplate-d0605",
"NuGetPreReleaseTag": "----multiplate-d0605",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 604,
"CommitsSinceVersionSourcePadded": "0604",
"UncommittedChanges": 9,
"CommitDate": "2024-07-03"
"CommitsSinceVersionSource": 605,
"CommitsSinceVersionSourcePadded": "0605",
"UncommittedChanges": 0,
"CommitDate": "2024-07-04"
}

BIN
ThirdParty/MECF.Framework/MECF.Framework.Common.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll vendored
View File

Binary file not shown.

BIN
ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll vendored
View File

Binary file not shown.