阀门控制进一步完善

jinlicong

2024-05-17 6ea1a42391f86e72f53042a966dae970a3fd77cb

 CORE/main.c

@@ -23,7 +23,8 @@
#include "sizhu_history_record.h"
#include "power_manage.h"
#include "pulse_and_alarm_line.h"

#include "billing.h"
#include "linked_list.h"


FlagStatus key_awaken_flag_g = RESET;
@@ -56,7 +57,8 @@
         if(Get_Extern_Rtc_Time(&sys_clockBCD_g) ==FAIL) //»ñȡʱ¼ä
         {
            //?RTCʱ¼äÒì³£±¨¾¯
            __SYS_STATUS_ALARM_BYTES_SET(rtc_err);
            if(__SYS_ALARM_CTL_BYTES_GET(rtc_err) == SET)
               __SYS_STATUS_ALARM_BYTES_SET(rtc_err,ALARM_ID_RTC_BAT_LOW);
         }
         
         /*°´¼üʶ±ð*/
@@ -70,7 +72,7 @@
         upperComPro();
         
         /*¶Ô½ÓÉ豸½ÓÏß״̬¼ì²â*/
			
         PulseAndAlarmLineCheck();
         
               
         /*²É¼¯¡¢Éϱ¨¡¢·§¿ØÈÎÎñ¿ØÖÆ*/
@@ -82,7 +84,7 @@
         rs485ReadDataPro(&sys_fun_run_ctrl_g);
         
         /*½áË㣬°üº¬Âö³å¼ÆÈë*/
			
         SettlementPro();
         
         /*Êý¾ÝÀúÊ·¼Ç¼´æ´¢*/
         //Êý¾ÝÀúÊ·¼Ç¼´æ´¢Èç¹ûÓöµ½²É¼¯ÖУ¬ÔòÑÓºóµÈ´ý²É¼¯Íê³ÉÔÙ´æ´¢
@@ -123,12 +125,11 @@
               for(uint8_t count_i=0;count_i<(PULSE_CHECK_DELAY_MS &0xff);count_i++){
                  delay_ms(1);
                  if(pulse_exti_flag == RESET) 
                     break;
						
               }
					
               //ÐÝÃß
                     break;						
               }				
            }
            //ÐÝÃß
				
            
         }