Sic-Software
/
Sic08
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Activity
836 Commits 19 Branches 30 Tags 693 MiB
Commit Graph

174 Commits

Author SHA1 Message Date
Han Qiang Qiang 0a29749d44 旋转平台添加昂坤Trigger测温 2024-07-15 15:44:33 +08:00
SIC1016\caipeilun 82a7ca4a1f 删除不相关代码/屏蔽报警 2024-07-15 14:54:07 +08:00
SIC1016\caipeilun 51b2982e67 修改部分Device表 2024-06-11 15:17:03 +08:00
SIC1016\caipeilun 47008d381d 修改IO表 2024-06-09 10:29:19 +08:00
Liang Su 0e8d385e79 feat: 准备好支持动态PID限幅相关配置。 2024-04-24 09:21:23 +08:00
Liang Su 292c23cdca refactor(recipe): Recipe模板中TC控制策略选项优化。 
Pyro相关的DisplayName变更为Follow、Auto，ControlName保持不变。
SCR的控温策略选项的Pyro拆分为Auto和Follow，和PSU保持一致。
 2024-04-24 09:21:23 +08:00
Liang Su 349a7caede refactor(TempSensor): 重构温度传感器相关对象，增加温度滤波算法。 
更新库文件1cb92f8。
温度传感器对象实现移动平均滤波算法，并可配置PID反馈温度使用滤波前温度还是滤波后温度。
温度传感器设备配置中增加MaxChannels和MinimalTemp定义。
修改温度传感器设备配置中的ScBasePath到根节点。
系统配置中新增温度传感器相关配置项，并保留就得配置项，以确保旧版兼容性。
系统配置中新增温度滤波器参数配置项。
 2024-04-08 19:30:09 +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 15f96f1ada PM2 Alarm13 修改为 Warning15 2024-02-22 09:48:26 +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
HCL 00d6356c1b 1.do改为di 2024-02-01 14:20:00 +08:00
HCL 2c60ed107f 1.添加TM DO09、DO11、DO13、DO15与DI-31的互锁 2024-02-01 14:13:40 +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
HCL 5ea1d7cef1 1.解决一些问题 2024-01-15 08:48: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 ec0db0ed21 Merge branch 'Sic8ToSic6' into 添加DI-45 
# Conflicts:
#	SicUI/Properties/AssemblyInfo.cs
 2023-12-14 16:58:02 +08:00
Han Qiang Qiang 9403a242ae 更新dll 
PM2添加ProcessDeviceItemsPM2 XML配置
 2023-12-14 16:56:24 +08:00
Han Qiang Qiang 8c449e46e7 更新dll 
修改配置项单位名称
 2023-12-14 15:32:56 +08:00
Han Qiang Qiang 0048497137 添加PM2三色灯配置 2023-12-12 14:33:12 +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 eafd085128 PM2添加PT对应的Offect配置 2023-12-12 13:51:06 +08:00
Han Qiang Qiang d2e5fcffc5 整理ProcessHistory配置的XML信息，测试dll 2023-12-11 15:22:57 +08:00
Han Qiang Qiang c6ce558b71 1TM和仿真添加DI-45,添加DI-45对应的Seneor 
2在UnLoadSeparateRoutine中添加DI-45检测逻辑
3在SC UnLoad中配置SeparationLog报警等级
 2023-12-11 11:00:23 +08:00
HCL 800e65cdb0 Merge branch 'Sic8ToSic6' into feature/Sunway 
# 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
 2023-12-08 13:41:14 +08:00
Han Qiang Qiang 74e628354e 1保存Process配置的XML信息 
2更新dll
 2023-12-06 17:24:28 +08:00
Han Qiang Qiang e4be178599 添加XML配置的默认项 2023-12-05 14:01:23 +08:00
Han Qiang Qiang e9d30a47fd 1添加Process查询界面配置 
2使用XML作为查询默认配置项
 2023-12-05 08:52:41 +08:00
HCL 5deaf92b5c 1.进度更新 2023-12-01 10:27:17 +08:00
HCL ad5c4ddd46 1.进度更新 2023-11-30 18:01:35 +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
Han Qiang Qiang 80eb027801 添加测温配置项 2023-11-20 13:19:53 +08:00
HQQ f04658385a 添加IoN2HighDoping类，配置气阀控制PN2气体 2023-11-19 12:17:29 +08:00
Han Qiang Qiang 1f814517bf 删除PM2多余Interlock配置项 
更新版本号至## Version 1.1.1.2
 2023-11-17 20:51:03 +08:00