Commit Graph

106 Commits

Author SHA1 Message Date
Han Qiang Qiang d086ec0f97 修改配置名称,SicMultipleServo 2024-05-22 16:36:02 +08:00
Han Qiang Qiang acefb69517 1更新dll [f6dc2a7],磁流体新加功能
2修改磁流体相关IO
3修改磁流体对应界面功能
2024-05-08 17:27:24 +08:00
Han Qiang Qiang cff4de300e 修改界面和磁流体相关内容 2024-05-07 15:56:31 +08:00
Han Qiang Qiang c3c9a610d9 Merge branch 'develop' into 多片机/multiplate-develop 2024-05-06 10:20:52 +08:00
Han Qiang Qiang d1bf33b2d6 修改Routine相关内容 2024-04-26 08:54:54 +08:00
Liang Su 0e8d385e79 feat: 准备好支持动态PID限幅相关配置。 2024-04-24 09:21:23 +08:00
Han Qiang Qiang 885a16d79a 修改PMToAtmIdleRoutine
修改PMToProcessIdleRoutine
2024-04-23 14:11:48 +08:00
Han Qiang Qiang d096b22da7 添加IO配置 2024-04-01 16:52:10 +08:00
Han Qiang Qiang 25901a3589 修改IO配置 2024-04-01 11:24:33 +08:00
Han Qiang Qiang f4be381c87 修改IO配置,临时保存 2024-03-29 17:14:04 +08:00
Han Qiang Qiang dbc18198cb 添加气阀配置 2024-03-29 14:02:29 +08:00
Han Qiang Qiang 92aff1e1a4 配置Decice中MFC相关配置和SC配置,DI报警信号电气未配置,上位机后续在配置DI 2024-03-25 10:08:57 +08:00
Han Qiang Qiang bbfc64c13b 根据南京百识现场更新Process单步历史记录查询数据 2024-03-15 13:50:33 +08:00
Liang Su 7ec1499c61 Merge branch 'feature/high-performance-data-collector' into DevelopBase
# 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
2024-02-26 09:35:22 +08:00
Han Qiang Qiang b3439a2fdb PM1 Alarm13 修改为 Warning15 2024-02-22 09:21:32 +08:00
Han Qiang Qiang e2b4f9b083 1PM新增DI-73,AI-26,AI-27点位
2监控加热带温区AI-26,AI-27超温报警
3增加配置控制报警输出等级
4仿真添加相应点位
2024-02-21 11:12:42 +08:00
Liang Su 7adf7562b6 更新库文件c7513e1,合并Develop分支最新更改。
三色灯的DO增加DisImmCache属性,禁止调用DataTrace的ImmediateCache()方法。
2024-01-15 11:28:10 +08:00
Liang Su 4c6ec95824 Merge branch 'develop' into feature/high-performance-data-collector 2024-01-15 10:40:28 +08:00
Liang Su 4f1aa02d69 更新库文件92cd62b0,IO定义增加DisImmCache属性,用于禁止IO调用ImmediateCache()方法。
PM1和PM2的AO-130(AO_HeartBeat)增加DisImmCache=false属性定义。
2024-01-11 15:28:43 +08:00
Han Qiang Qiang 643cd1c09b PM CoolingWater U4配置项修改 2024-01-10 14:25:21 +08:00
Han Qiang Qiang c14ce74e09 PM添加DI-346 Apc_ButterflyError,绑定IoSensor提示 2023-12-28 15:35:06 +08:00
Han Qiang Qiang 0a7e5e5cc9 1.PM添加DO_TVReset,TV阀右键时通过控制DO来进行复位
2.PM主界面添加按钮事件触发TVReset
2023-12-28 11:07:22 +08:00
Han Qiang Qiang f8c64c1030 Merge branch 'ProcessHistoryData' into feature/测温重构
# Conflicts:
#	Modules/Mainframe/SicModules.csproj
#	SicRT/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
2023-12-15 10:27:01 +08:00
Han Qiang Qiang 549898026b 修改ProcessDeviceItem注册项名称 2023-12-15 10:19:10 +08:00
Han Qiang Qiang 017f7de7b5 1更新dll,
2添加ProcessDeviceItem注册项
2023-12-15 10:12:12 +08:00
Han Qiang Qiang 7933292bce Merge branch 'Sic8ToSic6' into ProcessHistoryData
# 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-12-15 09:47:21 +08:00
Han Qiang Qiang bd6e303ffe 修改PM中LineHeater配置的显示标签名称 2023-12-15 09:42:58 +08:00
Han Qiang Qiang 8c449e46e7 更新dll
修改配置项单位名称
2023-12-14 15:32:56 +08:00
Han Qiang Qiang 17e1128fae Merge branch 'Sic8ToSic6' into feature/测温重构
# Conflicts:
#	SicRT/Properties/AssemblyInfo.cs
#	SicRT/ReleaseNotes.md
#	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
2023-12-12 13:58:34 +08:00
Han Qiang Qiang d2e5fcffc5 整理ProcessHistory配置的XML信息,测试dll 2023-12-11 15:22:57 +08:00
Han Qiang Qiang f9b0615d42 PM新增DO-128 Interlock 2023-11-27 15:31:21 +08:00
Han Qiang Qiang 4c5d250d64 PM添加D0-128Interlock配置 2023-11-23 17:46:23 +08:00
Han Qiang Qiang 68c5f3f7c4 更新版本号至 ## Version 1.1.1.4
修改C2H4_C3H8FlowRatio配置名称
2023-11-22 15:58:31 +08:00
Han Qiang Qiang 8c322bf438 真值表添加配置项 2023-11-22 15:25:48 +08:00
Han Qiang Qiang b20d34d4dc 1更新dll,重新整理LineHeater数据输出
2修改LineHeater配置和界面及后台绑定
2023-11-22 13:12:12 +08:00
Han Qiang Qiang d4f99dff5e 1添加C2H4-C3H8配置项,在PM1 PM2主配置中
2修改PM界面相关显示
3修改真值表,气体流统计显示界面,更新dll
4修改IO名称
2023-11-22 10:22:06 +08:00
Han Qiang Qiang 8fb7a84308 更新dll [2cdf762],修改MFC5控制流程逻辑
1.PM Device配置中使用库中类实例化MFC5控制流程
2.SC配置中添加参数,是否安装MFC5,  PM.{module}.MFC.Mfc5.IsInstalled
3.修改PM主界面显示,根据配置是否显示MFC5
2023-11-21 17:20:54 +08:00
HQQ f04658385a 添加IoN2HighDoping类,配置气阀控制PN2气体 2023-11-19 12:17:29 +08:00
Han Qiang Qiang b70314fedd 1添加机械手真空
2还原PM DI-6 InterLock
2023-11-15 13:23:35 +08:00
Han Qiang Qiang 3c6d04a34e 删除PM DI6 Interlock 2023-11-15 09:32:24 +08:00
Han Qiang Qiang cf50e26d9b 删除PM2 DI-33门报警Interlock
修改LineHeat配置SC名称
2023-11-14 14:29:33 +08:00
Han Qiang Qiang 307e9a3ed7 修改气体流量C2H4配置
修改SC对应的气体流量配置
删除DI-33门报警InterLock
2023-11-14 14:03:18 +08:00
Han Qiang Qiang 9c3e075a8b C2H4修改为C3H8 2023-11-14 10:43:36 +08:00
Han Qiang Qiang bbda00b198 1.修改C2H4名称->C3H8
2.IO名称(DI-19,DI 188 189 190  ,AO 211  212 )
3.显示DO43
2023-11-14 10:14:26 +08:00
Han Qiang Qiang b2a63a8a61 1.修改合并冲突内容
2.IoTC添加存储到数据库配置
3.更新dll,  IoTC中添加属性,根据属性值判断是否注册温度数据,优化温度获取条件逻辑顺序
2023-11-06 17:26:07 +08:00
Han Qiang Qiang a5936c017e 1修改加热带配置名称,
2添加启动前检测LineHeater
3添加气柜温度显示
2023-11-06 11:07:48 +08:00
Han Qiang Qiang c24b7db2bb 更新dll [007352e],修改气柜检测
添加SC配置
修改PM的Device配置
2023-11-03 12:33:09 +08:00
Han Qiang Qiang cd3abbd3c3 修改PMIO报警 2023-10-26 14:46:35 +08:00
Han Qiang Qiang 27f6b53a3d 删除无用的AE监控项 2023-10-26 10:14:48 +08:00
Han Qiang Qiang 4a688d93fe 删除DI-29 2023-10-26 09:04:30 +08:00