修改

packages/qmodbus/mb_sample_rtu_master.c

@@ -1,5 +1,4 @@
 /*
-#include <packages/qmodbus/inc/modbus.h>
  * mb_sample_rtu_master.c
  *
  * Change Logs:
@@ -8,6 +7,7 @@
  */
 
 #include "rtthread.h"
+#include "modbus.h"
 
 #ifdef MB_USING_SAMPLE_RTU_MASTER
 

packages/qmodbus/mb_sample_rtu_slave.c

@@ -1,5 +1,4 @@
 /*
-#include <packages/qmodbus/inc/modbus.h>
  * mb_sample_rtu_slave.c
  *
  * Change Logs:
@@ -8,6 +7,7 @@
  */
 
 #include "rtthread.h"
+#include "modbus.h"
 
 #ifdef MB_USING_SAMPLE_RTU_SLAVE
 

packages/qmodbus/mb_sample_tcp_master.c

@@ -1,5 +1,4 @@
 /*
-#include <packages/qmodbus/inc/modbus.h>
  * mb_sample_tcp_master.c
  *
  * Change Logs:
@@ -8,6 +7,7 @@
  */
 
 #include "rtthread.h"
+#include "modbus.h"
 
 #ifdef MB_USING_SAMPLE_TCP_MASTER
 

packages/qmodbus/mb_sample_tcp_slave.c

@@ -1,5 +1,4 @@
 /*
-#include <packages/qmodbus/inc/modbus.h>
  * mb_sample_tcp_slave.c
  *
  * Change Logs:
@@ -8,6 +7,7 @@
  */
 
 #include "rtthread.h"
+#include "modbus.h"
 
 #ifdef MB_USING_SAMPLE_TCP_SLAVE
 

packages/qmodbus/mb_sample_tcp_srv_slave.c

@@ -1,5 +1,4 @@
 /*
-#include <packages/qmodbus/inc/modbus.h>
  * mb_sample_tcp_slave.c
  *
  * Change Logs:
@@ -10,6 +9,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "rtthread.h"
+#include "modbus.h"
 
 #ifdef MB_USING_SAMPLE_TCP_SRV_SLAVE
 

packages/qmodbus/modbus.c

@@ -1,7 +1,4 @@
 /*
-#include <packages/qmodbus/inc/modbus.h>
-#include <packages/qmodbus/inc/modbus_cvt.h>
-#include <packages/qmodbus/inc/modbus_port.h>
  * modbus.c
  *
  * Change Logs:
@@ -11,6 +8,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "modbus.h"
+#include "modbus_cvt.h"
+#include "modbus_port.h"
 
 #ifdef MB_USING_RAW_PRT
 static void mb_raw_prt(bool is_send, const u8 *pdata, int dlen)//原始数据打印

packages/qmodbus/modbus.h

@@ -7,14 +7,13 @@
  */
 
 #ifndef __MODBUS_H__
-
 #define __MODBUS_H__
 
-#include <packages/qmodbus/inc/modbus_cvt.h>
-#include <packages/qmodbus/inc/modbus_rtu.h>
-#include <packages/qmodbus/inc/modbus_tcp.h>
-#include <packages/qmodbus/inc/modbus_port.h>
-#include <packages/qmodbus/inc/modbus_backend.h>
+#include "modbus_cvt.h"
+#include "modbus_rtu.h"
+#include "modbus_tcp.h"
+#include "modbus_port.h"
+#include "modbus_backend.h"
 
 #ifdef MB_TCP_FRM_MAX 
 #define MB_BUF_SIZE MB_TCP_FRM_MAX

packages/qmodbus/modbus_backend.c

