From 64cf4a779ef5c16c79bbbee27370169dc8d69499 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 06 May 2024 20:08:30 +0800
Subject: [PATCH] 继续开发
---
Function/STORAGE/sizhu_history_record.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/Function/STORAGE/sizhu_history_record.c b/Function/STORAGE/sizhu_history_record.c
index aaf54cc..09513d9 100644
--- a/Function/STORAGE/sizhu_history_record.c
+++ b/Function/STORAGE/sizhu_history_record.c
@@ -1,4 +1,6 @@
#include "sizhu_history_record.h"
+#include "system_mem_para.h"
+
LOG_SIZHU_HISTORY_RUN_T log_sizhu_history_run_g;
LOG_SIZHU_LOG_SAVE_T ufg620_log_g;
@@ -404,8 +406,60 @@
}
-uint8_t sizhu_historical_test(void)
+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;
+
+ uint16_t IntervalTime;
+ uint8_t first_time[2] = {0,0};
+
+ /*����ϱ�����*/
+ if(__SYS_STATUS_BYTES_GET(power_state) == SET)
+ IntervalTime = wrc_para_sizhu_g.ext_power_data_interval;
+ else
+ IntervalTime = wrc_para_sizhu_g.bat_power_data_interval;
+
+ if(IntervalTriggerHandle(sys_clockBCD_in,IntervalTime,first_time)==SET)
+ interval_report_record_flag =SET;
+
+
+ /*Сʱ���졢��*/
+ if((sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0)) //Сʱ��¼�洢��
+ hour_record_flag =SET;
+
+ if((sys_clockBCD_in.hour == 0)&&(sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0))//���¼�洢��
+ day_record_flag =SET;
+
+ if((sys_clockBCD_in.day == 1)&&(sys_clockBCD_in.hour == 0)&&(sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0))//�¼�¼�洢��
+ month_record_flag =SET;
+
+
+ if((interval_report_record_flag == SET)&&(sys_fun_run_ctrl_g.rs485_ctrl_flag.running_flag ==RESET)){
+ //��������ϱ��洢
+ interval_report_record_flag = RESET;
+
+ }
+
+
+
+
+ if((hour_record_flag == SET)&&(sys_fun_run_ctrl_g.rs485_ctrl_flag.running_flag ==RESET)){
+ //Сʱ��¼�洢
+ hour_record_flag = RESET;
+
+ }
+
+ if((day_record_flag == SET)&&(sys_fun_run_ctrl_g.rs485_ctrl_flag.running_flag ==RESET)){
+ //���¼�洢
+ day_record_flag = RESET;
+
+ }
+
+ if((month_record_flag == SET)&&(sys_fun_run_ctrl_g.rs485_ctrl_flag.running_flag ==RESET)){
+ //�¼�¼�洢
+ month_record_flag = RESET;
+
+ }
+
}
--
Gitblit v1.9.3