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] 继续开发
---
Soft/system_run_fun.c | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/Soft/system_run_fun.c b/Soft/system_run_fun.c
index 27f92ef..0db5bde 100644
--- a/Soft/system_run_fun.c
+++ b/Soft/system_run_fun.c
@@ -160,7 +160,19 @@
uint8_t first_time[2] = {0,0};
uint16_t IntervalTime;
- /*rs485�ɼ��������ƣ� ��������ʱ���쳣������*/
+ /*rs485�ɼ��������ƣ� ��������ʱ���쳣��������¼�洢�����*/
+
+ /*Сʱ���졢��*/
+ if((sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0)) //Сʱ��¼�洢��
+ start_rs485_g = RS485_START_REASON_RECORD;
+
+ if((sys_clockBCD_in.hour == 0)&&(sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0))//���¼�洢��
+ start_rs485_g = RS485_START_REASON_RECORD;
+
+ if((sys_clockBCD_in.day == 1)&&(sys_clockBCD_in.hour == 0)&&(sys_clockBCD_in.min == 0)&&(sys_clockBCD_in.sec == 0))//�¼�¼�洢��
+ start_rs485_g = RS485_START_REASON_RECORD;
+
+
if(__SYS_STATUS_BYTES_GET(power_state) == SET)
IntervalTime = wrc_para_sizhu_g.ext_power_data_interval;
else
@@ -206,3 +218,24 @@
}
}
+
+
+//ϵͳ�������в�����״̬������RESET�����������
+FlagStatus SysKeepRunningStatusGet(FUN_START_CTRL_PARA_T sys_fun_run_ctrl_in)
+{
+ if(__SYS_STATUS_BYTES_GET(power_state) == SET) //���״̬�¿��Բ�����
+ return SET;
+
+ if(sys_fun_run_ctrl_in.rs485_ctrl_flag.running_flag ==SET)
+ return SET;
+
+// if(sys_fun_run_ctrl_in.valve_ctrl_flag.running_flag ==SET) //�������������
+// return SET;
+
+ if(sys_fun_run_ctrl_in.wrc_ctrl_flag.running_flag ==SET)
+ return SET;
+
+ return RESET;
+
+
+}
--
Gitblit v1.9.3