Commit b3aef1cd 张东亮

20220822

1 个父辈 1ab14152
...@@ -5,6 +5,7 @@ using System.Collections.Generic; ...@@ -5,6 +5,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary namespace OnlineStore.DeviceLibrary
{ {
...@@ -20,17 +21,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -20,17 +21,19 @@ namespace OnlineStore.DeviceLibrary
{ {
if (LineManager.Config.StoreDOList.ContainsKey(ioType)) if (LineManager.Config.StoreDOList.ContainsKey(ioType))
{ {
ConfigIO configIo = LineManager.Config.StoreDOList[ioType]; ConfigIO configIo = LineManager.Config.StoreDOList[ioType];
instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue); instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
Thread.Sleep(60); Thread.Sleep(60);
if (!IOValue(ioType).Equals(ioValue))
instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
} }
else else
{ {
LogUtil.error("没有DO=" + ioType); LogUtil.error("没有DO=" + ioType);
} }
} }
public static void CIOMove(string ioType,IO_VALUE ioValue) public static void CIOMove(string ioType, IO_VALUE ioValue)
{ {
if (!IOValue(ioType).Equals(ioValue)) if (!IOValue(ioType).Equals(ioValue))
{ {
...@@ -84,7 +87,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -84,7 +87,7 @@ namespace OnlineStore.DeviceLibrary
instance = new KNDManager(); instance = new KNDManager();
} }
} }
public abstract void ReadAllDI(string deviceName, byte slaveId); public abstract void ReadAllDI(string deviceName, byte slaveId);
public abstract void ReadAllDO(string deviceName, byte slaveId); public abstract void ReadAllDO(string deviceName, byte slaveId);
...@@ -97,7 +100,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -97,7 +100,7 @@ namespace OnlineStore.DeviceLibrary
public abstract IO_VALUE GetDOValue(string deviceName, byte slaveID, ushort v); public abstract IO_VALUE GetDOValue(string deviceName, byte slaveID, ushort v);
public abstract IO_VALUE GetIOValue(ConfigIO configIO); public abstract IO_VALUE GetIOValue(ConfigIO configIO);
......
...@@ -142,6 +142,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -142,6 +142,8 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
IOManager.IOMove(IO_Type.L1_Run, IO_VALUE.HIGH); IOManager.IOMove(IO_Type.L1_Run, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.L2_Run, IO_VALUE.HIGH); IOManager.IOMove(IO_Type.L2_Run, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.Tranverse_Down_SOL, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.Tranverse_Up_SOL, IO_VALUE.LOW);
UpdateSleep(false); UpdateSleep(false);
break; break;
case MoveStep.Feeder_H_LineRun: case MoveStep.Feeder_H_LineRun:
...@@ -397,11 +399,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -397,11 +399,9 @@ namespace OnlineStore.DeviceLibrary
IOManager.CIOMove(IO_Type.Tranverse_Run, IO_VALUE.LOW); IOManager.CIOMove(IO_Type.Tranverse_Run, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.Roller_Run, IO_VALUE.LOW); // IOManager.IOMove(IO_Type.Roller_Run, IO_VALUE.LOW);
LogUtil.info(" 横移电机停止"); LogUtil.info(" 横移电机停止");
IOManager.CIOMove(IO_Type.Tranverse_Up_SOL, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Tranverse_Up_SOL, IO_VALUE.LOW);
Thread.Sleep(1000);
IOManager.CIOMove(IO_Type.Tranverse_Up_SOL, IO_VALUE.LOW);
IOManager.CIOMove(IO_Type.Tranverse_Down_SOL, IO_VALUE.HIGH);
Thread.Sleep(1000); Thread.Sleep(1000);
IOManager.IOMove(IO_Type.Tranverse_Down_SOL, IO_VALUE.HIGH);
LogUtil.info(" 横移机构下降"); LogUtil.info(" 横移机构下降");
LogUtil.info(" TranverseProcess Finish"); LogUtil.info(" TranverseProcess Finish");
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!