From e5ec6ffc2fa0c07785c9d797c3fd74fd3031059f Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 23 May 2024 20:06:25 +0800
Subject: [PATCH] 加了几个远传接收数据处理
---
CORE/main.c | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/CORE/main.c b/CORE/main.c
index ad70350..4a9705a 100644
--- a/CORE/main.c
+++ b/CORE/main.c
@@ -23,7 +23,8 @@
#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;
@@ -56,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);
}
/*����ʶ��*/
@@ -66,11 +68,11 @@
/*LCD��ʾ*/
lcdDisplayPro();
- /*�������*/
+ /*��λ������,������modbus���ɼ�����*/
upperComPro();
/*�Խ��豸����״̬���*/
-
+ PulseAndAlarmLineCheck();
/*�ɼ����ϱ��������������*/
@@ -82,7 +84,7 @@
rs485ReadDataPro(&sys_fun_run_ctrl_g);
/*���㣬�����������*/
-
+ SettlementPro();
/*������ʷ��¼�洢*/
//������ʷ��¼�洢��������ɼ��У����Ӻ�ȴ��ɼ�����ٴ洢
@@ -90,6 +92,7 @@
/*��Դ״̬��ȡ*/ //���ڷ���֮ǰ����Ϊ�����н����ƣ�����ǰ�����粻�㣬����Ҫ���
GetPwrStatusPro(&pwr_vol_g);
+
/*����*/
valveCtrlPro(&sys_fun_run_ctrl_g);
@@ -123,12 +126,11 @@
for(uint8_t count_i=0;count_i<(PULSE_CHECK_DELAY_MS &0xff);count_i++){
delay_ms(1);
if(pulse_exti_flag == RESET)
- break;
-
- }
-
- //����
+ break;
+ }
}
+ //����
+
}
--
Gitblit v1.9.3