Sic-Software
/
SicMultiplate
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
921 Commits 1 Branch 0 Tags 303 MiB
Commit Graph

188 Commits

Author SHA1 Message Date
Han Qiang Qiang 950c8d5937 修改水温报警相关内容 2024-05-30 10:28:01 +08:00
Han Qiang Qiang dc3468f5de 添加PM泵绑定数据 2024-05-29 14:30:21 +08:00
Han Qiang Qiang ac8c261437 1修改气阀打开不对应问题 
2修改PM的IO，水温的还需要继续优化
3TM的IO好多和逻辑相关，只修改小部分，后面继续修改
4界面添加泵，绑定数据还需要沟通
 2024-05-28 11:17:00 +08:00
Han Qiang Qiang bb5c4a6dc0 1修改Recipe，新增MFC 
2修改配置中Recipe权限，开启全部显示
 2024-05-27 17:05:51 +08:00
Han Qiang Qiang 38cdf75a43 1修改磁流体相关内容 
2修改IO读写问题
 2024-05-24 15:10:00 +08:00
Han Qiang Qiang 0dc417d74a 修改RT中使用错误的伺服对象问题 2024-05-23 15:53:47 +08:00
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
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
Han Qiang Qiang 885a16d79a 修改PMToAtmIdleRoutine 
修改PMToProcessIdleRoutine
 2024-04-23 14:11:48 +08:00
Han Qiang Qiang 29699b2140 Merge branch 'develop' into 多片机/multiplate-develop 2024-04-22 13:52:49 +08:00
Liang Su 349a7caede refactor(TempSensor): 重构温度传感器相关对象，增加温度滤波算法。 
更新库文件1cb92f8。
温度传感器对象实现移动平均滤波算法，并可配置PID反馈温度使用滤波前温度还是滤波后温度。
温度传感器设备配置中增加MaxChannels和MinimalTemp定义。
修改温度传感器设备配置中的ScBasePath到根节点。
系统配置中新增温度传感器相关配置项，并保留就得配置项，以确保旧版兼容性。
系统配置中新增温度滤波器参数配置项。
 2024-04-08 19:30:09 +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 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