From e4424eb6b50d0300583c422dfb71d58e040f4b9e Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 11 Jun 2024 19:54:37 +0800
Subject: [PATCH] 继续测试优化
---
Function/WirelessRemoteComm/wireless_remote_comm.c | 68 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/Function/WirelessRemoteComm/wireless_remote_comm.c b/Function/WirelessRemoteComm/wireless_remote_comm.c
index 18976a2..e1b7bb9 100644
--- a/Function/WirelessRemoteComm/wireless_remote_comm.c
+++ b/Function/WirelessRemoteComm/wireless_remote_comm.c
@@ -4,8 +4,10 @@
#include "system_mem_para.h"
#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};
+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};
LINK_INFO_T link_info_g;
@@ -14,6 +16,9 @@
{
OutputIO(WRC_PWR_PORT,WRC_PWR_PIN,OUT_PUSHPULL);
OutputIO(PWR_3V8_O_PORT,PWR_3V8_O_PIN,OUT_PUSHPULL);
+ CloseIO(PWR_3V8_EN_PORT,PWR_3V8_EN_PIN);
+ PWR_3V8_OFF;
+ WRC_PWR_OFF;
}
@@ -37,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;//�������
@@ -95,6 +103,7 @@
}
buffer[204] = 0x16;
+
WRC_UART_SEND(buffer,205);
}
@@ -119,6 +128,9 @@
check_sum += *(buf_p + count_i);
if(*(buf_p + 89) == check_sum){
+
+ WRC_RX_DMA_CH3_reload(); //����У��ͨ��������Ϊ������Ҫ���յ������Ѿ���ɣ���Ҫ����DMA����,
+
if(*(buf_p + 2) == 1){
return_flag = LINK_OK;
if((*(buf_p+3) != 1)&&(*(buf_p+3) <0x39)){
@@ -156,7 +168,7 @@
if(buf_p != NULL){
buf_next_p = strstr(buf_p , ",");
if(buf_next_p != NULL){
- __SYS_DELAY_SEC_TIME_SET_(wrc_timeout_para,wrc_ctrl_para_g.time_out_time_sec);//��ʱ���ڽ��յ�+R�ͳ�ֵ��ʱʱ�䣬�������Ӧ�÷���Э��֡��ʽ�жϳɹ�����Ӧ����֮��
+
return SizhuV4ProtocolDataAnalysis((uint8_t *)buf_next_p,ack_buf,ack_buf_length);
}
@@ -180,7 +192,7 @@
//?��Ҫ��ͨѶ������ʼ�����Է�������
SizhuV4SendParaInit();
- return WRC_SEND_DATA;
+ return WRC_CREATE_LINK;
}
WRC_STATUS WrcCreateLinkPro(void)
@@ -188,7 +200,8 @@
//��������
WRC_uart_Init(115200,NONE,OneBit);
-
+ WRC_RX_DMA_CH3_Init();
+ uart_ctrl_para_g.WRC_rxto_flag = RESET;
//?��������ʹģ�����������������
WrcSendCreateLinkCmd();
@@ -209,7 +222,7 @@
// wrc_ctrl_para_g.time_out_cnt = wrc_ctrl_para_g.time_out_time_sec;
send_buf[0] = WRC_MODULE_CMD_DATA_UP;
- send_buf[1] = send_length &0x0f;
+ send_buf[1] = send_length &0xff;
send_buf[2] = send_length >>8;
if(send_length > sizeof(send_buf)){
@@ -218,7 +231,7 @@
return WRC_OFF;
}
- WRC_UART_SEND(send_buf,send_length);
+ WRC_UART_SEND(send_buf,send_length + 3);
__SYS_DELAY_SEC_TIME_SET_(wrc_timeout_para,wrc_ctrl_para_g.time_out_time_sec);
@@ -229,10 +242,13 @@
{
WRC_STATUS return_status;
uint8_t send_buf[3+1024] = {0};
- uint16_t send_length;
+ 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){
@@ -248,9 +264,9 @@
if((send_length > 0)&&(send_length < sizeof(send_buf))){ //����Ӧ������Ҫ����
send_buf[0] = WRC_MODULE_CMD_DATA_UP;
- send_buf[1] = send_length &0x0f;
+ send_buf[1] = send_length &0xff;
send_buf[2] = send_length >>8;
- WRC_UART_SEND(send_buf,send_length);
+ WRC_UART_SEND(send_buf,send_length + 3);
__SYS_DELAY_SEC_TIME_SET_(wrc_timeout_para,wrc_ctrl_para_g.time_out_time_sec);
}
memset(wrc_uart_para_g.recv_buf,0,sizeof(wrc_uart_para_g.recv_buf));
@@ -281,6 +297,8 @@
//��ȡ��ͬЭ���ͨѶ���
wrc_ctrl_para_g.wrc_result_flag = wrc_sizhuV4_result_flag;
+ wrc_ctrl_para_g.report_result_flag = (report_sizhuV4_result_flag == PASS)? PASS: wrc_ctrl_para_g.wrc_result_flag;//ֻ�гɹ��Ÿı�״̬������ԭֵ
+ report_sizhuV4_result_flag = FAIL;
wrc_ctrl_para_g.wrc_OFF_cnt ++;
@@ -295,7 +313,7 @@
PWR_3V8_OFF;
return WRC_OFF;
- }else if(wrc_ctrl_para_g.wrc_OFF_cnt == 8){
+ }else if(wrc_ctrl_para_g.wrc_OFF_cnt >= 8){
//�ӳ��˳�ͨѶ���̣���ʱ��Դ�Ѿ��رգ��൱�ڸ�����һ��ʱ����
WRC_PWR_OFF;
PWR_3V8_OFF;
@@ -314,9 +332,30 @@
return WRC_IDLE; //�ػ���ϣ�����WRC_IDLE��������ͨѶ����
}
- return WRC_IDLE;
+ return WRC_OFF;
}
+
+//����δ�ϱ��ɹ��жϣ��жϱ����Ա�ͨѶ�Ƿ�ɹ�����һ�㣬ֻҪ�������ϱ���Ӧ�����жϳɹ�����֡��������Ӧ���ý���֡��������֡����ɹ�
+void LongTimeReportFailed(BILLING_VALVE_CTRL_PATA_T billing_valve_ctrl_para_in)
+{
+ static uint8_t report_failed_days_cnt = 0;
+ //��Ϊ�ֱ�0��֮�����һ��ͨѶ����ô�ж�ʱ�������Ӻ�����6��55�ж�
+ if((&sys_clockBCD_g)->hour == 6 && (&sys_clockBCD_g)->min == 55 && (&sys_clockBCD_g)->sec == 0 ){
+ if(billing_valve_ctrl_para_in.no_wrc_days > 0){ //����0�����ܿ���
+ if(wrc_ctrl_para_g.report_result_flag == PASS){
+ report_failed_days_cnt = 0;
+ __SYS_STATUS_BYTES_STATUS(no_gprs_date_up_to, RESET, ALARM_ID_N_DAYS_NO_REPORT_ARRIVE);
+ }else{
+ if((report_failed_days_cnt++) >= billing_valve_ctrl_para_in.no_wrc_days){ //��++����Ϊ��һ���ж�ʱ����1��
+ __SYS_STATUS_ALARM_BYTES_SET(no_gprs_date_up_to,ALARM_ID_N_DAYS_NO_REPORT_ARRIVE);
+ }
+
+ }
+ }
+
+ }
+}
void WirelessRemoteCommPro(FUN_START_CTRL_PARA_T * sys_fun_run_ctrl_p)
@@ -348,5 +387,10 @@
else
sys_fun_run_ctrl_p->wrc_ctrl_flag.running_flag = SET;
+
+ //����δ�ϱ��ɹ��жϣ���ͬЭ���жϵı���ͬ
+ LongTimeReportFailed(billing_valve_ctrl_para_g);
+
+
}
--
Gitblit v1.9.3