diff --git a/.cproject b/.cproject
index 0a7ad81..2bf3637 100644
--- a/.cproject
+++ b/.cproject
@@ -83,7 +83,6 @@
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//.}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//cubemx/Inc}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//cubemx}&quot;" />
-<<<<<<< HEAD
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/UartFramework-latest}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}&quot;" />
@@ -474,7 +473,6 @@
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//cubemx/Inc}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//cubemx}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/UartFramework-latest}&quot;" />
-=======
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}&quot;" />
@@ -587,6 +585,7 @@
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//.}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//cubemx/Inc}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//cubemx}&quot;" />
+                  <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/UartFramework-latest}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}&quot;" />
@@ -676,6 +675,7 @@
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//.}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//cubemx/Inc}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//cubemx}&quot;" />
+                  <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/UartFramework-latest}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}&quot;" />
@@ -769,6 +769,7 @@
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//.}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//cubemx/Inc}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//cubemx}&quot;" />
+                  <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/UartFramework-latest}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}&quot;" />
@@ -860,7 +861,7 @@
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//.}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//cubemx/Inc}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//cubemx}&quot;" />
->>>>>>> refs/remotes/origin/master
+                  <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/UartFramework-latest}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}&quot;" />
                   <listOptionValue builtIn="false" value="&quot;${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}&quot;" />
diff --git a/applications/DATA/uart_rs485.c b/applications/DATA/uart_rs485.c
index fb3fff7..d1847db 100644
--- a/applications/DATA/uart_rs485.c
+++ b/applications/DATA/uart_rs485.c
@@ -10,13 +10,11 @@
 # include <rtthread.h>
 # include <rtdevice.h>
 # include <board.h>
-# include <stdio.h>
 #include "uart_framework.h"
 #include "data_comm.h"
 
 #define LOG_TAG              "uart.rx"
 #define LOG_LVL              LOG_LVL_DBG
-//#include <ulog.h>
 
 #define UART_NAME           "uart2"
 #define UART_BAUD_RATE      BAUD_RATE_115200
@@ -102,8 +100,7 @@ static rt_err_t frame_handler(rt_uint8_t *data, rt_size_t size)
 
     // 发送到处理线程
     if (rt_mq_send(proc_mq, &req, sizeof(req)) == RT_EOK)
-    {
-        // 等待处理完成
+    {   // 等待处理完成
         if (rt_sem_take(req->sem, RT_WAITING_FOREVER) == RT_EOK)
         {
             res=  uart_framework_send(uf, (rt_uint8_t *)req->output, req->output_len);
@@ -114,12 +111,6 @@ static rt_err_t frame_handler(rt_uint8_t *data, rt_size_t size)
     rt_free(req->sem);
     rt_free(req);
 
-    //这里直接返回接收到的数据
-    // rt_uint8_t *frame_data = data;
-    // rt_uint16_t frame_len = size;
-   // rt_kprintf("rx_buf", 16, frame_data, frame_len);
-   // rt_err_t res = uart_framework_send(uf, frame_data, frame_len);
-
     return res;
 }