Commit Graph

5 Commits

Author SHA1 Message Date
HCL 96ce5c4c07 Merge branch 'KX_GEM' into GEM
# Conflicts:
#	Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
#	Modules/SicModules/Config/PM/PM1/interlockPM1.xml
#	Modules/SicModules/Config/PM/PM2/DeviceModelPM2.xml
#	Modules/SicModules/Config/PM/PM2/interlockPM2.xml
#	SicRT/Equipments/Systems/EquipmentManager.cs
#	SicRT/Instances/ToolLoader.cs
#	SicRT/SicRT.csproj
#	SicSimulator/Instances/SimulatorSystem.cs
#	SicUI/MainViewModel.cs
#	SicUI/SicUI.csproj
#	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
2024-04-17 16:37:52 +08:00
HCL 484932e024 1.TM增加DO_TMCyclePurgeRoutineSuccessed,TM Purge后置为true,TM开腔后该DO置为false,
TM Online时需检查该DO为true
2023-10-11 11:52:21 +08:00
SIC1016\caipeilun 560d8cb75a 1.IO名称删除斜杠和括号
2.元件标号转移到描述Description中
2023-09-20 10:09:50 +08:00
SL 0f001d7077 修正模拟器TM点表中没有定义三色灯DO的问题。 2023-06-21 16:37:12 +08:00
hanqiangqiang ffe2e41752 Repo Init 2023-05-10 10:26:01 +08:00