Commit Graph

6 Commits

Author SHA1 Message Date
DESKTOP-1N1NK8A\auvkk 8782215da1 Merge branch 'feature/update-signal-tower' into develop
# 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
#	ThirdParty/MECF.Framework/Sicentury.Core.dll
2023-05-08 15:03:53 +08:00
hanqiangqiang 4fed65a655 1:修改报警信息
2:仿真添加IO
3:库中更改报警信息,库中添加测温硬件断联输出到IO
2023-05-06 10:53:01 +08:00
DESKTOP-1N1NK8A\auvkk 45b88dd8eb 更新库文件以引用新的三色灯对象。
修改PM1和PM2点表,以支持PLC的三色灯蜂鸣器闪烁频率设置。
修改PM1和PM2设备配置文件,以支持新的三色灯功能。
2023-05-05 11:42:39 +08:00
DESKTOP-GPE37UV\THINKAPD 1dc3c069ac Update from svn. 2023-03-28 13:24:11 +08:00
DESKTOP-GPE37UV\THINKAPD 122ca7f1a8 Update from svn. 2023-03-14 17:20:31 +08:00
DESKTOP-GPE37UV\THINKAPD f12ff6a6ca Add project files. 2023-03-03 15:42:13 +08:00