From 6e3f1f560d618b37ee1a47fa2b0f682b70c3ef1c Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 19 Jun 2024 17:25:45 +0800
Subject: [PATCH] 增加OTA协议
---
Function/FLOW_METER_DATA_COLLECT/rs485_read_data.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.c b/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.c
index 371a43e..1e33468 100644
--- a/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.c
+++ b/Function/FLOW_METER_DATA_COLLECT/rs485_read_data.c
@@ -5,6 +5,7 @@
#include "gpio.h"
#include "uart.h"
#include "linked_list.h"
+#include "sizhu_alarm_record.h"
/****�������˼·******************
*RS485������Ʒ�Ϊ�ϵ硢���Ͷ�ȡָ��ȴ��������ݲ���������״̬�����裻����ʵ�ֵȴ���ʱ�жϺͶ���ض���
@@ -269,14 +270,14 @@
if(rs485_com_uart_data_g.recv_flag == SET){
rs485_com_uart_data_g.recv_flag =RESET;
- read_ok = rs485ComDataAnalysis(rs485_com_uart_data_g,SIZHUMODBUSV2_0,1,rs485_com_ctrl_pata_g ) ;//?�豸���롢�ӻ���ַ���Ҫ��
+ read_ok = rs485ComDataAnalysis(rs485_com_uart_data_g,SIZHUMODBUSV2_0,1,rs485_com_ctrl_pata_g ) ;
memset(rs485_com_uart_data_g.recv_buf, 0, sizeof(rs485_com_uart_data_g.recv_buf)); //Ӧ�������ս���
}
if(read_ok==PASS){
if(rs485_com_ctrl_pata_g.modbus_step_status >= rs485_com_ctrl_pata_g.modbus_last_status) {
- //?����ͨѶȫ���ɹ���������Ӧ�Ĵ���
+ //����ͨѶȫ���ɹ���������Ӧ�Ĵ���
//�رյ�Դ���رմ���
RS485_PWR_OFF;
RS485_RE_REC_ENABLE;
@@ -298,7 +299,7 @@
if((--rs485_com_ctrl_pata_g.reread_wait_time_cnt)==0){
if((--rs485_com_ctrl_pata_g.reread_num_cnt)==0){
- //?��ʱ���ض��������꣬����ͨѶ������ʧ�ܸ��գ�������Ӧ�Ĵ���
+ //��ʱ���ض��������꣬����ͨѶ������ʧ�ܸ��գ�������Ӧ�Ĵ���
//�رյ�Դ���رմ��ڣ�RS485ͨѶʧ��+1,
RS485_PWR_OFF;
RS485_RE_REC_ENABLE;
--
Gitblit v1.9.3