From fa6053f85287163f6e2d5dba690bec05cbc95f4a Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 07 Jun 2024 17:00:49 +0800
Subject: [PATCH] 增加阀控事件记录及修改阀控命令
---
Function/WirelessRemoteComm/wireless_remote_comm.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Function/WirelessRemoteComm/wireless_remote_comm.c b/Function/WirelessRemoteComm/wireless_remote_comm.c
index 469d054..e1b7bb9 100644
--- a/Function/WirelessRemoteComm/wireless_remote_comm.c
+++ b/Function/WirelessRemoteComm/wireless_remote_comm.c
@@ -5,6 +5,7 @@
#include "wrc_sizhu_v4.h"
#include "system_general_para.h"
#include "linked_list.h"
+#include "sizhu_alarm_record.h"
WRC_CTRL_PARA_T wrc_ctrl_para_g={.wrc_state=WRC_IDLE,.link_status = LINK_NONE,.wrc_err_code = WRC_ERR_NONE,.report_result_flag = FAIL};
WRC_UART_PARA_T wrc_uart_para_g = {.recv_flag = RESET};
@@ -41,6 +42,9 @@
dma_recv_cnt = dma_mar_reg_read - (uint32)WRC_recv_buff;
if(dma_recv_cnt)
{
+ if((dma_recv_cnt >= WRC_REC_BUF_LENGTH) || (dma_recv_cnt >= WRC_RECV_BUFF_LEN_MAX) )
+ return;
+
wrc_ctrl_para_p->recv_length = dma_recv_cnt;
arrayA_2_arrayB(WRC_recv_buff , wrc_ctrl_para_p->recv_buf, dma_recv_cnt, LITTLE_ENDIAN) ;
wrc_ctrl_para_p->recv_flag = SET;//�������
@@ -99,6 +103,7 @@
}
buffer[204] = 0x16;
+
WRC_UART_SEND(buffer,205);
}
@@ -195,7 +200,8 @@
//��������
WRC_uart_Init(115200,NONE,OneBit);
-
+ WRC_RX_DMA_CH3_Init();
+ uart_ctrl_para_g.WRC_rxto_flag = RESET;
//?��������ʹģ�����������������
WrcSendCreateLinkCmd();
@@ -239,7 +245,10 @@
uint16_t send_length = 0;
//����buf����
- WRC_RX_DMA_check(&wrc_uart_para_g);
+ if(uart_ctrl_para_g.WRC_rxto_flag ==SET){
+ uart_ctrl_para_g.WRC_rxto_flag = RESET;
+ WRC_RX_DMA_check(&wrc_uart_para_g);
+ }
//���������ж�
if(wrc_uart_para_g.recv_flag == SET){
--
Gitblit v1.9.3