继续脉冲和报警线处理

jinlicong

2024-05-15 d14dd3a2106de793fbe08dc5a12cf80defd3258a

 CORE/main.c

@@ -22,6 +22,7 @@
#include "sizhu_ctrl_word.h"
#include "sizhu_history_record.h"
#include "power_manage.h"
#include "pulse_and_alarm_line.h"



@@ -68,6 +69,9 @@
         /*ÉÏλ»ú½»»¥*/
         upperComPro();
         
         /*¶Ô½ÓÉ豸½ÓÏß״̬¼ì²â*/
			
			
               
         /*²É¼¯¡¢Éϱ¨¡¢·§¿ØÈÎÎñ¿ØÖÆ*/
         //?ÈýÕß²»Í¬Ê±½øÐУ¬²É¼¯·ÅÔÚÉϱ¨Ö®Ç°£¬Í¬Ê±´¥·¢µÄ»°ÓÅÏȲɼ¯£¬
@@ -76,6 +80,9 @@
         
         /*485²É¼¯*/
         rs485ReadDataPro(&sys_fun_run_ctrl_g);
			
         /*½áË㣬°üº¬Âö³å¼ÆÈë*/
			
         
         /*Êý¾ÝÀúÊ·¼Ç¼´æ´¢*/
         //Êý¾ÝÀúÊ·¼Ç¼´æ´¢Èç¹ûÓöµ½²É¼¯ÖУ¬ÔòÑÓºóµÈ´ý²É¼¯Íê³ÉÔÙ´æ´¢
@@ -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;
						
               }
					
               //ÐÝÃß
            }
            
         }