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/STORAGE/sizhu_history_record.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Function/STORAGE/sizhu_history_record.c b/Function/STORAGE/sizhu_history_record.c
index e294304..2edd5f7 100644
--- a/Function/STORAGE/sizhu_history_record.c
+++ b/Function/STORAGE/sizhu_history_record.c
@@ -7,7 +7,7 @@
#include "system_eep_mem_manage.h"
-
+FlagStatus interval_report_record_flag = RESET;
@@ -93,6 +93,9 @@
arrayA_2_arrayB((uint8_t *)&sys_clockBCD_g,(uint8_t *)&sizhu_history_interval_l.record_time_BCD,sizeof(sys_clockBCD_g), LITTLE_ENDIAN);
+ //�����������С��20ʱ�����ӹ�0��Ϊ���ϱ�ƽ̨�Ķ���ʱ������ÿ�
+ sizhu_history_interval_l.record_time_BCD.sec = (sizhu_history_interval_l.record_time_BCD.sec < 0x20)? 0: sizhu_history_interval_l.record_time_BCD.sec;
+
sizhu_history_interval_l.forward_cumulate_sc = save_realtime_data_g.realtime_flow_data_s.forward_cumulate_sc; // �������ۻ���
sizhu_history_interval_l.forward_cumulate_wc = save_realtime_data_g.realtime_flow_data_s.forward_cumulate_wc;
sizhu_history_interval_l.instant_sc = flow_meter_data_g.instant_sc;
@@ -131,6 +134,8 @@
return; //?û�������ԣ�������
arrayA_2_arrayB((uint8_t *)&sys_clockBCD_g,(uint8_t *)&sizhu_history_l.record_time_BCD,sizeof(sys_clockBCD_g), LITTLE_ENDIAN);
+ //��������ӹ�0��Ϊ�˹����ÿ�
+ sizhu_history_l.record_time_BCD.sec = 0;
sizhu_history_l.forward_cumulate_sc = save_realtime_data_g.realtime_flow_data_s.forward_cumulate_sc; // �������ۻ���
sizhu_history_l.forward_cumulate_wc = save_realtime_data_g.realtime_flow_data_s.forward_cumulate_wc;
@@ -226,7 +231,7 @@
void sizhuHistoryRecord(sClockBCD sys_clockBCD_in)
{
- static FlagStatus hour_record_flag = RESET,day_record_flag = RESET,month_record_flag = RESET,interval_report_record_flag = RESET;
+ static FlagStatus hour_record_flag = RESET,day_record_flag = RESET,month_record_flag = RESET;
uint16_t IntervalTime;
uint8_t first_time[2] = {0,0};
@@ -256,6 +261,9 @@
//��������ϱ��洢
interval_report_record_flag = RESET;
sizhuIntervalHistoryRecord();
+
+ wrc_data_num_ctrl_para_sizhu_g.report_data_save_num ++;
+ //?�洢
}
--
Gitblit v1.9.3