完善脉冲计费和485采集处理

jinlicong

2024-05-16 5ac1d0febb8de5e91ce2463baea68ddac3f66091

 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();
         
         /*Êý¾ÝÀúÊ·¼Ç¼´æ´¢*/
         //Êý¾ÝÀúÊ·¼Ç¼´æ´¢Èç¹ûÓöµ½²É¼¯ÖУ¬ÔòÑÓºóµÈ´ý²É¼¯Íê³ÉÔÙ´æ´¢