Commit Graph

227 Commits (55a9a78539ca608e3ca12c5e95b4015ca00a9b6a)
 

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