From 8a75824df09742bd1a86c49b8b0ddb57cc2dc066 Mon Sep 17 00:00:00 2001
From: zcn1123 <2363211205@qq.com>
Date: Thu, 3 Sep 2020 22:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E8=AE=B0?=
=?UTF-8?q?=E5=BD=95=E6=A8=A1=E5=9D=97=E8=AE=B0=E5=BD=95=E9=A2=A0=E5=80=92?=
=?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Modbus_RTU_Salve/Modbus_RTU_Salve.vcxproj | 1 +
.../Modbus_RTU_Salve/Modbus_TCP_log.txt | 12 ++++++++++++
Modbus_communication/Modbus_RTU_Salve/RTU_Salve.cpp | 5 ++---
Modbus_communication/Modbus_RTU_Salve/common.h | 2 +-
4 files changed, 16 insertions(+), 4 deletions(-)
create mode 100644 Modbus_communication/Modbus_RTU_Salve/Modbus_TCP_log.txt
diff --git a/Modbus_communication/Modbus_RTU_Salve/Modbus_RTU_Salve.vcxproj b/Modbus_communication/Modbus_RTU_Salve/Modbus_RTU_Salve.vcxproj
index 2027d34..f510dac 100644
--- a/Modbus_communication/Modbus_RTU_Salve/Modbus_RTU_Salve.vcxproj
+++ b/Modbus_communication/Modbus_RTU_Salve/Modbus_RTU_Salve.vcxproj
@@ -44,6 +44,7 @@
Level3
Disabled
true
+ _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
diff --git a/Modbus_communication/Modbus_RTU_Salve/Modbus_TCP_log.txt b/Modbus_communication/Modbus_RTU_Salve/Modbus_TCP_log.txt
new file mode 100644
index 0000000..2874aea
--- /dev/null
+++ b/Modbus_communication/Modbus_RTU_Salve/Modbus_TCP_log.txt
@@ -0,0 +1,12 @@
+2020-9-3 22:1:6 Recv:09 0F 00 00 07 B1 F6 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20 DB
+2020-9-3 22:1:6 Send:09 8F 03 85 F3
+2020-9-3 22:1:7 Recv:09 0F 00 00 07 B1 F6 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20 DB
+2020-9-3 22:1:7 Send:09 8F 03 85 F3
+2020-9-3 22:1:8 Recv:09 0F 00 00 07 B1 F6 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20 DB
+2020-9-3 22:1:8 Send:09 8F 03 85 F3
+2020-9-3 22:1:9 Recv:09 0F 00 00 07 B1 F6 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20 DB
+2020-9-3 22:1:9 Send:09 8F 03 85 F3
+2020-9-3 22:1:10 Recv:09 0F 00 00 07 B1 F6 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 20 DB
+2020-9-3 22:1:10 Send:09 8F 03 85 F3
+2020-9-3 22:1:32 Recv:09 0F 00 00 07 B0 F6 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 B8 78
+2020-9-3 22:1:32 Send:09 0F 00 00 07 B0 57 07
diff --git a/Modbus_communication/Modbus_RTU_Salve/RTU_Salve.cpp b/Modbus_communication/Modbus_RTU_Salve/RTU_Salve.cpp
index c2ba0c1..4112e0c 100644
--- a/Modbus_communication/Modbus_RTU_Salve/RTU_Salve.cpp
+++ b/Modbus_communication/Modbus_RTU_Salve/RTU_Salve.cpp
@@ -337,7 +337,6 @@ bool Create_Response_Message(UINT8 *Requst_Message, UINT8 *Response_Message, DWO
}
-
int Modbus_RTU_Salve(void)
{
string COMM = Input_COMM();
@@ -371,8 +370,8 @@ int Modbus_RTU_Salve(void)
{
printf("发送失败,重新发送");
}
- Log_Note(Requst_Message, 1, Read_len);
- Log_Note(Response_Message, 0, Response_Message_Len);
+ Log_Note(Requst_Message, 0, Read_len);
+ Log_Note(Response_Message, 1, Response_Message_Len);
}
else
continue;
diff --git a/Modbus_communication/Modbus_RTU_Salve/common.h b/Modbus_communication/Modbus_RTU_Salve/common.h
index be8c489..a2a9312 100644
--- a/Modbus_communication/Modbus_RTU_Salve/common.h
+++ b/Modbus_communication/Modbus_RTU_Salve/common.h
@@ -16,6 +16,6 @@ BYTE Input_Date_Bits(void);
BYTE Input_Stop_Bits(BYTE Date_Bits);
BYTE Input_Parity(void);
UINT16 CRC_16(UINT8 *Data, unsigned int CRC_Len);
-void Log_Note(UINT8 *Message, int flage, int Message_len)
+void Log_Note(UINT8 *Message, int flage, int Message_len);
#endif
\ No newline at end of file