去除错误信息
This commit is contained in:
1 parent
4fe95c9686
commit
1096dbb42f
2 files changed
+5
-13
No files matched your search
@@ -83,7 +83,6 @@
|
|||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx/Inc}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx/Inc}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx}"" />
|
||||||
<<<<<<< HEAD
|
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/UartFramework-latest}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/UartFramework-latest}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}"" />
|
||||||
@@ -474,7 +473,6 @@
|
|||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx/Inc}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx/Inc}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/UartFramework-latest}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/UartFramework-latest}"" />
|
||||||
=======
|
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}"" />
|
||||||
@@ -587,6 +585,7 @@
|
|||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx/Inc}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx/Inc}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx}"" />
|
||||||
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/UartFramework-latest}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}"" />
|
||||||
@@ -676,6 +675,7 @@
|
|||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx/Inc}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx/Inc}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx}"" />
|
||||||
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/UartFramework-latest}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}"" />
|
||||||
@@ -769,6 +769,7 @@
|
|||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx/Inc}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx/Inc}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx}"" />
|
||||||
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/UartFramework-latest}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}"" />
|
||||||
@@ -860,7 +861,7 @@
|
|||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//.}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx/Inc}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx/Inc}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//cubemx}"" />
|
||||||
>>>>>>> refs/remotes/origin/master
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/UartFramework-latest}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/cJSON-v1.7.17}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//packages/sqlite-v3.19.3}"" />
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}"" />
|
<listOptionValue builtIn="false" value=""${workspace_loc://${ProjName}//rt-thread/components/dfs/filesystems/devfs}"" />
|
||||||
|
|||||||
@@ -10,13 +10,11 @@
|
|||||||
# include <rtthread.h>
|
# include <rtthread.h>
|
||||||
# include <rtdevice.h>
|
# include <rtdevice.h>
|
||||||
# include <board.h>
|
# include <board.h>
|
||||||
# include <stdio.h>
|
|
||||||
#include "uart_framework.h"
|
#include "uart_framework.h"
|
||||||
#include "data_comm.h"
|
#include "data_comm.h"
|
||||||
|
|
||||||
#define LOG_TAG "uart.rx"
|
#define LOG_TAG "uart.rx"
|
||||||
#define LOG_LVL LOG_LVL_DBG
|
#define LOG_LVL LOG_LVL_DBG
|
||||||
//#include <ulog.h>
|
|
||||||
|
|
||||||
#define UART_NAME "uart2"
|
#define UART_NAME "uart2"
|
||||||
#define UART_BAUD_RATE BAUD_RATE_115200
|
#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_mq_send(proc_mq, &req, sizeof(req)) == RT_EOK)
|
||||||
{
|
{ // 等待处理完成
|
||||||
// 等待处理完成
|
|
||||||
if (rt_sem_take(req->sem, RT_WAITING_FOREVER) == 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);
|
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->sem);
|
||||||
rt_free(req);
|
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;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user