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 |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CORE/main.c b/CORE/main.c
index ad70350..8117211 100644
--- a/CORE/main.c
+++ b/CORE/main.c
@@ -23,7 +23,7 @@
 #include "sizhu_history_record.h"
 #include "power_manage.h"
 #include "pulse_and_alarm_line.h"
-
+#include "billing.h"
 
 
 FlagStatus key_awaken_flag_g = RESET;
@@ -70,7 +70,7 @@
 			upperComPro();
 			
 			/*�Խ��豸����״̬���*/
-			
+			PulseAndAlarmLineCheck();
 			
 					
 			/*�ɼ����ϱ��������������*/
@@ -82,7 +82,7 @@
 			rs485ReadDataPro(&sys_fun_run_ctrl_g);
 			
 			/*���㣬�����������*/
-			
+			SettlementPro();
 			
 			/*������ʷ��¼�洢*/
 			//������ʷ��¼�洢��������ɼ��У����Ӻ�ȴ��ɼ�����ٴ洢

--
Gitblit v1.9.3