@@ -1,6 +1,4 @@
 /*
-#include <packages/qmodbus/inc/modbus_backend.h>
-#include <packages/qmodbus/inc/modbus_port.h>
  * modbus_backend.c
  *
  * Change Logs:
@@ -10,6 +8,8 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "modbus_backend.h"
+#include "modbus_port.h"
 
 
 #ifdef MB_USING_RTU_BACKEND

packages/qmodbus/modbus_backend.h

@@ -7,11 +7,10 @@
  */
 
 #ifndef __MODBUS_BACKEND_H__
-
 #define __MODBUS_BACKEND_H__
 
-#include <packages/qmodbus/inc/modbus_cfg.h>
-#include <packages/qmodbus/inc/typedef.h>
+#include "modbus_cfg.h"
+#include "typedef.h"
 
 #define MB_BKD_ACK_TMO_MS_DEF       300
 #define MB_BKD_BYTE_TMO_MS_DEF      32

packages/qmodbus/modbus_crc.c

@@ -6,7 +6,7 @@
  * 2024-04-02     qiyongzhong       first version
  */
 
-#include <packages/qmodbus/inc/modbus_crc.h>
+#include "modbus_crc.h"
 
 static const u16 mb_crc_table[] = {
 	0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241, 

packages/qmodbus/modbus_crc.h

@@ -7,10 +7,9 @@
  */
 
 #ifndef __MODBUS_CRC_H__
-
 #define __MODBUS_CRC_H__
 
-#include <packages/qmodbus/inc/typedef.h>
+#include "typedef.h"
 
 #define MB_CRC_INIT_VOL     0xFFFF
 

packages/qmodbus/modbus_cvt.c

@@ -6,7 +6,7 @@
  * 2024-04-01     qiyongzhong       first version
  */
 
-#include <packages/qmodbus/inc/modbus_cvt.h>
+#include "modbus_cvt.h"
 
 int mb_cvt_u8_put(u8 *buf, u8 val)
 {

packages/qmodbus/modbus_cvt.h

@@ -7,10 +7,9 @@
  */
 
 #ifndef __MODBUS_CVT_H__
-
 #define __MODBUS_CVT_H__
 
-#include <packages/qmodbus/inc/typedef.h>
+#include "typedef.h"
 
 int mb_cvt_u8_put(u8 *buf, u8 val);
 int mb_cvt_u8_get(const u8 *buf, u8 *pval);

packages/qmodbus/modbus_master.c

@@ -1,7 +1,4 @@
 /*
-#include <packages/qmodbus/inc/modbus.h>
-#include <packages/qmodbus/inc/modbus_cvt.h>
-#include <packages/qmodbus/inc/modbus_port.h>
  * modbus_master.c
  *
  * Change Logs:
@@ -10,6 +7,9 @@
  */
 
 #include <string.h>
+#include "modbus.h"
+#include "modbus_cvt.h"
+#include "modbus_port.h"
 
 #ifdef MB_USING_MASTER
 

packages/qmodbus/modbus_pdu.c

@@ -1,6 +1,4 @@
 /*
-#include <packages/qmodbus/inc/modbus_cvt.h>
-#include <packages/qmodbus/inc/modbus_pdu.h>
  * modbus_pdu.c
  *
  * Change Logs:
@@ -9,6 +7,8 @@
  */
     
 #include <string.h>
+#include "modbus_pdu.h"
+#include "modbus_cvt.h"
 
 static int mb_pdu_except_make(u8 *buf, const mb_pdu_except_t *exc)
 {

packages/qmodbus/modbus_pdu.h

@@ -7,10 +7,9 @@
  */
 
 #ifndef __MODBUS_PDU_H__
-
 #define __MODBUS_PDU_H__
 
-#include <packages/qmodbus/inc/typedef.h>
+#include "typedef.h"
 
 #define MB_PDU_SIZE_MIN                     2       //最小pdu尺寸
 #define MB_PDU_SIZE_MAX                     253     //最大pdu尺寸

packages/qmodbus/modbus_port.h

@@ -7,10 +7,9 @@
  */
 
 #ifndef __MODBUS_PORT_H__
-
 #define __MODBUS_PORT_H__
 
-#include <packages/qmodbus/inc/modbus_backend.h>
+#include "modbus_backend.h"
 
 #define MB_ASSERT(x)        //ASSERT(x)
 #define MB_WEAK             __attribute__((weak))

packages/qmodbus/modbus_port_linux.c

@@ -6,7 +6,7 @@
  * 2024-04-02     qiyongzhong       first version
  */
 
-#include <packages/qmodbus/inc/modbus_port.h>
+#include "modbus_port.h"
 
 #ifdef MB_USING_PORT_LINUX
 

packages/qmodbus/modbus_port_rtt.c

@@ -6,7 +6,7 @@
  * 2024-04-02     qiyongzhong       first version
  */
 
-#include <packages/qmodbus/inc/modbus_port.h>
+#include "modbus_port.h"
 
 #ifdef MB_USING_PORT_RTT
 

packages/qmodbus/modbus_port_slave.c

@@ -6,7 +6,7 @@
  * 2024-04-02     qiyongzhong       first version
  */
 
-#include <packages/qmodbus/inc/modbus_port.h>
+#include "modbus_port.h"
 
 #ifdef MB_USING_SLAVE
 MB_WEAK int mb_port_read_disc(u16 addr, u8 *pbit)//读离散量输入, 返回 : 0-成功, -2-地址错误

packages/qmodbus/modbus_rtu.c

@@ -6,9 +6,9 @@
  * 2024-04-01     qiyongzhong       first version
  */
 
-#include <packages/qmodbus/inc/modbus_crc.h>
-#include <packages/qmodbus/inc/modbus_cvt.h>
-#include <packages/qmodbus/inc/modbus_rtu.h>
+#include "modbus_rtu.h"
+#include "modbus_crc.h"
+#include "modbus_cvt.h"
 
 #ifdef MB_USING_RTU_PROTOCOL
 

packages/qmodbus/modbus_rtu.h

@@ -7,11 +7,10 @@
  */
 
 #ifndef __MODBUS_RTU_H__
-
 #define __MODBUS_RTU_H__
 
-#include <packages/qmodbus/inc/modbus_cfg.h>
-#include <packages/qmodbus/inc/modbus_pdu.h>
+#include "modbus_cfg.h"
+#include "modbus_pdu.h"
 
 #ifdef MB_USING_RTU_PROTOCOL
 

packages/qmodbus/modbus_slave.c

@@ -1,7 +1,4 @@
 /*
-#include <packages/qmodbus/inc/modbus.h>
-#include <packages/qmodbus/inc/modbus_cvt.h>
-#include <packages/qmodbus/inc/modbus_port.h>
  * modbus_slave.c
  *
  * Change Logs:
@@ -10,6 +7,9 @@
  */
 
 #include <string.h>
+#include "modbus.h"
+#include "modbus_cvt.h"
+#include "modbus_port.h"
 
 #ifdef MB_USING_SLAVE
 

packages/qmodbus/modbus_tcp.c

@@ -6,8 +6,8 @@
  * 2024-04-01     qiyongzhong       first version
  */
  
-#include <packages/qmodbus/inc/modbus_cvt.h>
-#include <packages/qmodbus/inc/modbus_tcp.h>
+#include "modbus_tcp.h"
+#include "modbus_cvt.h"
 
 #ifdef MB_USING_TCP_PROTOCOL
 

packages/qmodbus/modbus_tcp.h

@@ -7,11 +7,10 @@
  */
 
 #ifndef __MODBUS_TCP_H__
-
 #define __MODBUS_TCP_H__
 
-#include <packages/qmodbus/inc/modbus_cfg.h>
-#include <packages/qmodbus/inc/modbus_pdu.h>
+#include "modbus_cfg.h"
+#include "modbus_pdu.h"
 
 #ifdef MB_USING_TCP_PROTOCOL