Liang Su
7ec1499c61
# Conflicts: # Modules/Mainframe/Devices/IoInterLock.cs # Modules/Mainframe/Devices/SiemensIoProvider.cs # SicRT/Config/System.sccfg # SicRT/Properties/AssemblyInfo.cs # SicSimulator/Config/_ioDefinePM.xml # SicSimulator/Instances/SimulatorModulePlc.cs # SicUI/Properties/AssemblyInfo.cs # 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 # ThirdParty/MECF.Framework/Sicentury.Core.dll # ThirdParty/MECF.Framework/Sicentury.Localization.dll # ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll |
||
---|---|---|
.. | ||
MfcDeviationValue | ||
MfcRor | ||
PM1 | ||
PM2 |