Commit bdf72f89 几米阳光

1

1 个父辈 47649dac
...@@ -302,6 +302,10 @@ namespace OnlineStore.Common ...@@ -302,6 +302,10 @@ namespace OnlineStore.Common
break; break;
System.Threading.Thread.Sleep(1); System.Threading.Thread.Sleep(1);
} }
if (num >= Overtime)
{
LogUtil.error(PortName + " 发送数据" + ByteToString(SendData) + "等待接受数据超时");
}
if (_serialPort.BytesToRead >= ReceiveData.Length) if (_serialPort.BytesToRead >= ReceiveData.Length)
{ {
...@@ -336,6 +340,11 @@ namespace OnlineStore.Common ...@@ -336,6 +340,11 @@ namespace OnlineStore.Common
/// <returns></returns> /// <returns></returns>
public int SendCommand(byte[] SendData, ref byte[] ReceiveData, int Overtime, int ReceiveLength) public int SendCommand(byte[] SendData, ref byte[] ReceiveData, int Overtime, int ReceiveLength)
{ {
if (_serialPort == null)
{
LogUtil.error(PortName+" 发送数据"+ByteToString(SendData)+ "失败,_serialPort=null");
return -1;
}
if (_serialPort.IsOpen) if (_serialPort.IsOpen)
{ {
...@@ -350,18 +359,16 @@ namespace OnlineStore.Common ...@@ -350,18 +359,16 @@ namespace OnlineStore.Common
if (ReceiveData == null) if (ReceiveData == null)
{ {
ReceiveData = new byte[ReceiveLength]; ReceiveData = new byte[ReceiveLength];
} }
int i = 0;
while (num++ < Overtime) while (num++ < Overtime)
{ {
i++;
if (_serialPort.BytesToRead >= ReceiveData.Length) if (_serialPort.BytesToRead >= ReceiveData.Length)
break; break;
System.Threading.Thread.Sleep(1); System.Threading.Thread.Sleep(1);
} }
if (i >= Overtime) if (num >= Overtime)
{ {
LogUtil.info("等待超时"); LogUtil.error(PortName + " 发送数据" + ByteToString(SendData) + "等待接受数据超时");
} }
if (_serialPort.BytesToRead >= ReceiveData.Length) if (_serialPort.BytesToRead >= ReceiveData.Length)
{ {
......
...@@ -203,7 +203,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -203,7 +203,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info( "串口" + portName + " 收到数据:" + strSend + ""); LogUtil.info( "串口" + portName + " 收到数据:" + strSend + "");
} }
} }
public static void SendData(string portName, byte[] data) public static void aSendData(string portName, byte[] data)
{ {
if (data == null) if (data == null)
{ {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!