From 5ac1d0febb8de5e91ce2463baea68ddac3f66091 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 16 May 2024 20:00:17 +0800
Subject: [PATCH] 完善脉冲计费和485采集处理
---
CORE/main.c | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/CORE/main.c b/CORE/main.c
index c0a4f93..8117211 100644
--- a/CORE/main.c
+++ b/CORE/main.c
@@ -22,7 +22,8 @@
#include "sizhu_ctrl_word.h"
#include "sizhu_history_record.h"
#include "power_manage.h"
-
+#include "pulse_and_alarm_line.h"
+#include "billing.h"
FlagStatus key_awaken_flag_g = RESET;
@@ -68,6 +69,9 @@
/*�������*/
upperComPro();
+ /*�Խ��豸����״̬���*/
+ PulseAndAlarmLineCheck();
+
/*�ɼ����ϱ��������������*/
//?���߲�ͬʱ���У��ɼ������ϱ�֮ǰ��ͬʱ�����Ļ����Ȳɼ���
@@ -76,6 +80,9 @@
/*485�ɼ�*/
rs485ReadDataPro(&sys_fun_run_ctrl_g);
+
+ /*���㣬�����������*/
+ SettlementPro();
/*������ʷ��¼�洢*/
//������ʷ��¼�洢��������ɼ��У����Ӻ�ȴ��ɼ�����ٴ洢
@@ -112,6 +119,16 @@
//��������²������ߣ�Ҫ���жϣ���������硢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