From e61d1595ebb1fa76b499cddec2df4bd66ec92b97 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 20 May 2024 20:02:47 +0800
Subject: [PATCH] 继续完善
---
CORE/main.c | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/CORE/main.c b/CORE/main.c
index c0a4f93..4a9705a 100644
--- a/CORE/main.c
+++ b/CORE/main.c
@@ -22,7 +22,9 @@
#include "sizhu_ctrl_word.h"
#include "sizhu_history_record.h"
#include "power_manage.h"
-
+#include "pulse_and_alarm_line.h"
+#include "billing.h"
+#include "linked_list.h"
FlagStatus key_awaken_flag_g = RESET;
@@ -55,7 +57,8 @@
if(Get_Extern_Rtc_Time(&sys_clockBCD_g) ==FAIL) //��ȡʱ��
{
//?RTCʱ���쳣����
- __SYS_STATUS_ALARM_BYTES_SET(rtc_err);
+ if(__SYS_ALARM_CTL_BYTES_GET(rtc_err) == SET)
+ __SYS_STATUS_ALARM_BYTES_SET(rtc_err,ALARM_ID_RTC_BAT_LOW);
}
/*����ʶ��*/
@@ -65,8 +68,11 @@
/*LCD��ʾ*/
lcdDisplayPro();
- /*�������*/
+ /*��λ������,������modbus���ɼ�����*/
upperComPro();
+
+ /*�Խ��豸����״̬���*/
+ PulseAndAlarmLineCheck();
/*�ɼ����ϱ��������������*/
@@ -77,12 +83,16 @@
/*485�ɼ�*/
rs485ReadDataPro(&sys_fun_run_ctrl_g);
+ /*���㣬�����������*/
+ SettlementPro();
+
/*������ʷ��¼�洢*/
//������ʷ��¼�洢��������ɼ��У����Ӻ�ȴ��ɼ�����ٴ洢
sizhuHistoryRecord(sys_clockBCD_g);
/*��Դ״̬��ȡ*/ //���ڷ���֮ǰ����Ϊ�����н����ƣ�����ǰ�����粻�㣬����Ҫ���
GetPwrStatusPro(&pwr_vol_g);
+
/*����*/
valveCtrlPro(&sys_fun_run_ctrl_g);
@@ -112,6 +122,15 @@
//��������²������ߣ�Ҫ���жϣ���������硢RS485�ɼ������С�Զ��������
if(SysKeepRunningStatusGet(sys_fun_run_ctrl_g)==RESET){
//���ߴ���
+ if(pulse_exti_flag==SET){ //�ȴ����������
+ for(uint8_t count_i=0;count_i<(PULSE_CHECK_DELAY_MS &0xff);count_i++){
+ delay_ms(1);
+ if(pulse_exti_flag == RESET)
+ break;
+ }
+ }
+ //����
+
}
--
Gitblit v1.9.3