From dc7c4429fb15e221a26f90c6a82bbec44b898672 Mon Sep 17 00:00:00 2001
From: Ace <258613763@qq.com>
Date: Fri, 25 Oct 2019 09:38:49 +0800
Subject: [PATCH] =?UTF-8?q?485=E6=96=B9=E5=90=91=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=9C=E4=B8=BA=E4=B8=BB=E6=9C=BA=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=B3=A2=E7=89=B9=E7=8E=87115200=EF=BC=8C=20=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=90=8E=E5=BB=B6=E6=97=B6=E5=AF=BC=E8=87=B4=E4=BB=8E=E6=9C=BA?=
 =?UTF-8?q?=E7=9A=84=E5=89=8D=E5=87=A0=E4=B8=AA=E5=AD=97=E8=8A=82=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E4=B8=8D=E5=88=B0=EF=BC=8C=E5=BB=B6=E6=97=B6=E4=BB=8E?=
 =?UTF-8?q?1ms=E8=B0=83=E6=95=B4=E4=B8=BA0.1ms=E3=80=82=20=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=88=B0=E6=8E=A5=E6=94=B6=E6=A8=A1=E5=BC=8F=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=BB=B6=E6=97=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Device/SerialPort.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Device/SerialPort.cpp b/Device/SerialPort.cpp
index c040fb24..4352a138 100644
--- a/Device/SerialPort.cpp
+++ b/Device/SerialPort.cpp
@@ -304,9 +304,22 @@ void SerialPort::Set485(bool flag)
 {
 	if (RS485)
 	{
-		if (!flag) Sys.Sleep(1);
+		if (!flag)
+		{
+			//切换到接收需要等待发送完成
+			//需要根据实际测试值修改
+			switch (this->_baudRate)
+			{
+			case 115200:
+				Sys.Delay(100);
+				break;
+			default:
+				Sys.Sleep(1);
+				break;
+			}			
+		}
 		*RS485 = flag;
-		if (flag) Sys.Sleep(1);
+		/*if (flag) Sys.Sleep(1);*/
 		/*if(flag)
 			debug_printf("485 高\r\n");
 		else