Sic-Software
/
Sic08
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Activity

Merge branch 'develop' into feature/整理优化数据库代码 

# Conflicts:
#	ThirdParty/MECF.Framework/MECF.Framework.Common.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll
#	ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll
This commit is contained in:
HCL 2023-06-29 10:10:55 +08:00
parent e8c4514252 38b60ed52c
commit 8e409c6fa8
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,14 +301,6 @@
<IoPump id="Pump" module="" display="Pump" schematicId="Pump" unit="" aioType="" diDryPumpAlarm="DI_DryPumpAlarm" diPumpExhaustPress="DI_PumpExhaustPressSW" diDryPumpFlow="DI_DryPumpFlowSW" diDryPump1Running="DI_DryPump1Running" diDryPump1Warning="DI_DryPump1Warning" />
</IoPumps>
<IoPTOffsetAndKs classType="Aitex.Core.RT.Device.Devices.IoPTOffsetAndK" assembly="MECF.Framework.RT.EquipmentLibrary">
<!--<IoPTOffsetAndK id="PT1OffsetAndK" module="" display="PT1" schematicId="" unit="" aioType="float" aoOffset="AO_PT1_Offset" aoK="AO_PT1_K" />
<IoPTOffsetAndK id="PT2OffsetAndK" module="" display="PT2" schematicId="" unit="" aioType="float" aoOffset="AO_PT2_Offset" aoK="AO_PT2_K" />
<IoPTOffsetAndK id="PT3OffsetAndK" module="" display="PT3" schematicId="" unit="" aioType="float" aoOffset="AO_PT3_Offset" aoK="AO_PT3_K" />
<IoPTOffsetAndK id="PT4OffsetAndK" module="" display="PT4" schematicId="" unit="" aioType="float" aoOffset="AO_PT4_Offset" aoK="AO_PT4_K" />
<IoPTOffsetAndK id="PT9OffsetAndK" module="" display="PT9" schematicId="" unit="" aioType="float" aoOffset="AO_PT9_Offset" aoK="AO_PT9_K" />
<IoPTOffsetAndK id="PT10OffsetAndK" module="" display="PT10" schematicId="" unit="" aioType="float" aoOffset="AO_PT10_Offset" aoK="AO_PT10_K" />-->
<IoPTOffsetAndK id="PT1_Offset" module="" display="PT" schematicId="" unit="" aioType="float" aoOffset="AO_PT1_Offset" />
<IoPTOffsetAndK id="PT1_K" module="" display="PT" schematicId="" unit="" aioType="float" aoOffset="AO_PT1_K" />
<IoPTOffsetAndK id="PT2_Offset" module="" display="PT" schematicId="" unit="" aioType="float" aoOffset="AO_PT2_Offset" />

2
Modules/Mainframe/Config/Recipe/Sic/Process/RecipeFormat.xml
View File

@ -37,6 +37,8 @@
<Catalog DisplayName="StepInfo">
<Group DisplayName="Temperature -> Control Mode">
<Step ModuleName="" DeviceType="" InputType="ReadOnlySelection" DisplayName="8. PSU Control Mode" UnitName="" ControlName="TC1.SetHeaterMode" Description="">
<Item DisplayName="PyroAuto" ControlName="PyroAuto" />
<Item DisplayName="PyroFollow" ControlName="PyroFollow" />
<Item DisplayName="Power" ControlName="Power" />
<Item DisplayName="Pyro" ControlName="Pyro" />
</Step>

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

Binary file not shown.