Commit Graph

726 Commits (50b273ccbf206d1dc2b95d2dad5ac8344f99038d)
 

Author SHA1 Message Date
wangsr cfa80ec7f3 change - 三通阀逻辑控制完善 1 year ago
nodyang 8f5e9f0fc9 fix配方 1 year ago
nodyang 927685d010 plc最终版提交经过测试 1 year ago
wangsr 5e39f02bd1 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
# Conflicts:
#	Main/MCRun/Data/MCProject/nodeDevice.xml
1 year ago
nodyang e8224d1f53 emrge 1 year ago
wangsr f3f6e1afc3 add - 添加界面 1 year ago
nodyang 2e02aa0483 nodeDevice.xml 1 year ago
nodyang 6895e8cde4 整理代码 1 year ago
nodyang d03d423814 比例阀 1 year ago
nodyang 24400a59c9 阀门 1 year ago
wangsr dfd2e0c826 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 39d8fdd960 change - text limit 1 year ago
nodyang 440a6da24f 压力管理 1 year ago
wangsr 1fb17ee8f0 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep 1 year ago
wangsr 4a9cc5c480 change - delete sql change 1 year ago
nodyang f195102a8a 整理代码 1 year ago
wangsr 716d43eaf8 change - 设备压力参数管理维护 1 year ago
nodyang 48e1497789 Merge branch 'wangsr' into dep_yangw
# Conflicts:
#	Mesnac.DoUtils/DoControl.cs
1 year ago
wangsr 6f0a34056e 提交准备合并 1 year ago
wangsr 6ee566826c change - PlcCommunication代码优化 1 year ago
wangsr 4c853034dd add - 数据块状态检测(差两个struct数据类型) 1 year ago
nodyang 73320cb736 merge 1 year ago
wangsr 9b29781643 add - ParameterWithPC部分状态监测 1 year ago
wangsr 92bfefa190 add - DB1165状态监测 部分完成 nodeDevice维护 1 year ago
wangsr 4eb0084239 add - MotorinitStateMonitor 结束 1 year ago
wangsr af10a16d38 add - 8/23下班 添加马达初始化数据块监测类(阶段) 1 year ago
wangsr b82b87a847 change - 电机初始化状态监测 1 year ago
wangsr 8331712550 add - 阀门数据类状态监测 维护nodeDevice 1 year ago
wangsr a42944f15d change - 榄菊设备参数压力管理 partchange 1 year ago
wangsr d71c4836b2 doctrl part change 1 year ago
wangsr 6c0ba7c4db change - 大小写问题 1 year ago
wangsr fb572e5a0a Revert "delete - 删除无用压缩包"
This reverts commit 49a3f76a21.
1 year ago
wangsr 49a3f76a21 delete - 删除无用压缩包 1 year ago
wangsr f014130acd change - DOControl代码完善 1 year ago
wangsr 44b54a1796 小修改 1 year ago
wangsr be5c0bc9a1 Revert "change - Timer完善 增加 等待加入多綫程"
This reverts commit e00504ce9a.
1 year ago
wangsr e06d8c8d68 Merge branch 'dep_yangw' into wangsr 1 year ago
wangsr e00504ce9a change - Timer完善 增加 等待加入多綫程 1 year ago
nodyang 465c348df0 应用类库 1 year ago
wangsr 6bc53e73d9 Merge branch 'dep_yangw' into wangsr2
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDataSource.xml
1 year ago
nodyang dd9fcefccf 修改plc 1 year ago
wangsr 2b5fccc5e8 解决合并冲突——wangsr+dep_yangw 1 year ago
wangsr b19a0c0b27 1 year ago
wangsr cc10602c3f Merge branch 'dep_yangw' into wangsr
# Conflicts:
#	Main/MCEdit/Data/MCProject/nodeDataSource.xml
#	Main/MCEdit/Data/MCProject/nodeDevice.xml
1 year ago
wangsr bcdede6928 add - Timer部分引入 1 year ago
wangsr b43b08586a add - 阀门数据块监测 - 电机代码待优化 1 year ago
wangsr fa6c6e84bc add - 电机数据块状态检测 - 待添加Timer 1 year ago
nodyang df5758ff0c Merge branch 'dep' into dep_yangw 1 year ago
nodyang cc80555fdf 最新版本的plc nodeDevice.xml 1 year ago
wangsr c298569b3f add - Plc数据读取-816下班 1 year ago