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

jinlicong

2024-05-16 5ac1d0febb8de5e91ce2463baea68ddac3f66091

 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;
@@ -41,13 +42,9 @@
   //ÔËÐй¦ÄܲÎÊý³õʼ»¯£¬°üÀ¨³õʼ״̬¼ì²â
   sysRunFunParaInit();
   
   //ϵͳ³õʼ״̬¼ì²â£¬ÈçÓбØÒª
	
	
	
	
   //´ò¿ªÐèÒªÒ»Ö±¹¤×÷µÄÍⲿÒý½ÅÖжÏ
   allExtiIRQ();
	
   IWDT_Clr();
   while(1)
   {
@@ -72,23 +69,27 @@
         /*ÉÏλ»ú½»»¥*/
         upperComPro();
         
         /*¶Ô½ÓÉ豸½ÓÏß״̬¼ì²â*/
         PulseAndAlarmLineCheck();
			
               
         /*²É¼¯¡¢Éϱ¨¡¢·§¿ØÈÎÎñ¿ØÖÆ*/
         //?ÈýÕß²»Í¬Ê±½øÐУ¬²É¼¯·ÅÔÚÉϱ¨Ö®Ç°£¬Í¬Ê±´¥·¢µÄ»°ÓÅÏȲɼ¯£¬
         //±¨¾¯´¥·¢Éϱ¨ÅжÏÂß¼­·ÅÔڲɼ¯Ç°Ã棬ÏÈ´¥·¢²É¼¯£¬ÔÙ´¥·¢Éϱ¨
         sysRunFunCtrlPro(&sys_fun_run_ctrl_g,sys_clockBCD_g);
         
         /*µçԴ״̬»ñÈ¡*/ //·ÅÔÚRS485²É¼¯¡¢·§¿Ø¡¢Ô¶´«Ö®Ç°£¬ÔÚÕâЩ¸ß¹¦ºÄ²Ù×÷֮ǰ¿ÉÄÜÐèÒªÏȲɼ¯Ò»´Îµç³Øµçѹ
         GetPwrStatusPro(&pwr_vol_g);
			
         /*485²É¼¯*/
         rs485ReadDataPro(&sys_fun_run_ctrl_g);
			
         /*½áË㣬°üº¬Âö³å¼ÆÈë*/
         SettlementPro();
         
         /*Êý¾ÝÀúÊ·¼Ç¼´æ´¢*/
         //Êý¾ÝÀúÊ·¼Ç¼´æ´¢Èç¹ûÓöµ½²É¼¯ÖУ¬ÔòÑÓºóµÈ´ý²É¼¯Íê³ÉÔÙ´æ´¢
         sizhuHistoryRecord(sys_clockBCD_g);
         
			
         /*µçԴ״̬»ñÈ¡*/ //·ÅÔÚ·§¿Ø֮ǰ£¬ÒòΪ·§¿ØÓнèµçÉè¼Æ£¬·§¿ØÇ°Èç¹û¼îµç²»×㣬ÔòÐèÒª½èµç
         GetPwrStatusPro(&pwr_vol_g);
         /*·§¿Ø*/
         valveCtrlPro(&sys_fun_run_ctrl_g);
         
@@ -118,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;
						
               }
					
               //ÐÝÃß
            }
            
         }