diff --git a/Modbus_communication/Master_Salve_DLL/Modbus.h b/Modbus_communication/Master_Salve_DLL/Modbus.h index 281c56c..634bd1c 100644 --- a/Modbus_communication/Master_Salve_DLL/Modbus.h +++ b/Modbus_communication/Master_Salve_DLL/Modbus.h @@ -47,5 +47,5 @@ DLL_EXPORT_IMPORT int Analysis_Response_Message(UINT8 *Response_Message, UINT8 * DLL_EXPORT_IMPORT int Create_TCP_Message(UINT8 *Message, int function_code, unsigned int operations_Number, unsigned int starting_address, string write_date); DLL_EXPORT_IMPORT int Analysis_Response_Msg(UINT8 *Requst_Message, UINT8 *Response_Message, DWORD read_len); DLL_EXPORT_IMPORT bool Create_Response_Message(UINT8 *Requst_Message, UINT8 *Response_Message, int flage); - +DLL_EXPORT_IMPORT void Init_Coil_Register(void); #endif /* __MODBUS_H */ \ No newline at end of file diff --git a/Modbus_communication/Master_Salve_DLL/Modbus_Salve.cpp b/Modbus_communication/Master_Salve_DLL/Modbus_Salve.cpp index c5cfc2d..351472c 100644 --- a/Modbus_communication/Master_Salve_DLL/Modbus_Salve.cpp +++ b/Modbus_communication/Master_Salve_DLL/Modbus_Salve.cpp @@ -368,7 +368,7 @@ bool Check_Operation_Number_Requst_Message(UINT8 *Requst_Message) **********************************************************************************************/ int Analysis_Response_Msg(UINT8 *Requst_Message, UINT8 *Response_Message, DWORD read_len) { - if (read_len < 8 || read_len > 256) + if (read_len < 8) return NO_RESPONSE; if (!Check_Requst_Message_CRC(Requst_Message, read_len))//CRC校验报文是否正确 return NO_RESPONSE; @@ -416,7 +416,7 @@ bool Create_Response_Message(UINT8 *Requst_Message, UINT8 *Response_Message, int switch (flage) { case NO_RESPONSE:return false; - case NORMAL_RESPONSE: Create_Normal_Message(Requst_Message, Response_Message); break; + case NORMAL_REQUEST: Create_Normal_Message(Requst_Message, Response_Message); break; case EXCEPTION_CODE_01:Create_Abnormal_Code_Response_Message(Requst_Message, Response_Message, 0x01); break; case EXCEPTION_CODE_03:Create_Abnormal_Code_Response_Message(Requst_Message, Response_Message, 0x03); break; case EXCEPTION_CODE_04:Create_Abnormal_Code_Response_Message(Requst_Message, Response_Message, 0x04); break; diff --git a/Modbus_communication/Master_Salve_DLL/Source.def b/Modbus_communication/Master_Salve_DLL/Source.def index faa03c3..d2c92f9 100644 --- a/Modbus_communication/Master_Salve_DLL/Source.def +++ b/Modbus_communication/Master_Salve_DLL/Source.def @@ -4,3 +4,4 @@ Analysis_Response_Message @1 Create_TCP_Message @2 Analysis_Response_Msg @3 Create_Response_Message @4 +Init_Coil_Register @5 \ No newline at end of file diff --git a/Modbus_communication/UnitTest_DLL/1.ini b/Modbus_communication/UnitTest_DLL/1.ini deleted file mode 100644 index 903d74e..0000000 --- a/Modbus_communication/UnitTest_DLL/1.ini +++ /dev/null @@ -1,140 +0,0 @@ -[Example] -Number = 19 - -;0x01 -[Example1] -Input1 = 1 -Input2 = 1 -Input3 = 0 -Input4 = "" -Output = "00 00 00 00 00 06 01 01 00 00 00 01" - -[Example2] -Input1 = 1 -Input2 = 155 -Input3 = 1 -Input4 = "" -Output = "00 01 00 00 00 06 01 01 00 01 00 9B" - -[Example3] -Input1 = 1 -Input2 = 1568 -Input3 = 100 -Input4 = "" -Output = "00 02 00 00 00 06 01 01 00 64 06 20" - -[Example4] -Input1 = 1 -Input2 = 2000 -Input3 = 65535 -Input4 = "" -Output = "00 03 00 00 00 06 01 01 FF FF 07 D0" - -[Example5] -Input1 = 1 -Input2 = 65535 -Input3 = 300 -Input4 = "" -Output = "00 04 00 00 00 06 01 01 01 2C FF FF" - -[Example6] -Input1 = 1 -Input2 = 65535 -Input3 = 65535 -Input4 = "" -Output = "00 05 00 00 00 06 01 01 FF FF FF FF" - -;0x03 -[Example7] -Input1 = 3 -Input2 = 1 -Input3 = 0 -Input4 = "" -Output = "00 06 00 00 00 06 01 03 00 00 00 01" - -[Example8] -Input1 = 3 -Input2 = 100 -Input3 = 1 -Input4 = "" -Output = "00 07 00 00 00 06 01 03 00 01 00 64" - -[Example9] -Input1 = 3 -Input2 = 1122 -Input3 = 100 -Input4 = "" -Output = "00 08 00 00 00 06 01 03 00 64 04 62" - -[Example10] -Input1 = 3 -Input2 = 125 -Input3 = 65535 -Input4 = "" -Output = "00 09 00 00 00 06 01 03 FF FF 00 7D" - -[Example11] -Input1 = 3 -Input2 = 65535 -Input3 = 300 -Input4 = "" -Output = "00 0A 00 00 00 06 01 03 01 2C FF FF" - -[Example12] -Input1 = 3 -Input2 = 65535 -Input3 = 65535 -Input4 = "" -Output = "00 0B 00 00 00 06 01 03 FF FF FF FF" - -;0x0F -[Example13] -Input1 = 15 -Input2 = 1 -Input3 = 0 -Input4 = "01" -Output = "00 0C 00 00 00 08 01 0F 00 00 00 01 01 01" - -[Example14] -Input1 = 15 -Input2 = 100 -Input3 = 1 -Input4 = "01 01 01 01 01 01 01 01 01 01 01 01 01" -Output = "00 0D 00 00 00 14 01 0F 00 01 00 64 0D 01 01 01 01 01 01 01 01 01 01 01 01 01" - -[Example15] -Input1 = 15 -Input2 = 1968 -Input3 = 100 -Input4 = "FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" -Output = "00 0E 00 00 00 FD 01 0F 00 64 07 B0 F6 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" - -[Example16] -Input1 = 15 -Input2 = 10 -Input3 = 65535 -Input4 = "55 03" -Output = "00 0F 00 00 00 09 01 0F FF FF 00 0A 02 55 03" - -;0x0F -[Example17] -Input1 = 16 -Input2 = 1 -Input3 = 0 -Input4 = "01 01" -Output = "00 10 00 00 00 09 01 10 00 00 00 01 02 01 01" - -[Example18] -Input1 = 16 -Input2 = 4 -Input3 = 1 -Input4 = "01 01 01 01 01 01 01 01" -Output = "00 11 00 00 00 0F 01 10 00 01 00 04 08 01 01 01 01 01 01 01 01" - -[Example19] -Input1 = 16 -Input2 = 123 -Input3 = 65535 -Input4 = "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" -Output = "00 12 00 00 00 FD 01 10 FF FF 00 7B 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" - diff --git a/Modbus_communication/UnitTest_DLL/2.ini b/Modbus_communication/UnitTest_DLL/2.ini deleted file mode 100644 index 31aa92a..0000000 --- a/Modbus_communication/UnitTest_DLL/2.ini +++ /dev/null @@ -1,127 +0,0 @@ -[Example] -Number = 27 - -;0x01正常读取响应解析样例 -[Example1] -Input1 = "00 00 00 00 00 06 01 01 00 00 00 01" -Input2 = "00 00 00 00 00 04 01 01 01 00" - -[Example2] -Input1 = "00 01 00 00 00 06 01 01 00 00 00 64" -Input2 = "00 01 00 00 00 10 01 01 0D 00 00 00 00 00 00 00 00 00 00 00 00 00" - -[Example3] -Input1 = "00 03 00 00 00 06 01 01 00 00 07 D0" -Input2 = "00 03 00 00 00 FD 01 01 FA 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" - -;0x03正常读取响应解析样例 -[Example4] -Input1 = "00 06 00 00 00 06 01 03 00 00 00 01" -Input2 = "00 06 00 00 00 05 01 03 02 00 00" - -[Example5] -Input1 = "00 00 00 00 00 06 01 03 00 00 00 02" -Input2 = "00 00 00 00 00 07 01 03 04 00 00 00 00" - -[Example6] -Input1 = "00 07 00 00 00 06 01 03 00 0A 00 0A" -Input2 = "00 07 00 00 00 17 01 03 14 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" - -[Example7] -Input1 = "00 08 00 00 00 06 01 03 00 00 00 7D" -Input2 = "00 08 00 00 00 FD 01 03 FA 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" - -;0x0F正常写入响应解析样例 -[Example8] -Input1 = "00 0A 00 00 00 08 01 0F 00 00 00 01 01 01" -Input2 = "00 0A 00 00 00 06 01 0F 00 00 00 01" - -[Example9] -Input1 = "00 0B 00 00 00 14 01 0F 00 00 00 64 0D 00 00 00 00 00 00 00 00 00 00 00 00 00" -Input2 = "00 0B 00 00 00 06 01 0F 00 00 00 64" - -[Example10] -Input1 = "00 0C 00 00 00 FD 01 0F 00 05 07 B0 F6 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" -Input2 = "00 0C 00 00 00 06 01 0F 00 05 07 B0" - -;0x10正常写入响应解析样例 -[Example11] -Input1 = "00 0E 00 00 00 09 01 10 00 00 00 01 02 11 11" -Input2 = "00 0E 00 00 00 06 01 10 00 00 00 01" - -[Example12] -Input1 = "00 0F 00 00 00 11 01 10 00 0A 00 05 0A 00 11 22 33 44 55 66 77 88 99" -Input2 = "00 0F 00 00 00 06 01 10 00 0A 00 05" - -[Example13] -Input1 = "00 10 00 00 00 FD 01 10 00 64 00 7B F6 FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" -Input2 = "00 10 00 00 00 06 01 10 00 64 00 7B" - -;异常响应样例 -[Example14] -Input1 = "00 0E 00 00 00 08 01 0F 00 00 00 01 01 01" -Input2 = "00 0F 00 00 00 06 01 0F 00 00 00 01" - -[Example15] -Input1 = "00 0E 00 00 00 08 01 0F 00 00 00 01 01 01" -Input2 = "00 0E 01 00 00 06 01 0F 00 00 00 01" - -[Example16] -Input1 = "00 0E 00 00 00 08 01 0F 00 00 00 01 01 01" -Input2 = "00 0E 00 1E 00 06 01 0F 00 00 00 01" - -[Example17] -Input1 = "00 0E 00 00 00 08 01 0F 00 00 00 01 01 01" -Input2 = "00 0E 00 00 11 06 01 0F 00 00 00 01" - -[Example18] -Input1 = "00 0E 00 00 00 06 01 01 00 00 00 01" -Input2 = "00 0E 00 00 00 03 01 01 01 00" - -[Example19] -Input1 = "00 0E 00 00 00 06 01 01 00 00 00 01" -Input2 = "00 0E 00 00 00 04 02 01 01 00" - -[Example20] -Input1 = "00 0E 00 00 00 06 01 01 00 00 00 01" -Input2 = "00 0E 00 00 00 04 01 03 01 00" - -[Example21] -Input1 = "00 0E 00 00 00 06 01 10 00 00 00 02 04 11 11 11 11" -Input2 = "00 0E 00 00 00 06 01 10 50 10 00 02" - -[Example22] -Input1 = "00 0E 00 00 00 0B 01 10 00 00 00 02 04 11 11 11 11" -Input2 = "00 0E 00 00 00 06 01 10 00 00 01 02" - -[Example23] -Input1 = "00 0E 00 00 00 06 01 03 00 00 00 02" -Input2 = "00 0E 00 00 00 07 01 03 02 11 11 11 11" - -;异常码响应样例 -[Example24] -Input1 = "00 0E 00 00 00 06 01 03 00 00 00 02" -Input2 = "00 0E 00 00 00 03 01 83 01" - -[Example25] -Input1 = "00 0E 00 00 00 06 01 01 00 00 00 02" -Input2 = "00 0E 00 00 00 03 01 81 02" - -[Example26] -Input1 = "00 0E 00 00 00 08 01 0F 00 00 00 02 01 00" -Input2 = "00 0E 00 00 00 03 01 8F 03" - -[Example27] -Input1 = "00 0E 00 00 00 09 01 10 00 00 00 01 02 00 00" -Input2 = "00 0E 00 00 00 03 01 90 04" - - - - - - - - - - - diff --git a/Modbus_communication/UnitTest_DLL/3.ini b/Modbus_communication/UnitTest_DLL/3.ini deleted file mode 100644 index 7edfc20..0000000 --- a/Modbus_communication/UnitTest_DLL/3.ini +++ /dev/null @@ -1,195 +0,0 @@ -[Example] -Number = 41 - -;0x01功能码正常读取响应 -[Example1] -Input1 = "09 01 00 00 00 01 FC 82" -Output = "09 01 01 01 92 28" - -[Example2] -Input1 = "09 01 00 00 00 0A BD 45" -Output = "09 01 02 FF 03 59 CC" - -[Example3] -Input1 = "09 01 00 00 00 C8 3C D4" -Output = "09 01 19 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF D6 40" - -[Example4] -Input1 = "09 01 00 00 07 D0 3E EE" -Output = "09 01 FA FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF 8D BF" - -;0x01功能码下03异常码响应 -[Example5] -Input1 = "09 01 00 00 07 D1 FF 2E" -Output = "09 81 03 81 93" - -[Example6] -Input1 = "09 01 00 00 00 00 3D 42" -Output = "09 81 03 81 93" - -[Example7] -Input1 = "09 01 00 00 00 01 00 82 41" -Output = "09 81 03 81 93" - -;0x01功能码下无响应 -[Example8] -Input1 = "09 01 00 00 00 01 11 11" -Output = "" - -[Example9] -Input1 = "08 01 00 00 00 01 FD 53" -Output = "" - -;0x01功能码下02异常码 -[Example10] -Input1 = "09 01 27 06 00 14 D7 F8" -Output = "09 81 02 40 53" - - -;0x03功能码正常读取响应样例 -[Example11] -Input1 = "09 03 00 00 00 01 85 42" -Output = "09 03 02 FF FF 58 35" - -[Example12] -Input1 = "09 03 00 00 00 64 45 69" -Output = "09 03 C8 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF ED 8C" - -[Example13] -Input1 = "09 03 00 00 00 7B 04 A1" -Output = "09 03 F6 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF 34 54" - -[Example14] -Input1 = "09 03 00 00 00 7D 84 A3" -Output = "09 03 FA FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF 70 F8" - -;0x03功能码下03异常码响应 -[Example15] -Input1 = "09 03 00 00 00 00 44 82" -Output = "09 83 03 80 F3" - -[Example16] -Input1 = "09 03 00 00 00 7E C4 A2" -Output = "09 83 03 80 F3" - -[Example17] -Input1 = "09 03 00 00 00 01 00 83 A3" -Output = "09 83 03 80 F3" - -;0x03功能码下无响应 -[Example18] -Input1 = "09 03 00 00 00 01 11 11" -Output = "" - -[Example19] -Input1 = "08 03 00 00 00 01 84 93" -Output = "" - -;0x03功能码下02异常码 -[Example20] -Input1 = "09 03 27 06 00 14 AE 38" -Output = "09 83 02 41 33" - - - - - - -;0x0F正常写入样例 -[Example21] -Input1 = "09 0F 00 00 00 01 01 01 EE F1" -Output = "09 0F 00 00 00 01 95 43" - -[Example22] -Input1 = "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" -Output = "09 0F 00 00 07 B0 57 07" - -;0x0F下03异常码样例 -[Example23] -Input1 = "09 0F 00 00 00 00 54 83" -Output = "09 8F 03 85 F3" - -[Example24] -Input1 = "09 0F 00 00 00 01 01 01 00 71 4C" -Output = "09 8F 03 85 F3" - -[Example25] -Input1 = "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" -Output = "09 8F 03 85 F3" - -;0x0F下无响应 -[Example26] -Input1 = "09 0F 00 00 00 01 01 01 11 F1" -Output = "" - -[Example27] -Input1 = "08 0F 00 00 00 01 01 01 2F 3D" -Output = "" - -;0x0F下02异常码 -[Example28] -Input1 = "09 0F 27 06 00 14 03 02 FF FF 54 11" -Output = "09 8F 02 44 33" - - - -;0x10下正常写入响应样例 -[Example29] -Input1 = "09 10 00 00 00 01 02 00 00 C1 90" -Output = "09 10 00 00 00 01 00 81" - -[Example30] -Input1 = "09 10 00 00 00 02 04 00 00 00 00 D9 CF" -Output = "09 10 00 00 00 02 40 80" - -[Example31] -Input1 = "09 10 00 00 00 7B 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 CE 42" -Output = "09 10 00 00 00 7B 81 62" - -;0x10下03异常码 -[Example32] -Input1 = "09 10 00 00 00 00 C1 41" -Output = "09 90 03 8D C3" - -[Example33] -Input1 = "09 10 00 00 00 01 02 00 00 00 51 90" -Output = "09 90 03 8D C3" - -;0x10下无响应 -[Example34] -Input1 = "09 10 00 00 00 01 02 01 01 11 11" -Output = "" - -[Example35] -Input1 = "08 10 00 00 00 01 02 01 01 0C 50" -Output = "" - -;0x10下02异常码 -[Example36] -Input1 = "09 10 27 0F 00 02 04 00 00 00 00 26 7E" -Output = "09 90 02 4C 03" - -[Example37] -Input1 = "09 10 27 06 00 14 28 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 D9 BB" -Output = "09 90 02 4C 03" - -;其他特殊样例 -;设备ID+功能码+CRC -[Example38] -Input1 = "09 01 C6 20" -Output = "" -;只有设备ID+CRC -[Example39] -Input1 = "09 7F 46" -Output = "" -;只有设备ID -[Example40] -Input1 = "09" -Output = "" -;01异常码 -[Example41] -Input1 = "09 02 00 00 00 01 B8 82" -Output = "09 82 01 00 A2" - - - diff --git a/Modbus_communication/UnitTest_DLL/master_salve_test.cpp b/Modbus_communication/UnitTest_DLL/master_salve_test.cpp index 52d43b8..c9bf062 100644 --- a/Modbus_communication/UnitTest_DLL/master_salve_test.cpp +++ b/Modbus_communication/UnitTest_DLL/master_salve_test.cpp @@ -150,6 +150,68 @@ void Test_Salve_Analysis_Request_Msg(void) void Test_Salve_Create_Response_Msg(void) { + char buf[LEN]; + char buf1[LEN]; + CString name = "Example"; + char s[10] = ""; + int Input1, Output1, Output2; + bool test_Value = true; + int number = GetPrivateProfileInt(name, "Number", 0, TESTPATH3); + Init_Coil_Register(); + for (int i = 1; i < number + 1; i++) + { + memset(buf, 0, sizeof(buf)); + memset(buf1, 0, sizeof(buf1)); + memset(s, 0, sizeof(s)); + _itoa_s(i, s, 10); + CString name1 = name + s; + Input1 = GetPrivateProfileString(name1, "Input1", "", buf, LEN, TESTPATH3); + Output1 = GetPrivateProfileString(name1, "Output1", "", buf1, LEN, TESTPATH3); + Output2 = GetPrivateProfileInt(name1, "Output2", 0, TESTPATH3); + //buf buf1 Ӧ + UINT8 Request_Message[600]; + memset(Request_Message,0,600); + string Act_Message = buf; + const char *a = Act_Message.c_str(); + unsigned int Act_len = 0; + int temp = 0; + for (unsigned int i = 0; i + 3 < Act_Message.length(); i = i + 3) + { + sscanf_s(a + i, "%02X", &temp); + Request_Message[Act_len] = temp; + Act_len++; + } + sscanf_s(a + Act_Message.length() - 2, "%02X", &temp); + Request_Message[Act_len] = temp; + UINT8 Response_Message[600]; + memset(Response_Message, 0, 600); + string Act_Message1 = buf1; + const char *b = Act_Message1.c_str(); + unsigned int Act_len1 = 0; + int temp1 = 0; + for (unsigned int i = 0; i + 3 < Act_Message1.length(); i = i + 3) + { + sscanf_s(b + i, "%02X", &temp1); + Response_Message[Act_len1] = temp1; + Act_len1++; + } + sscanf_s(b + Act_Message1.length() - 2, "%02X", &temp1); + Response_Message[Act_len1] = temp1; + + UINT8 Response_Message1[600]; + memset(Response_Message1,0,600); + int flage = Analysis_Response_Msg(Request_Message, Response_Message1, Act_len + 1); + Create_Response_Message(Request_Message, Response_Message1, flage); + for (unsigned int j = 0; j < Act_len1+1; j++) + { + if (Response_Message[j] != Response_Message1[j]) + { + test_Value = false; + break; + } + } + Assert::AreEqual(test_Value, true); + } } diff --git a/Modbus_communication/testini/2.ini b/Modbus_communication/testini/2.ini index fcacf82..86c1abc 100644 --- a/Modbus_communication/testini/2.ini +++ b/Modbus_communication/testini/2.ini @@ -1,5 +1,5 @@ [Example] -Number = 28 +Number = 33 ;0x01正常读取响应解析样例 [Example1] @@ -156,6 +156,34 @@ Input1 = "00 0E 00 00 00 09 01 10 00 00 00 01 02 00 00" Input2 = "00 0E 00 00 00 03 01 83 04" Output = 2 +[Example29] +Input1 = "00 0E 00 00 00 06 01 01 00 00 00 01" +Input2 = "00 0E 00 00 00 03 01" +Output = 0 + +[Example30] +Input1 = "00 0E 00 00 00 06 01 01 00 00 00 01" +Input2 = "00 0E 00 00 00 04 01 81 00 00" +Output = 0 + +[Example31] +Input1 = "00 0E 00 00 00 06 01 10 00 00 00 00" +Input2 = "00 0E 00 00 00 03 01 90 03" +Output = 6 + +[Example32] +Input1 = "00 0E 00 00 00 06 01 10 00 00 00 01 02 11 11" +Input2 = "00 0E 00 00 00 07 01 10 00 00 00 01 00" +Output = 0 + +[Example33] +Input1 = "00 0E 00 00 00 06 01 03 00 00 00 01" +Input2 = "00 0E 00 00 00 06 01 03 03 00 00 00" +Output = 0 + + + + diff --git a/Modbus_communication/testini/3.ini b/Modbus_communication/testini/3.ini index a0d778b..a10a43e 100644 --- a/Modbus_communication/testini/3.ini +++ b/Modbus_communication/testini/3.ini @@ -1,5 +1,5 @@ [Example] -Number = 41 +Number = 44 ;0x01功能码正常读取响应 [Example1] @@ -230,5 +230,23 @@ Input1 = "09 02 00 00 00 01 B8 82" Output1 = "09 82 01 00 A2" Output2 = 2 +[Example42] +Input1 = "09 0F 00 00 07 B1 F7 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 BD 42" +Output1 = "09 8F 03 85 F3" +Output2 = 3 + +[Example43] +Input1 = "09 10 00 00 00 00 C1 41" +Output1 ="09 90 03 8D C3" +Output2 = 3 + +[Example44] +Input1 = "09 10 00 00 00 7C F8 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 93 49" +Output1 = "09 90 03 8D C3" +Output2 = 3 + + + +